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

[Olivier Mattelaer]

[lp:~maddevelopers/mg5amcnlo/2.0.1]

258. By Olivier Mattelaer on 2013-12-25

change UpdateNotes

259. By Olivier Mattelaer on 2013-12-25

Better one

260. By Olivier Mattelaer on 2014-01-03

Fix a mssm specific bug for the auto-width computation (occuring only for ./bin/generate_events)
the problem was the SLHA1 ->SLHA2 conversion which was not detected correctly.

261. By Olivier Mattelaer on 2014-01-06

Fix a Bug #1266019 (pbs specific problem)
Fix a problem with some unittest on some filesystem.

262. By Olivier Mattelaer on 2014-01-06

improve way to compile pythia-pgs. automatically remove '-fno-second_underscore' if needed.

263. By Olivier Mattelaer on 2014-01-06

fix the warning problem for set complex_mass reported by Valentin

264. By Olivier Mattelaer on 2014-01-07

fix the parralel tests (due to the change in sqrts)

265. By Olivier Mattelaer on 2014-01-08

Improve restriction, with the possibility to have a another file for the default
value (different from the one choose for the restriction).

266. By Olivier Mattelaer on 2014-01-08

fix some problem with FormFactor (remove the default template for the Form Factor)

267. By Rikkert Frederix on 2014-01-09

Fix in the skipping of the jet-clustering in cuts.f when the Born has
no light QCD partons. Now fastjet is skipped correctly in this case.

268. By Olivier Mattelaer on 2014-01-10

      - fix a problem with form-factors
      - by default all output_files are in required_output.

269. By Paolo Torrielli on 2014-01-14

Marco's change to check_events, so to plot SCALUP while checking events

270. By Paolo Torrielli on 2014-01-15

small bug fix in check_events.f

271. By marco zaro on 2014-01-15

merged with 2.0.1run_name

272. By Olivier Mattelaer on 2014-01-17

Fix an error in MadWidth

273. By Hua-Sheng Shao on 2014-01-19

update CutTools with version 1.9.2

=== modified file 'Template/NLO/Source/PDF/pdg2pdf.f'
--- Template/NLO/Source/PDF/pdg2pdf.f	2013-12-11 13:56:21 +0000
+++ Template/NLO/Source/PDF/pdg2pdf.f	2014-01-19 08:21:29 +0000
@@ -9,9 +9,7 @@
          DOUBLE  PRECISION x,xmu
 
 c timing statistics
-         real*4 tbefore, tAfter
-         real*4 tTot, tOLP, tFastJet, tPDF
-         common/timings/tTot, tOLP, tFastJet, tPDF
+         include "timing_variables.inc"
 
          call cpu_time(tbefore)
          pdg2pdf_timed = pdg2pdf(ih,ipdg,x,xmu)

=== modified file 'Template/NLO/Source/PDF/pdg2pdf_lhapdf.f'
--- Template/NLO/Source/PDF/pdg2pdf_lhapdf.f	2013-12-11 13:56:21 +0000
+++ Template/NLO/Source/PDF/pdg2pdf_lhapdf.f	2014-01-19 08:21:29 +0000
@@ -9,9 +9,7 @@
          DOUBLE  PRECISION x,xmu
 
 c timing statistics
-         real*4 tbefore, tAfter
-         real*4 tTot, tOLP, tFastJet, tPDF
-         common/timings/tTot, tOLP, tFastJet, tPDF
+         include "timing_variables.inc"
 
          call cpu_time(tbefore)
          pdg2pdf_timed = pdg2pdf(ih,ipdg,x,xmu)

=== added symlink 'Template/NLO/Source/PDF/timing_variables.inc'
=== target is u'../timing_variables.inc'
=== modified file 'Template/NLO/Source/alfas_functions.f'
--- Template/NLO/Source/alfas_functions.f	2013-12-11 13:56:21 +0000
+++ Template/NLO/Source/alfas_functions.f	2014-01-19 08:21:29 +0000
@@ -75,9 +75,7 @@
       external ALPHAS_not_timed
 
 c     timing statistics
-      real*4 tbefore, tAfter
-      real*4 tTot, tOLP, tFastJet, tPDF
-      common/timings/tTot, tOLP, tFastJet, tPDF
+      include "timing_variables.inc"
 
 c     This function takes roughly 0.6 micro-seconds and the function
 c     cpu_time takes 0.3 so it does not make much sense to always leave

=== modified file 'Template/NLO/Source/alfas_functions_lhapdf.f'
--- Template/NLO/Source/alfas_functions_lhapdf.f	2013-12-11 13:56:21 +0000
+++ Template/NLO/Source/alfas_functions_lhapdf.f	2014-01-19 08:21:29 +0000
@@ -81,13 +81,10 @@
       external alphasPDF
 
 c timing statistics
-      real*4 tbefore, tAfter
-      real*4 tTot, tOLP, tFastJet, tPDF
-      common/timings/tTot, tOLP, tFastJet, tPDF
-
-c     This function takes 20 micro seconds to run, so it
-c     is fine to time it with cpu_time which takes 0.3 microsec only
-
+      include "timing_variables.inc"
+
+c     This function takes 20 micro seconds to run, so it is ok to profile
+c     it with the 0.3 ms function cpu_time.
       call cpu_time(tbefore)
       ALPHAS=alphasPDF(Q)
       call cpu_time(tAfter)

=== added symlink 'Template/NLO/Source/timing_variables.inc'
=== target is u'../SubProcesses/timing_variables.inc'
=== modified file 'Template/NLO/SubProcesses/BinothLHA.f'
--- Template/NLO/SubProcesses/BinothLHA.f	2013-12-13 07:04:16 +0000
+++ Template/NLO/SubProcesses/BinothLHA.f	2014-01-19 08:21:29 +0000
@@ -65,6 +65,7 @@
       common/ups_stats/ntot,nsun,nsps,nups,neps,n100,nddp,nqdp,nini,n10,n1
       parameter (nbadmax = 5)
       double precision pmass(nexternal)
+      character*1 include_hel(max_bhel)
       integer goodhel(max_bhel),hel(0:max_bhel)
       save hel,goodhel
       logical fillh
@@ -202,8 +203,9 @@
                open (unit=67,file='HelFilter.dat',status='old',err=201)
                hel(0)=0
                j=0
+c optimized loop output
                do i=1,max_bhel
-                  read(67,*,err=201) goodhel(i)
+                  read(67,*,err=202) goodhel(i)
                   if (goodhel(i).gt.-10000 .and. goodhel(i).ne.0) then
                      j=j+1
                      goodhel(j)=goodhel(i)
@@ -211,6 +213,19 @@
                      hel(j)=i
                  endif
                enddo
+               goto 203
+c non optimized loop output
+ 202           rewind(67)
+               read(67,*,err=201) (include_hel(i),i=1,max_bhel)
+               do i=1,max_bhel
+                  if (include_hel(i).eq.'T') then
+                     j=j+1
+                     goodhel(j)=1
+                     hel(0)=hel(0)+1
+                     hel(j)=i
+                  endif
+               enddo
+ 203           continue
 c Only do MC over helicities if there are NHelForMCoverHels
 c or more non-zero (independent) helicities
                if (NHelForMCoverHels.eq.-1) then

=== modified file 'Template/NLO/SubProcesses/cuts.f'
--- Template/NLO/SubProcesses/cuts.f	2013-12-05 10:10:41 +0000
+++ Template/NLO/SubProcesses/cuts.f	2014-01-19 08:21:29 +0000
@@ -247,7 +247,7 @@
 
 c Uncomment for bypassing jet algo and cuts
 c$$$      goto 122
-      if (ptj.gt.0d0.or.nQCD.gt.1) then
+      if (ptj.gt.0d0.and.nQCD.gt.1) then
 
 c Cut some peculiar momentum configurations, i.e. two partons very soft.
 c This is needed to get rid of numerical instabilities in the Real emission

=== modified file 'Template/NLO/SubProcesses/driver_mintFO.f'
--- Template/NLO/SubProcesses/driver_mintFO.f	2013-12-11 13:56:21 +0000
+++ Template/NLO/SubProcesses/driver_mintFO.f	2014-01-19 08:21:29 +0000
@@ -115,9 +115,8 @@
       common/c_avg_virt/average_virtual,virtual_fraction
 
 c timing statistics
-      real*4 tbefore, tAfter
-      real*4 tTot, tOLP, tFastJet, tPDF
-      common/timings/tTot, tOLP, tFastJet, tPDF
+      include "timing_variables.inc"
+      real*4 tOther, tTot
 
 c general MadFKS parameters
       include "FKSParams.inc"
@@ -321,11 +320,17 @@
       endif
 
       call cpu_time(tAfter)
-      tTot = tTot +(tAfter-tBefore)
-      write(*,*) 'Time spent in OLP : ',tOLP
-      write(*,*) 'Time spent in PDF_engine : ',tPDF
-      write(*,*) 'Time spent in clustering : ',tFastJet
+      tTot = tAfter-tBefore
+      tOther = tTot - tOLP - tPDF - tFastJet - tGenPS - tDSigI - tDSigR
+      write(*,*) 'Time spent in clustering : ',tFastJet      
+      write(*,*) 'Time spent in PDF_Engine : ',tPDF
+      write(*,*) 'Time spent in PS_Generation : ',tGenPS
+      write(*,*) 'Time spent in Reals_evaluation: ',tDSigR
+      write(*,*) 'Time spent in IS_evaluation : ',tDSigI
+      write(*,*) 'Time spent in OneLoop_Engine : ',tOLP      
+      write(*,*) 'Time spent in other_tasks : ',tOther
       write(*,*) 'Time spent in Total : ',tTot
+
       if(i_momcmp_count.ne.0)then
         write(*,*)'     '
         write(*,*)'WARNING: genps_fks code 555555'
@@ -337,13 +342,13 @@
 
       block data timing
 c timing statistics
-      real*4 tbefore, tAfter
-      real*4 tTot, tOLP, tFastJet, tPDF
-      common/timings/tTot, tOLP, tFastJet, tPDF
-      data tTot/0.0/
+      include "timing_variables.inc"
       data tOLP/0.0/
       data tFastJet/0.0/
       data tPDF/0.0/
+      data tDSigI/0.0/
+      data tDSigR/0.0/
+      data tGenPS/0.0/
       end
 
 

=== modified file 'Template/NLO/SubProcesses/driver_mintMC.f'
--- Template/NLO/SubProcesses/driver_mintMC.f	2013-12-12 13:01:35 +0000
+++ Template/NLO/SubProcesses/driver_mintMC.f	2014-01-19 08:21:29 +0000
@@ -126,9 +126,8 @@
       common/ups_stats/ntot,nsun,nsps,nups,neps,n100,nddp,nqdp,nini,n10,n1
 
 c timing statistics
-      real*4 tbefore, tAfter
-      real*4 tTot, tOLP, tFastJet, tPDF
-      common/timings/tTot, tOLP, tFastJet, tPDF
+      include "timing_variables.inc"
+      real*4 tOther, tTot
 
 c general MadFKS parameters
       include "FKSParams.inc"
@@ -136,9 +135,6 @@
 C-----
 C  BEGIN CODE
 C-----  
-c
-c     Setup the timing variable
-c
       call cpu_time(tBefore)
 
 c     Read general MadFKS parameters
@@ -482,10 +478,15 @@
       endif
 
       call cpu_time(tAfter)
-      tTot = tTot +(tAfter-tBefore)
-      write(*,*) 'Time spent in OLP : ',tOLP
-      write(*,*) 'Time spent in PDF_engine : ',tPDF
-      write(*,*) 'Time spent in clustering : ',tFastJet
+      tTot = tAfter - tBefore
+      tOther = tTot - tOLP - tPDF - tFastJet - tGenPS - tDSigI - tDSigR
+      write(*,*) 'Time spent in clustering : ',tFastJet      
+      write(*,*) 'Time spent in PDF_Engine : ',tPDF
+      write(*,*) 'Time spent in Reals_evaluation: ',tDSigR
+      write(*,*) 'Time spent in IS_evaluation : ',tDSigI
+      write(*,*) 'Time spent in OneLoop_Engine : ',tOLP
+      write(*,*) 'Time spent in PS_Generation : ',tGenPS      
+      write(*,*) 'Time spent in other_tasks : ',tOther
       write(*,*) 'Time spent in Total : ',tTot
 
       return
@@ -496,13 +497,14 @@
 
       block data timing
 c timing statistics
-      real*4 tbefore, tAfter
-      real*4 tTot, tOLP, tFastJet, tPDF
-      common/timings/tTot, tOLP, tFastJet, tPDF
-      data tTot/0.0/
+      include "timing_variables.inc"
       data tOLP/0.0/
       data tFastJet/0.0/
       data tPDF/0.0/
+      data tDSigI/0.0/
+      data tDSigR/0.0/
+      data tGenPS/0.0/
+
       end
 
 

=== modified file 'Template/NLO/SubProcesses/fastjet_wrapper.f'
--- Template/NLO/SubProcesses/fastjet_wrapper.f	2013-12-11 13:56:21 +0000
+++ Template/NLO/SubProcesses/fastjet_wrapper.f	2014-01-19 08:21:29 +0000
@@ -9,9 +9,7 @@
       integer NN,JET(nexternal),njet
 
 c     timing statistics
-      real*4 tbefore, tAfter
-      real*4 tTot, tOLP, tFastJet, tPDF
-      common/timings/tTot, tOLP, tFastJet, tPDF
+      include "timing_variables.inc"
 
       call cpu_time(tBefore)
       call amcatnlo_fastjetppgenkt(pQCD,NN,rfj,sycut,palg,

=== modified file 'Template/NLO/SubProcesses/fks_singular.f'
--- Template/NLO/SubProcesses/fks_singular.f	2013-12-11 13:56:21 +0000
+++ Template/NLO/SubProcesses/fks_singular.f	2014-01-19 08:21:29 +0000
@@ -240,6 +240,10 @@
       include 'reweight.inc'
       include 'reweightNLO.inc'
 
+c     timing statistics
+      include 'timing_variables.inc'
+      real deltaTOLP,deltaTPDF,deltaTFJ
+
       double precision pp(0:3,nexternal),wgt,vegaswgt
 
       double precision fks_Sij,f_damp,dot,dlum
@@ -501,6 +505,10 @@
       endif
       if (abrv.eq.'born' .or. abrv.eq.'grid' .or. abrv(1:2).eq.'vi' .or.
      &     nbody)goto 540
+
+      call cpu_time(tBefore)
+      deltaTPDF = tPDF
+      deltaTFJ  = tFastJet
 c Real contribution:
 c Set the ybst_til_tolab before applying the cuts. 
       call set_cms_stuff(mohdr)
@@ -536,10 +544,17 @@
            endif
         endif
       endif
+      call cpu_time(tAfter)
+      tDSigR=tDSigR + (tAfter-tBefore) - (tPDF-deltaTPDF) -
+     &     (tFastJet-deltaTFJ)
 c
 c All counterevent have the same final-state kinematics. Check that
 c one of them passes the hard cuts, and they exist at all
  540  continue
+      call cpu_time(tBefore)
+      deltaTPDF = tPDF
+      deltaTFJ  = tFastJet
+      deltaTOLP = tOLP
 c Set the ybst_til_tolab before applying the cuts. Update below
 c for the collinear, soft and/or soft-collinear subtraction terms
       call set_cms_stuff(izero)
@@ -728,20 +743,22 @@
          endif
       endif
  547  continue
-
+c
+      call cpu_time(tAfter)
+      tDSigI=tDSigI + (tAfter-tBefore) - (tPDF-deltaTPDF) -
+     &     (tFastJet-deltaTFJ) - (tOLP-deltaTOLP)
 c
 c Enhance the one channel for multi-channel integration
 c
       enhance=1.d0
-      if ((ev_wgt.ne.0d0.or.cnt_wgt_c.ne.0d0.or.cnt_wgt_s.ne.0d0.or.
-     $     cnt_wgt_sc.ne.0d0.or.bsv_wgt.ne.0d0.or.virt_wgt.ne.0d0.or.deg_wgt.
-     $     ne.0d0.or.
-     $     deg_swgt.ne.0d0.or.cnt_swgt_s.ne.0d0.or.cnt_swgt_sc.ne.0d0)
-     $     .and. multi_channel) then
-         if
-     $        (bsv_wgt.eq.0d0.and.virt_wgt.eq.0d0.and.deg_wgt.eq.0d0.and.deg_swgt.
-     $        eq.0d0.and.cnt_wgt_c.eq.0d0 ) CalculatedBorn=.false.
-
+      if ((ev_wgt.ne.0d0 .or. cnt_wgt_c.ne.0d0 .or. cnt_wgt_s.ne.0d0
+     $     .or.cnt_wgt_sc.ne.0d0 .or. bsv_wgt.ne.0d0 .or.
+     $     virt_wgt.ne.0d0 .or. deg_wgt.ne.0d0 .or.deg_swgt.ne.0d0 .or.
+     $     cnt_swgt_s.ne.0d0 .or. cnt_swgt_sc.ne.0d0).and.
+     $     multi_channel) then
+         if (bsv_wgt.eq.0d0 .and. virt_wgt.eq.0d0 .and. deg_wgt.eq.0d0
+     $        .and. deg_swgt.eq.0d0 .and. cnt_wgt_c.eq.0d0 )
+     $        CalculatedBorn=.false.
          if (.not.calculatedBorn .and. p_born(0,1).gt.0d0)then
             call sborn(p_born,wgt1)
          elseif(p_born(0,1).lt.0d0)then
@@ -962,6 +979,11 @@
       include 'q_es.inc'
       include 'nFKSconfigs.inc'
       include 'reweight_all.inc'
+
+c     timing statistics
+      include 'timing_variables.inc'
+      real deltaTOLP,deltaTPDF,deltaTFJ
+
       INTEGER NFKSPROCESS
       COMMON/C_NFKSPROCESS/NFKSPROCESS
 
@@ -1343,7 +1365,12 @@
       SxmcME=0.d0
       HxmcMC=0.d0
       HxmcME=0.d0
-
+c
+      deltaTOLP = tOLP
+      deltaTPDF = tPDF
+      deltaTFJ  = tFastJet
+      call cpu_time(tBefore)
+c
       if (abrv.eq.'born' .or. abrv.eq.'grid' .or.
      &     abrv(1:2).eq.'vi' .or. nbody) goto 540
 
@@ -1800,17 +1827,22 @@
          wgtwreal_all(4,nFKSprocess*2)=
      &        -wgtwreal_all(4,nFKSprocess*2)*xsec
       endif
-
       Sxmc_wgt=Sxmc_wgt+SxmcMC+SxmcME
       Hxmc_wgt=Hxmc_wgt+HxmcMC+HxmcME
-
  547  continue
+      call cpu_time(tAfter)
+      tDSigI = tDSigI + (tAfter-tBefore) - (tOLP-deltaTOLP) - 
+     &     (tPDF -deltaTPDF) - (tFastJet - deltaTFJ)
 
 c Real contribution
 c
 c Set the ybst_til_tolab before applying the cuts. 
       if (abrv.eq.'born' .or. abrv.eq.'grid' .or. abrv(1:2).eq.'vi' .or.
      &     nbody)goto 550
+      call cpu_time(tBefore)
+      deltaTPDF = tPDF
+      deltaTFJ  = tFastJet
+c
       call set_cms_stuff(mohdr)
       if(doreweight)then
          wgtxbj_all(1,1,nFKSprocess*2)=xbk(1)
@@ -1877,6 +1909,9 @@
         endif
         if(AddInfoLHE)scale2_lhe(nFKSprocess)=get_ptrel(pp,i_fks,j_fks)
       endif
+      call cpu_time(tAfter)
+      tDSigR = tDSigR + (tAfter-tBefore)-(tPDF-deltaTPDF)-
+     &     (tFastJet-deltaTFJ)
  550  continue
 
       if( (.not.MCcntcalled) .and.
@@ -1892,7 +1927,6 @@
      &        scale1_lhe(nFKSprocess)=scale2_lhe(nFKSprocess)
          scale2_lhe(nFKSprocess)=scale_CKKW
       endif
-
 c
 c Enhance the one channel for multi-channel integration
 c
@@ -4241,9 +4275,7 @@
       common/c_vob/virtual_over_born
 
 c timing statistics
-      real*4 tbefore, tAfter
-      real*4 tTot, tOLP, tFastJet, tPDF
-      common/timings/tTot, tOLP, tFastJet, tPDF
+      include "timing_variables.inc"
 
 c For the MINT folding
       integer fold

=== modified file 'Template/NLO/SubProcesses/genps_fks.f'
--- Template/NLO/SubProcesses/genps_fks.f	2013-11-12 14:20:35 +0000
+++ Template/NLO/SubProcesses/genps_fks.f	2014-01-19 08:21:29 +0000
@@ -2,6 +2,8 @@
       implicit none
       include 'genps.inc'
       include 'nexternal.inc'
+c     Timing profile statistics
+      include 'timing_variables.inc'
       integer ndim,iconfig
       double precision wgt,x(99),p(0:3,nexternal)
       integer iforest(2,-max_branch:-1,lmaxconfigs)
@@ -29,7 +31,9 @@
       common/ciconfig0/iconfig0
       include 'coupl.inc'
       include 'born_props.inc'
-c      
+c     
+      call cpu_time(tBefore)
+c
       this_config=iconfig
       iconf=iconfig
       iconfig0=iconfig
@@ -52,6 +56,8 @@
       enddo
       wgt=wgt*jac
 c
+      call cpu_time(tAfter)      
+      tGenPS = tGenPS + (tAfter-tBefore)
       return
       end 
       
@@ -1369,8 +1375,11 @@
          xiimin=0d0
       endif
       if (xiimax.lt.xiimin) then
-         write (*,*) 'Error #10 in genps_fks.f',icountevts,xiimax,xiimin
-         stop
+         write (*,*) 'WARNING #10 in genps_fks.f',icountevts,xiimax
+     $        ,xiimin
+         xjac=-342d0
+         pass=.false.
+         return
       endif
 
       xinorm=xiimax-xiimin

=== added file 'Template/NLO/SubProcesses/timing_variables.inc'
--- Template/NLO/SubProcesses/timing_variables.inc	1970-01-01 00:00:00 +0000
+++ Template/NLO/SubProcesses/timing_variables.inc	2014-01-19 08:21:29 +0000
@@ -0,0 +1,5 @@
+      real tBefore, tAfter
+      real tOLP, tFastJet, tPDF,
+     & tGenPS, tDSigI, tDSigR
+      common/timings/tOLP, tFastJet, tPDF,
+     & tGenPS, tDSigI, tDSigR

=== added symlink 'Template/NLO/Utilities/analysis_td_template.f'
=== target is u'../FixedOrderAnalysis/analysis_td_template.f'
=== modified file 'Template/NLO/Utilities/check_events.f'
--- Template/NLO/Utilities/check_events.f	2013-12-12 10:56:59 +0000
+++ Template/NLO/Utilities/check_events.f	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
       implicit none
       integer maxevt,ifile,efile,mfile,jfile,kfile,rfile,i,npart,
      # iuseres_1,iwhmass,ilepmass,idec,itempsc,itempPDF,isavesc,
-     # isavePDF,itemp
+     # isavePDF,itemp,ii
       double precision chtot,xint,xinterr,xinta,xintaerr,qtiny
       parameter (qtiny=1.d-4)
       double precision charges(-100:100),zmasses(1:100)
@@ -56,7 +56,7 @@
 
       include "nexternal.inc"
       integer j,k
-      real*8 ecm,xmass(3*nexternal),xmom(0:3,3*nexternal)
+      real*8 ecm,xmass(3*nexternal),xmom(0:3,3*nexternal),xnorm
 
       include 'reweight0.inc'
       integer kr,kf,kpdf
@@ -66,6 +66,7 @@
      # xmax_wgt_resc_pdf(0:maxPDFs),
      # xmin_wgt_resc_scale(maxscales,maxscales),
      # xmin_wgt_resc_pdf(0:maxPDFs)
+      include 'dbook.inc'
 
       call setcharges(charges)
       call setmasses(zmasses)
@@ -315,11 +316,17 @@
       endif
 
       i=0
+      call inihist
+      call bookup(1,'scalup',2d0,0d0,200d0)
+      call bookup(2,'scalup',8d0,0d0,800d0)
+      call bookup(3,'log scalup',0.1d0,0d0,4d0)
       dowhile(i.lt.maxevt.and.keepevent)
          call read_lhef_event_catch(ifile,
      &        NUP,IDPRUP,XWGTUP,SCALUP,AQEDUP,AQCDUP,
      &        IDUP,ISTUP,MOTHUP,ICOLUP,PUP,VTIMUP,SPINUP,buff)
-
+         call mfill(1,SCALUP,XWGTUP)
+         call mfill(2,SCALUP,XWGTUP)
+         if(SCALUP.gt.0d0)call mfill(3,log10(SCALUP),XWGTUP)
          if(index(buff,'endoffile').ne.0)then
            keepevent=.false.
            goto 111
@@ -491,6 +498,18 @@
 
       enddo
 
+      open(unit=99,file='SCALUP.top',status='unknown')
+      call mclear
+      xnorm=1d0
+      do ii=1,nplots
+         call mopera(ii,'+',ii,ii,xnorm,0.d0)
+         call mfinal(ii)
+      enddo
+      call multitop(1,3,2,'scalup    ',' ','LOG')
+      call multitop(2,3,2,'scalup    ',' ','LOG')
+      call multitop(3,3,2,'log scalup',' ','LOG')
+      close(99)
+
       if(event_norm.eq.'ave')sum_wgt=sum_wgt/maxevt
       if(event_norm.eq.'ave')sum_abs_wgt=sum_abs_wgt/maxevt
       err_wgt=sum_abs_wgt/sqrt(dfloat(maxevt))
@@ -1770,3 +1789,7 @@
  80   ICMPCH=1
       RETURN
       END
+
+c Dummy subroutine (normally used with vegas when resuming plots)
+      subroutine resume()
+      end

=== added symlink 'Template/NLO/Utilities/dbook.f'
=== target is u'../FixedOrderAnalysis/dbook.f'
=== added symlink 'Template/NLO/Utilities/dbook.inc'
=== target is u'../FixedOrderAnalysis/dbook.inc'
=== removed symlink 'Template/NLO/Utilities/madfks_dbook.f'
=== target was u'../SubProcesses/madfks_dbook.f'
=== modified file 'Template/NLO/Utilities/makefile'
--- Template/NLO/Utilities/makefile	2013-10-29 11:45:05 +0000
+++ Template/NLO/Utilities/makefile	2014-01-19 08:21:29 +0000
@@ -4,7 +4,8 @@
 INCLUDE=-I../SubProcesses/$(P01)
 FF=gfortran -g -fno-automatic -ffixed-line-length-132 -fbounds-check $(INCLUDE)
 FILES=handling_lhe_events.o fill_MC_mshell.o
-FILES2=madfks_plot.f analysis_fixed_order.o madfks_dbook.f setcuts.o
+FILES2=madfks_plot.o dbook.o setcuts.o analysis_td_template.o \
+       open_output_files.o open_output_files_dummy.o
 
 %.o : %.f
 	$(FF) -c $<
@@ -12,7 +13,7 @@
 all: check_events combine_plots compare_events merge_events plot_events \
 	plot_events_lhef select_events split_events sum_plots
 
-check_events : $(FILES) check_events.o
+check_events : $(FILES) check_events.o dbook.o
 	$(FF) $^ -o $@
 
 combine_plots : combine_plots.o

=== added symlink 'Template/NLO/Utilities/open_output_files.f'
=== target is u'../SubProcesses/open_output_files.f'
=== added symlink 'Template/NLO/Utilities/open_output_files_dummy.f'
=== target is u'../SubProcesses/open_output_files_dummy.f'
=== modified file 'Template/NLO/Utilities/plot_events.f'
--- Template/NLO/Utilities/plot_events.f	2013-10-07 13:37:28 +0000
+++ Template/NLO/Utilities/plot_events.f	2014-01-19 08:21:29 +0000
@@ -1,6 +1,6 @@
 c Compile with
 c   gfortran -g -ffixed-line-length-132 -fno-automatic -I./any-P-directory
-c      -o plot_events plot_events.f madfks_plot.f madfks_dbook.f setcuts.f
+c      -o plot_events plot_events.f madfks_plot.f dbook.f setcuts.f
 c         handling_lhe_events.f 
 c         any-dependencies-in-madfksplot
       program plot_events

=== modified file 'Template/NLO/Utilities/plot_events_lhef.f'
--- Template/NLO/Utilities/plot_events_lhef.f	2013-10-07 13:37:28 +0000
+++ Template/NLO/Utilities/plot_events_lhef.f	2014-01-19 08:21:29 +0000
@@ -1,7 +1,7 @@
 c Same as plot_events.f, but relevant to LH showered files (ntuples).
 c Compile with
 c   f77 -g -ffixed-line-length-132 -fno-automatic 
-c      -o plot_events_lhef plot_events_lhef.f madfks_plot*.f madfks_dbook.f 
+c      -o plot_events_lhef plot_events_lhef.f madfks_plot*.f dbook.f 
 c         handling_lhe_events.f any-dependencies-in-madfksplot
 c Copy in this directory
 c  reweight0.inc dbook.inc

=== modified file 'Template/NLO/bin/generate_events'
--- Template/NLO/bin/generate_events	2013-11-13 02:21:10 +0000
+++ Template/NLO/bin/generate_events	2014-01-19 08:21:29 +0000
@@ -96,16 +96,13 @@
     try:
         if '-h' in argument or '--help' in argument:
             launch = run.aMCatNLOCmd(me_dir=root_path)
-            launch.exec_cmd('help generate_events')
+            launch.exec_cmd('help launch')
             sys.exit()
         elif len(argument) > 1 and argument[1] in ['0', '1', '2']:
             argument = treat_old_argument(argument)
         
         launch = run.aMCatNLOCmd(me_dir=root_path)
-        if '-o' in argument:
-            launch.run_cmd('generate_events %s' % ' '.join(argument[1:]))
-        else:
-            launch.run_cmd('launch %s' % ' '.join(argument[1:]))
+        launch.run_cmd('launch %s' % ' '.join(argument[1:]))
         launch.run_cmd('quit')
     except KeyboardInterrupt:
         try:

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2013-12-15 16:46:18 +0000
+++ UpdateNotes.txt	2014-01-19 08:21:29 +0000
@@ -1,5 +1,16 @@
 Update notes for MadGraph5_aMC@NLO (in reverse time order)
 
+2.0.1(23/12/13) RF: Replaced the Error#10 in the generation of the phase-space (for NLO) to a Warning#10.
+                    In rare cases this error stopped the code, while this was not needed.
+                RF: When using non-optimized loop output, the code now also works fine.
+                OM: Modification of the code to allow the code to run on our servers
+                OM: Fix a bug in h > l+ l- l+ l- for group_subproceses =False (decay only). A follow up of 
+                    the bug fix in 2.0.0
+                VH: Improve the timing routine of the NLO code (displayed in debug mode)
+                VH: FIX the import of old UFO model (those without the all_orders attribute).
+                OM: Add a functionalities for restrict_model if a file paramcard_RESTRICTNAME.dat
+                    exists, then this file is use as default param_card for that restriction.
+
 2.0.0(14/12/13)    CHANGE IN DEFAULT:
                    ------------------
                       OM: Change the Higgs mass to 125 GeV for most of the model (but the susy/v4 one).
@@ -34,7 +45,7 @@
                           the 4-flavor scheme. Note that auto_ptj_mjj must be set to
                           .false. for this to work properly.
                       OM: Change model restriction behavior: two widths with identical are not merged anymore.
-                      S.Pretzel(via OM): implement KT Durham cut. (thanks to Z. Marshall)
+                      S.Prestel(via OM): implement KT Durham cut. (thanks to Z. Marshall)
                       OM: Improved check for unresponsive of PBS cluster (thanks J. Mc Fayden)
                       OM: Implement a maximum number (2500) of jobs which can be submitted at the same time
                           by the PBS cluster. This number is currently not editable via configuration file.

=== modified file 'aloha/aloha_lib.py'
--- aloha/aloha_lib.py	2013-12-10 22:31:12 +0000
+++ aloha/aloha_lib.py	2014-01-19 08:21:29 +0000
@@ -120,7 +120,7 @@
         new_2 = new_2.factorize()
         self.reduced_expr2[tag] = new_2
         self.add_tag((tag,))
-        self.unknow_fct = []
+        #self.unknow_fct = []
         #return expression
         return new
     

=== modified file 'aloha/aloha_writers.py'
--- aloha/aloha_writers.py	2013-11-23 21:12:58 +0000
+++ aloha/aloha_writers.py	2014-01-19 08:21:29 +0000
@@ -2118,34 +2118,34 @@
 
 
     
-unknow_fct_template = """
-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
-       double complex %(fct_name)s(%(args)s)
-       implicit none
-c      Include Model parameter / coupling
-       include \"../MODEL/input.inc\"
-       include \"../MODEL/coupl.inc\"
-c      Defintion of the arguments       
-%(definitions)s
-       
-c      enter HERE the code corresponding to your function.
-c      The output value should be put to the %(fct_name)s variable.
-
-
-       return
-       end
-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
-
-"""
-        
-def write_template_fct(fct_name, nb_args, output_dir):
-        """create a template for function not recognized by ALOHA"""
-
-        dico = {'fct_name' : fct_name,
-                'args': ','.join(['S%i' %(i+1) for i in range(nb_args)]),
-                'definitions': '\n'.join(['       double complex S%i' %(i+1) for i in range(nb_args)])}
-
-        ff = open(pjoin(output_dir, 'additional_aloha_function.f'), 'a')
-        ff.write(unknow_fct_template % dico)
-        ff.close()
+#unknow_fct_template = """
+#cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+#       double complex %(fct_name)s(%(args)s)
+#       implicit none
+#c      Include Model parameter / coupling
+#       include \"../MODEL/input.inc\"
+#       include \"../MODEL/coupl.inc\"
+#c      Defintion of the arguments       
+#%(definitions)s
+#       
+#c      enter HERE the code corresponding to your function.
+#c      The output value should be put to the %(fct_name)s variable.
+#
+#
+#       return
+#       end
+#cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+#
+#"""
+#        
+#def write_template_fct(fct_name, nb_args, output_dir):
+#        """create a template for function not recognized by ALOHA"""
+#
+#        dico = {'fct_name' : fct_name,
+#                'args': ','.join(['S%i' %(i+1) for i in range(nb_args)]),
+#                'definitions': '\n'.join(['       double complex S%i' %(i+1) for i in range(nb_args)])}
+#
+#        ff = open(pjoin(output_dir, 'additional_aloha_function.f'), 'a')
+#        ff.write(unknow_fct_template % dico)
+#        ff.close()
 

=== modified file 'aloha/create_aloha.py'
--- aloha/create_aloha.py	2013-11-29 07:28:53 +0000
+++ aloha/create_aloha.py	2014-01-19 08:21:29 +0000
@@ -979,22 +979,22 @@
         for routine in self.external_routines:
             self.locate_external(routine, language, output_dir)
 
-        if aloha_lib.KERNEL.unknow_fct:
-            if  language == 'Fortran':
-                logger.warning('''Some function present in the lorentz structure are not
-            recognized. A Template file has been created:
-            %s
-            Please edit this file to include the associated definition.''' % \
-               pjoin(output_dir, 'additional_aloha_function.f') )
-            else:
-                logger.warning('''Some function present in the lorentz structure are 
-                not recognized. Please edit the code to add the defnition of such function.''')
-                logger.info('list of missing fct: %s .' % \
-                            ','.join([a[0] for a in aloha_lib.KERNEL.unknow_fct]))
-        
-        for fct_name, nb_arg in aloha_lib.KERNEL.unknow_fct:
-            if language == 'Fortran':
-                aloha_writers.write_template_fct(fct_name, nb_arg, output_dir)
+#        if aloha_lib.KERNEL.unknow_fct:
+#            if  language == 'Fortran':
+#                logger.warning('''Some function present in the lorentz structure are not
+#            recognized. A Template file has been created:
+#            %s
+#            Please edit this file to include the associated definition.''' % \
+#               pjoin(output_dir, 'additional_aloha_function.f') )
+#            else:
+#                logger.warning('''Some function present in the lorentz structure are 
+#                not recognized. Please edit the code to add the defnition of such function.''')
+#                logger.info('list of missing fct: %s .' % \
+#                            ','.join([a[0] for a in aloha_lib.KERNEL.unknow_fct]))
+#        
+#        for fct_name, nb_arg in aloha_lib.KERNEL.unknow_fct:
+#            if language == 'Fortran':
+#                aloha_writers.write_template_fct(fct_name, nb_arg, output_dir)
         
 
         

=== modified file 'bin/compile.py'
--- bin/compile.py	2013-11-12 23:52:05 +0000
+++ bin/compile.py	2014-01-19 08:21:29 +0000
@@ -24,9 +24,11 @@
 
 from madgraph import MG5DIR
 import madgraph.iolibs.import_v4 as import_v4
+import madgraph.interface.master_interface as interface
 import models.import_ufo as import_ufo
 import aloha.create_aloha as create_aloha
 import madgraph.iolibs.files as files
+import madgraph.various.misc as misc
 
 # Set logging level to error
 logging.basicConfig(level=vars(logging)['INFO'],
@@ -37,13 +39,18 @@
     
     def __init__(self):
         """ launch all the compilation """
+
         self.make_UFO_pkl()
         self.make_v4_pkl()
-        
+        self.make_stdHep()
+        self.make_CutTools()
+
         #important for UCL cluster
         files.cp(pjoin(MG5DIR,'input','.mg5_configuration_default.txt'),
                  pjoin(MG5DIR,'input','mg5_configuration.txt'))
-        
+        self.cmd = interface.MasterCmd()        
+        self.install_package()
+
     @staticmethod
     def make_v4_pkl():
         """create the model.pkl for each directory"""
@@ -104,8 +111,66 @@
             output_dir = os.path.join(model_path, 'Fortran')
             create_aloha.AbstractALOHAModel(ufo_name, write_dir=output_dir, format='Fortran')
             print 'done in %2fs' % (time.time() - start)
-            
-            
-            
+           
+    @staticmethod
+    def make_stdHep():
+        print "Compiling StdHEP in %s."%str(os.path.join(MG5DIR, 'vendor', 'StdHEP'))
+        # this is for 64-bit systems
+        if sys.maxsize > 2**32:
+            path = os.path.join(MG5DIR, 'vendor', 'StdHEP', 'src', 'make_opts')
+            text = open(path).read()
+            text = text.replace('MBITS=32','MBITS=64')
+            open(path, 'w').writelines(text)
+        # Set the correct fortran compiler
+        if 'FC' not in os.environ or not os.environ['FC']:
+            if misc.which('gfortran'):
+                compiler = 'FC=gfortran'
+            elif misc.which('g77'):
+                compiler = 'FC=g77'
+            else:
+                raise self.InvalidCmd('Require g77 or Gfortran compiler')
+        else:
+            compiler = '#FC=gfortran'
+
+        base_compiler= ['FC=g77','FC=gfortran','#FC=g77','#FC=gfortran']
+        path = None            
+        path = os.path.join(MG5DIR, 'vendor', 'StdHEP', 'src', 'make_opts')
+        text = open(path).read()
+        for base in base_compiler:
+            text = text.replace(base,compiler)
+        open(path, 'w').writelines(text)
+
+        misc.compile(cwd = os.path.join(MG5DIR, 'vendor', 'StdHEP'))
+
+    @staticmethod
+    def make_CutTools():
+        print "Compiling CutTools in %s."%str(os.path.join(MG5DIR, 'vendor', 'CutTools'))
+        # Set the correct fortran compiler
+        if 'FC' not in os.environ or not os.environ['FC']:
+            if misc.which('gfortran'):
+                compiler = 'FC=gfortran'
+            else:
+                raise self.InvalidCmd('Require gfortran compiler')
+        else:
+            compiler = '#FC=gfortran'
+        
+        base_compiler= ['FC=gfortran','#FC=gfortran']            
+        path = None            
+        path = os.path.join(MG5DIR, 'vendor', 'CutTools', 'makefile')
+        text = open(path).read()
+        for base in base_compiler:
+            text = text.replace(base,compiler)
+        open(path, 'w').writelines(text)
+
+        misc.compile(cwd = os.path.join(MG5DIR, 'vendor', 'CutTools'))
+
+    def install_package(self):
+        print "installing external package"
+        self.cmd.exec_cmd('install pythia-pgs')
+        self.cmd.exec_cmd('install Delphes')
+        self.cmd.exec_cmd('install ExRootAnalysis')
+        self.cmd.exec_cmd('install MadAnalysis')
+        self.cmd.exec_cmd('install SysCalc')
+
 if __name__ == '__main__':
-    Compile_MG5()
\ No newline at end of file
+    Compile_MG5()

=== modified file 'bin/mg5'
--- bin/mg5	2013-11-20 18:54:02 +0000
+++ bin/mg5	2014-01-19 08:21:29 +0000
@@ -27,4 +27,4 @@
 print '\033[91mWarning: The script ./bin/mg5 will be removed in future versions; use ./bin/mg5_aMC instead.\033[0m'
 
 sys.argv.pop(0)
-os.system('%s %s' %( str(exe_path) , ' '.join(sys.argv) ))
+os.system('%s %s %s' %(sys.executable, str(exe_path) , ' '.join(sys.argv) ))

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2013-12-15 16:46:18 +0000
+++ madgraph/VERSION	2014-01-19 08:21:29 +0000
@@ -1,4 +1,4 @@
-version = 2.0.0
+version = 2.0.1
 date = 2013-12-14
 
 

=== modified file 'madgraph/interface/amcatnlo_interface.py'
--- madgraph/interface/amcatnlo_interface.py	2013-11-29 07:28:53 +0000
+++ madgraph/interface/amcatnlo_interface.py	2014-01-19 08:21:29 +0000
@@ -604,7 +604,6 @@
         # check argument validity and normalise argument
         (options, argss) = _launch_parser.parse_args(argss)
         options = options.__dict__
-        options['name'] = ''
         self.check_launch(argss, options)
         if not os.path.isdir(os.path.join(os.getcwd(), argss[0], 'Events')):
             self.do_switch('ML5')
@@ -654,7 +653,7 @@
                             help="Use interactive consol")
 _launch_parser.add_option("-m", "--multicore", default=False, action='store_true',
                             help="Submit the jobs on multicore mode")
-_launch_parser.add_option("-n", "--nocompile", default=False, action='store_true',
+_launch_parser.add_option("-x", "--nocompile", default=False, action='store_true',
                             help="Skip compilation. Ignored if no executable is found")
 _launch_parser.add_option("-r", "--reweightonly", default=False, action='store_true',
                             help="Skip integration and event generation, just run reweight on the" + \
@@ -665,4 +664,7 @@
 _launch_parser.add_option("-o", "--only_generation", default=False, action='store_true',
                             help="Skip grid set up, just generate events starting from " + \
                             "the last available results")
-
+# the last option is different from the corresponding in amcatnlo_run_interface as it stores the 
+# 'name' entry of the options, not the run_name one
+_launch_parser.add_option("-n", "--name", default=False, dest='name',
+                            help="Provide a name to the run")

=== modified file 'madgraph/interface/amcatnlo_run_interface.py'
--- madgraph/interface/amcatnlo_run_interface.py	2013-12-12 12:59:35 +0000
+++ madgraph/interface/amcatnlo_run_interface.py	2014-01-19 08:21:29 +0000
@@ -132,7 +132,8 @@
     If block, stops the execution, otherwise just print a warning"""
 
     msg = 'In order to be able to run at NLO MadGraph5_aMC@NLO, you need to have ' + \
-            'gfortran 4.6 or later installed.\n%s has been detected'
+            'gfortran 4.6 or later installed.\n%s has been detected\n'+\
+            'Note that You can still run all MadEvent run without any problem!'
     #first check that gfortran is installed
     if options['fortran_compiler']:
         compiler = options['fortran_compiler']
@@ -331,9 +332,11 @@
         _compile_parser.print_help()
 
     def help_generate_events(self):
-        """help for generate_events command"""
+        """help for generate_events commandi
+        just call help_launch"""
         _generate_events_parser.print_help()
 
+
     def help_calculate_xsect(self):
         """help for generate_events command"""
         _calculate_xsect_parser.print_help()
@@ -708,17 +711,9 @@
             return self.list_completion(text, opts, line) 
 
     def complete_generate_events(self, text, line, begidx, endidx):
-        """auto-completion for launch command"""
-        
-        args = self.split_arg(line[0:begidx])
-        if len(args) == 1:
-            #return mode
-            return self.list_completion(text,['LO','NLO'],line)
-        else:
-            opts = []
-            for opt in _generate_events_parser.option_list:
-                opts += opt._long_opts + opt._short_opts
-            return self.list_completion(text, opts, line) 
+        """auto-completion for generate_events command
+        call the compeltion for launch"""
+        self.complete_launch(text, line, begidx, endidx)
 
 
     def complete_shower(self, text, line, begidx, endidx):
@@ -836,7 +831,7 @@
     def do_shower(self, line):
         """ run the shower on a given parton level file """
         argss = self.split_arg(line)
-        (options, argss) = _generate_events_parser.parse_args(argss)
+        (options, argss) = _launch_parser.parse_args(argss)
         # check argument validity and normalise argument
         options = options.__dict__
         options['reweightonly'] = False
@@ -956,76 +951,26 @@
 
     ############################################################################      
     def do_calculate_xsect(self, line):
-        """Main commands: calculates LO/NLO cross-section, using madevent_mintFO """
+        """Main commands: calculates LO/NLO cross-section, using madevent_mintFO 
+        this function wraps the do_launch one"""
         
         self.start_time = time.time()
         argss = self.split_arg(line)
         # check argument validity and normalise argument
-        (options, argss) = _generate_events_parser.parse_args(argss)
+        (options, argss) = _calculate_xsect_parser.parse_args(argss)
         options = options.__dict__
         options['reweightonly'] = False
         options['parton'] = True
         self.check_calculate_xsect(argss, options)
-        
-        if options['multicore']:
-            self.cluster_mode = 2
-        elif options['cluster']:
-            self.cluster_mode = 1
-        
-        mode = argss[0]
-        self.ask_run_configuration(mode, options)
-
-        self.results.add_detail('run_mode', mode) 
-
-        self.update_status('Starting run', level=None, update_results=True)
-
-        if self.options['automatic_html_opening']:
-            misc.open_file(os.path.join(self.me_dir, 'crossx.html'))
-            self.options['automatic_html_opening'] = False
-
-        self.compile(mode, options) 
-        self.run(mode, options)
-        self.update_status('', level='all', update_results=True)
+        self.do_launch(line, options, argss)
+        
 
         
     ############################################################################      
     def do_generate_events(self, line):
-        """Main commands: generate events """
-        
-        self.start_time = time.time()
-        argss = self.split_arg(line)
-        # check argument validity and normalise argument
-        (options, argss) = _generate_events_parser.parse_args(argss)
-        options = options.__dict__
-        options['reweightonly'] = False
-        self.check_generate_events(argss, options)
-        
-        if options['multicore']:
-            self.cluster_mode = 2
-        elif options['cluster']:
-            self.cluster_mode = 1
-
-        mode = 'aMC@' + argss[0]
-        if options['parton'] and mode == 'aMC@NLO':
-            mode = 'noshower'
-        elif options['parton'] and mode == 'aMC@LO':
-            mode = 'noshowerLO'
-        self.ask_run_configuration(mode, options)
-
-        self.results.add_detail('run_mode', mode) 
-
-        self.update_status('Starting run', level=None, update_results=True)
-
-        if self.options['automatic_html_opening']:
-            misc.open_file(os.path.join(self.me_dir, 'crossx.html'))
-            self.options['automatic_html_opening'] = False
-
-        self.compile(mode, options) 
-        evt_file = self.run(mode, options)
-        if not options['parton']:
-            self.run_mcatnlo(evt_file)
-
-        self.update_status('', level='all', update_results=True)
+        """Main commands: generate events  
+        this function just wraps the do_launch one"""
+        self.do_launch(line)
 
     ############################################################################
     def do_treatcards(self, line, amcatnlo=True):
@@ -1039,15 +984,28 @@
         return super(aMCatNLOCmd,self).set_configuration(amcatnlo=amcatnlo, **opt)
     
     ############################################################################      
-    def do_launch(self, line):
-        """Main commands: launch the full chain """
+    def do_launch(self, line, options={}, argss=[]):
+        """Main commands: launch the full chain 
+        options and args are relevant if the function is called from other 
+        functions, such as generate_events or calculate_xsect"""
         
-        self.start_time = time.time()
-        argss = self.split_arg(line)
-        # check argument validity and normalise argument
-        (options, argss) = _launch_parser.parse_args(argss)
-        options = options.__dict__
-        self.check_launch(argss, options)
+        if not argss and not options:
+            self.start_time = time.time()
+            argss = self.split_arg(line)
+            # check argument validity and normalise argument
+            (options, argss) = _launch_parser.parse_args(argss)
+            options = options.__dict__
+            self.check_launch(argss, options)
+
+        if 'run_name' in options.keys() and options['run_name']:
+            self.run_name = options['run_name']
+            # if a dir with the given run_name already exists
+            # remove it and warn the user
+            if os.path.isdir(pjoin(self.me_dir, 'Events', self.run_name)):
+                logger.warning('Removing old run information in \n'+
+                                pjoin(self.me_dir, 'Events', self.run_name))
+                files.rm(pjoin(self.me_dir, 'Events', self.run_name))
+                self.results.delete_run(self.run_name)
 
         if options['multicore']:
             self.cluster_mode = 2
@@ -1570,8 +1528,8 @@
         except Exception as e:
             debug_msg = 'Advanced statistics collection failed with error "%s"'%str(e)
 
+        logger.debug(debug_msg+'\n')
         logger.info(message+'\n')
-        logger.debug(debug_msg+'\n')
         
         # Now copy relevant information in the Events/Run_<xxx> directory
         evt_path = pjoin(self.me_dir, 'Events', self.run_name)
@@ -1924,7 +1882,9 @@
         else:            
             debug_msg += '\n\n  Inclusive timing profile non available.'
         
-        for name in stats['timings'].keys():
+        sorted_keys = sorted(stats['timings'].keys(), key= lambda stat: \
+                              sum(stats['timings'][stat].values()), reverse=True)
+        for name in sorted_keys:
             if name=='Total':
                 continue
             if sum(stats['timings'][name].values())<=0.0:
@@ -1937,17 +1897,17 @@
                 debug_msg += '\n\n  Timing profile for %s unavailable.'%name
                 continue
             TimeList.sort()
-            debug_msg += '\n  Timing profile for %s :'%name
+            debug_msg += '\n  Timing profile for <%s> :'%name
+            try:
+                debug_msg += '\n    Overall fraction of time         %.3f %%'%\
+                       float((100.0*(sum(stats['timings'][name].values())/
+                                      sum(stats['timings']['Total'].values()))))
+            except KeyError, ZeroDivisionError:
+                debug_msg += '\n    Overall fraction of time unavailable.'
             debug_msg += '\n    Largest fraction of time         %.3f %% (%s)'%\
                                              (TimeList[-1][0],TimeList[-1][1])
             debug_msg += '\n    Smallest fraction of time        %.3f %% (%s)'%\
                                              (TimeList[0][0],TimeList[0][1])
-            try:
-                debug_msg += '\n    Overall fraction of time         %.3f %%'%\
-                       float((100.0*(sum(stats['timings'][name].values())/
-                                      sum(stats['timings']['Total'].values()))))
-            except KeyError, ZeroDivisionError:
-                debug_msg += '\n    Overall fraction of time unavailable.'
 
         # =============================     
         # == log file eror detection ==
@@ -3397,11 +3357,13 @@
         if not mode =='onlyshower':
             self.run_card = self.banner.charge_card('run_card')
             self.run_tag = self.run_card['run_tag']
-            self.run_name = self.find_available_run_name(self.me_dir)
-            #add a tag in the run_name for distinguish run_type
-            if self.run_name.startswith('run_'):
-                if mode in ['LO','aMC@LO','noshowerLO']:
-                    self.run_name += '_LO' 
+            #this is if the user did not provide a name for the current run
+            if not hasattr(self, 'run_name') or not self.run_name:
+                self.run_name = self.find_available_run_name(self.me_dir)
+                #add a tag in the run_name for distinguish run_type
+                if self.run_name.startswith('run_'):
+                    if mode in ['LO','aMC@LO','noshowerLO']:
+                        self.run_name += '_LO' 
             self.set_run_name(self.run_name, self.run_tag, 'parton')
             if int(self.run_card['ickkw']) == 3 and mode in ['LO', 'aMC@LO', 'noshowerLO']:
                 logger.error("""FxFx merging (ickkw=3) not allowed at LO""")
@@ -3466,7 +3428,7 @@
                             help="Submit the jobs on the cluster")
 _launch_parser.add_option("-m", "--multicore", default=False, action='store_true',
                             help="Submit the jobs on multicore mode")
-_launch_parser.add_option("-n", "--nocompile", default=False, action='store_true',
+_launch_parser.add_option("-x", "--nocompile", default=False, action='store_true',
                             help="Skip compilation. Ignored if no executable is found")
 _launch_parser.add_option("-r", "--reweightonly", default=False, action='store_true',
                             help="Skip integration and event generation, just run reweight on the" + \
@@ -3477,6 +3439,41 @@
 _launch_parser.add_option("-o", "--only_generation", default=False, action='store_true',
                             help="Skip grid set up, just generate events starting from " + \
                             "the last available results")
+_launch_parser.add_option("-n", "--name", default=False, dest='run_name',
+                            help="Provide a name to the run")
+
+
+_generate_events_usage = "generate_events [MODE] [options]\n" + \
+                "-- execute aMC@NLO \n" + \
+                "   MODE can be either LO, NLO, aMC@NLO or aMC@LO (if omitted, it is asked in a separate question)\n" + \
+                "     If mode is set to LO/NLO, no event generation will be performed, but only the \n" + \
+                "     computation of the total cross-section and the filling of parton-level histograms \n" + \
+                "     specified in the DIRPATH/SubProcesses/madfks_plot.f file.\n" + \
+                "     If mode is set to aMC@LO/aMC@NLO, after the cross-section computation, a .lhe \n" + \
+                "     event file is generated which will be showered with the MonteCarlo specified \n" + \
+                "     in the run_card.dat\n"
+
+_generate_events_parser = misc.OptionParser(usage=_generate_events_usage)
+_generate_events_parser.add_option("-f", "--force", default=False, action='store_true',
+                                help="Use the card present in the directory for the generate_events, without editing them")
+_generate_events_parser.add_option("-c", "--cluster", default=False, action='store_true',
+                            help="Submit the jobs on the cluster")
+_generate_events_parser.add_option("-m", "--multicore", default=False, action='store_true',
+                            help="Submit the jobs on multicore mode")
+_generate_events_parser.add_option("-x", "--nocompile", default=False, action='store_true',
+                            help="Skip compilation. Ignored if no executable is found")
+_generate_events_parser.add_option("-r", "--reweightonly", default=False, action='store_true',
+                            help="Skip integration and event generation, just run reweight on the" + \
+                                 " latest generated event files (see list in SubProcesses/nevents_unweighted)")
+_generate_events_parser.add_option("-p", "--parton", default=False, action='store_true',
+                            help="Stop the run after the parton level file generation (you need " + \
+                                    "to shower the file in order to get physical results)")
+_generate_events_parser.add_option("-o", "--only_generation", default=False, action='store_true',
+                            help="Skip grid set up, just generate events starting from " + \
+                            "the last available results")
+_generate_events_parser.add_option("-n", "--name", default=False, dest='run_name',
+                            help="Provide a name to the run")
+
 
 
 _calculate_xsect_usage = "calculate_xsect [ORDER] [options]\n" + \
@@ -3490,9 +3487,10 @@
                             help="Submit the jobs on the cluster")
 _calculate_xsect_parser.add_option("-m", "--multicore", default=False, action='store_true',
                             help="Submit the jobs on multicore mode")
-_calculate_xsect_parser.add_option("-n", "--nocompile", default=False, action='store_true',
-                            help="Skip compilation. Ignored if no executable is found, " + \
-                            "or with --tests")
+_calculate_xsect_parser.add_option("-x", "--nocompile", default=False, action='store_true',
+                            help="Skip compilation. Ignored if no executable is found")
+_calculate_xsect_parser.add_option("-n", "--name", default=False, dest='run_name',
+                            help="Provide a name to the run")
 
 _shower_usage = 'shower run_name [options]\n' + \
         '-- do shower/hadronization on parton-level file generated for run run_name\n' + \
@@ -3503,25 +3501,3 @@
                                 help="Use the shower_card present in the directory for the launch, without editing")
 
 
-_generate_events_usage = "generate_events [ORDER] [options]\n" + \
-                "-- generate events to be showered, corresponding to a cross-section computed up to ORDER.\n" + \
-                "   ORDER can be either LO or NLO (if omitted, it is set to NLO). \n" + \
-                "   The number of events and the specific parton shower MC can be specified \n" + \
-                "   in the run_card.dat\n"
-
-_generate_events_parser = misc.OptionParser(usage=_generate_events_usage)
-_generate_events_parser.add_option("-f", "--force", default=False, action='store_true',
-                                help="Use the card present in the directory for the launch, without editing them")
-_generate_events_parser.add_option("-c", "--cluster", default=False, action='store_true',
-                            help="Submit the jobs on the cluster")
-_generate_events_parser.add_option("-m", "--multicore", default=False, action='store_true',
-                            help="Submit the jobs on multicore mode")
-_generate_events_parser.add_option("-n", "--nocompile", default=False, action='store_true',
-                            help="Skip compilation. Ignored if no executable is found, " + \
-                            "or with --tests")
-_generate_events_parser.add_option("-o", "--only-generation", default=False, action='store_true',
-                            help="Skip grid set up, just generate events starting from" + \
-                            "the last available results")
-_generate_events_parser.add_option("-p", "--parton", default=False, action='store_true',
-                            help="Stop the run after the parton level file generation (you need " + \
-                                    "to shower the file in order to get physical results)")

=== modified file 'madgraph/interface/launch_ext_program.py'
--- madgraph/interface/launch_ext_program.py	2013-12-14 22:59:27 +0000
+++ madgraph/interface/launch_ext_program.py	2014-01-19 08:21:29 +0000
@@ -370,7 +370,12 @@
         
         #Check if some configuration were overwritten by a command. If so use it    
         set_cmd = [l for l in self.cmd_int.history if l.strip().startswith('set')]
+        all_options = usecmd.options_configuration.keys() +  usecmd.options_madgraph.keys() + usecmd.options_madevent.keys()
         for line in set_cmd:
+            arg = line.split()
+            if arg[1] not in all_options:
+                continue
+            misc.sprint(line)
             try:
                 usecmd.exec_cmd(line)
             except Exception, error:
@@ -381,7 +386,9 @@
                      usecmd, interface=False)
         #launch.me_dir = self.running_dir
         option_line = ' '.join([' --%s' % opt for opt in self.options.keys() \
-                if self.options[opt] and not opt in ['cluster', 'multicore']])
+                if self.options[opt] and not opt in ['cluster', 'multicore', 'name']])
+        if self.options['name']:
+            option_line += '--name %s' %  self.options['name']  
         command = 'launch ' + self.run_mode + ' ' + option_line
 
         if mode == "1":

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2013-12-12 12:59:35 +0000
+++ madgraph/interface/madevent_interface.py	2014-01-19 08:21:29 +0000
@@ -1760,7 +1760,8 @@
         self.web = True
         self.results.def_web_mode(True)
         self.force = True
-
+        if os.environ['MADGRAPH_BASE']:
+            self.options['mg5_path'] = pjoin(os.environ['MADGRAPH_BASE'],'MG5')
 
     ############################################################################            
     def check_output_type(self, path):
@@ -1798,7 +1799,9 @@
                         logger.info("No valid pythia-pgs path found")
                         continue
                 elif key == "delphes_path":
-                    if not os.path.exists(pjoin(path, 'Delphes')):
+                    if not os.path.exists(pjoin(path, 'Delphes')) and not\
+                                     os.path.exists(pjoin(path, 'DelphesSTDHEP')):
+                        misc.sprint(pjoin(path, 'Delphes'))
                         logger.info("No valid Delphes path found")
                         continue
                 elif key == "madanalysis_path":

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2013-12-15 16:46:18 +0000
+++ madgraph/interface/madgraph_interface.py	2014-01-19 08:21:29 +0000
@@ -1515,11 +1515,11 @@
             raise self.WebRestriction, 'import requires at least one option'
         
         if args[0] not in self._import_formats:
-            args[:] = ['command', './Cards/proc_card_mg5.dat']
+            args[:] = ['command', './proc_card_mg5.dat']
         elif args[0] == 'proc_v4':
-            args[:] = [args[0], './Cards/proc_card.dat']
+            args[:] = [args[0], './proc_card.dat']
         elif args[0] == 'command':
-            args[:] = [args[0], './Cards/proc_card_mg5.dat']
+            args[:] = [args[0], './proc_card_mg5.dat']
 
         CheckValidForCmd.check_import(self, args)
         
@@ -1556,12 +1556,11 @@
     def check_output(self, args):
         """ check the validity of the line"""
 
-        
         # first pass to the default
         CheckValidForCmd.check_output(self, args)
+        args[:] = ['.', '-f']        
         
-        args[:] = [self._export_format, '.', '-f']
-
+        self._export_dir = os.path.realpath(os.getcwd())
         # Check that we output madevent
         if 'madevent' != self._export_format:
                 raise self.WebRestriction, 'only available output format is madevent (at current stage)'
@@ -3009,6 +3008,10 @@
         proc_line = " ".join(args[1:])
         myprocdef = self.extract_process(proc_line)
 
+        # If the test has to write out on disk, it should do so at the location
+        # specified below where the user must be sure to have writing access.
+        output_path = os.getcwd()
+
         # Check that we have something    
         if not myprocdef:
             raise self.InvalidCmd("Empty or wrong format process, please try again.")
@@ -3075,14 +3078,15 @@
                                                   param_card = param_card,
                                                   cuttools=CT_dir,
                                                   options = options,
-                                                  cmd = self,
-                                                  )        
+                                                  output_path = output_path,
+                                                  cmd = self)        
 
         if args[0] in ['stability']:
             stability = process_checks.check_stability(myprocdef,
                                                   param_card = param_card,
                                                   cuttools=CT_dir,
                                                   options = options,
+                                                  output_path = output_path,
                                                   cmd = self)
 
         if args[0] in ['profile']:
@@ -3092,6 +3096,7 @@
                                                   param_card = param_card,
                                                   cuttools=CT_dir,
                                                   options = options,
+                                                  output_path = output_path,
                                                   cmd = self)
 
         if args[0] in  ['gauge', 'full'] and \
@@ -3119,6 +3124,7 @@
                                                 options=options,
                                                 cuttools=CT_dir,
                                                 reuse = options['reuse'],
+                                                output_path = output_path,
                                                 cmd = self)
             
             # restore previous settings
@@ -3133,6 +3139,7 @@
                                             cuttools=CT_dir,
                                             reuse = options['reuse'],
                                             cmd = self,
+                                            output_path = output_path,
                                             options=options)
             nb_processes += len(comparisons[0])
 
@@ -3143,6 +3150,7 @@
                                           cuttools=CT_dir,
                                           reuse = options['reuse'],
                                           cmd = self,
+                                          output_path = output_path,
                                           options=options)
             nb_processes += len(lorentz_result)
         
@@ -3152,6 +3160,7 @@
                                           cuttools=CT_dir,
                                           reuse = options['reuse'],
                                           cmd = self,
+                                          output_path = output_path,
                                           options=options)
             nb_processes += len(gauge_result)     
             
@@ -3180,14 +3189,13 @@
         if stability:
             text += 'Stability result for the '+('optimized' if \
               self.options['loop_optimized_output'] else 'default')+' output:\n'
-            text += process_checks.output_stability(stability,
-                                    mg_root=self._mgme_dir)
+            text += process_checks.output_stability(stability,output_path)
         
         if profile_time and profile_stab:
             text += 'Timing result '+('optimized' if \
                     self.options['loop_optimized_output'] else 'default')+':\n'
             text += process_checks.output_profile(myprocdef, profile_stab,
-                                   profile_time, self._mgme_dir,options['reuse']) + '\n'
+                             profile_time, output_path, options['reuse']) + '\n'
         if lorentz_result:
             text += 'Lorentz invariance results:\n'
             text += process_checks.output_lorentz_inv(lorentz_result) + '\n'
@@ -4157,10 +4165,27 @@
                 #SLC6 needs to have this first (don't ask why)
                 status = self.compile(mode='', cwd = pjoin(MG5DIR, name, 'libraries', 'pylib'))
             status = self.compile(mode='', cwd = os.path.join(MG5DIR, name))
+            
         if not status:
             logger.info('Compilation succeeded')
         else:
-            logger.warning('Error detected during the compilation. Please check the compilation error and run make manually.')
+            # For pythia-pgs check when removing the "-fno-second-underscore" flag
+            if name == 'pythia-pgs':
+                to_comment = ['libraries/PGS4/src/stdhep-dir/mcfio/arch_mcfio',
+                              'libraries/PGS4/src/stdhep-dir/src/stdhep_Arch']
+                for f in to_comment:
+                    f = pjoin(MG5DIR, name, *f.split('/'))
+                    text = "".join(l for l in open(f) if 'fno-second-underscore' not in l)
+                    fsock = open(f,'w').write(text)
+                try:
+                    misc.compile(['clean'], mode='', cwd = os.path.join(MG5DIR, name))
+                except Exception:
+                    pass
+                status = self.compile(mode='', cwd = os.path.join(MG5DIR, name))
+            if not status:
+                logger.info('Compilation succeeded')
+            else:
+                logger.warning('Error detected during the compilation. Please check the compilation error and run make manually.')
 
 
         # Special treatment for TD/Ghostscript program (require by MadAnalysis)
@@ -5261,7 +5286,10 @@
         
         options = config[self._export_format]
         # check
-        if not noclean and os.path.isdir(self._export_dir) and options['check']:
+        if os.path.realpath(self._export_dir) == os.getcwd():
+            if not args[0] in ['.', '-f']:
+                raise self.InvalidCmd, 'Wrong path directory to create in local directory use \'.\''                
+        elif not noclean and os.path.isdir(self._export_dir) and options['check']:
             if not force:
                 # Don't ask if user already specified force or noclean
                 logger.info('INFO: directory %s already exists.' % self._export_dir)

=== modified file 'madgraph/interface/master_interface.py'
--- madgraph/interface/master_interface.py	2013-12-10 16:28:23 +0000
+++ madgraph/interface/master_interface.py	2014-01-19 08:21:29 +0000
@@ -601,7 +601,7 @@
             self.debug_link_to_command()      
         
 
-class MasterCmdWeb(LoopCmd.LoopInterfaceWeb, Switcher):
+class MasterCmdWeb(MGcmd.MadGraphCmdWeb, Switcher, LoopCmd.LoopInterfaceWeb):
    
     def __init__(self, *arg, **opt):
     
@@ -629,6 +629,9 @@
         if __debug__:
             self.debug_link_to_command() 
     
+    def do_shell(self, *args):
+        raise Exception
+    
     def finalize(self, nojpeg):
         """Finalize web generation""" 
         

=== modified file 'madgraph/iolibs/export_fks.py'
--- madgraph/iolibs/export_fks.py	2013-12-11 13:56:21 +0000
+++ madgraph/iolibs/export_fks.py	2014-01-19 08:21:29 +0000
@@ -147,7 +147,7 @@
                                        
         # Write the cts_mpc.h and cts_mprec.h files imported from CutTools
         self.write_mp_files(writers.FortranWriter('cts_mprec.h'),\
-                            writers.FortranWriter('cts_mpc.h'),)
+                                           writers.FortranWriter('cts_mpc.h'))
 
         # Return to original PWD
         os.chdir(cwd)
@@ -514,7 +514,8 @@
                      'cluster.f',
                      'reweight.f',
                      'sudakov.inc',
-                     'maxconfigs.inc']
+                     'maxconfigs.inc',
+                     'timing_variables.inc']
 
         for file in linkfiles:
             ln('../' + file , '.')
@@ -850,8 +851,10 @@
         file = \
 """double precision function dlum()
 implicit none
+include 'timing_variables.inc'
 integer nfksprocess
 common/c_nfksprocess/nfksprocess
+call cpu_time(tbefore)
 """
         for n, info in enumerate(matrix_element.get_fks_info_list()):
             file += \
@@ -863,7 +866,8 @@
 write(*,*) 'ERROR: invalid n in dlum :', nfksprocess
 stop
 endif
-
+call cpu_time(tAfter)
+tPDF = tPDF + (tAfter-tBefore)
 return
 end
 """
@@ -883,10 +887,6 @@
 double precision wgt
 integer nfksprocess
 common/c_nfksprocess/nfksprocess
-real*4 tbefore, tAfter
-real*4 tTot, tOLP, tFastJet, tPDF
-common/timings/tTot, tOLP, tFastJet, tPDF
-call cpu_time(tbefore)
 """
         for n, info in enumerate(matrix_element.get_fks_info_list()):
             file += \
@@ -898,8 +898,6 @@
 write(*,*) 'ERROR: invalid n in real_matrix :', nfksprocess
 stop
 endif
-call cpu_time(tAfter)
-tPDF = tPDF + (tAfter-tBefore)
 return
 end
 """

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2013-12-13 11:06:58 +0000
+++ madgraph/iolibs/export_v4.py	2014-01-19 08:21:29 +0000
@@ -103,7 +103,31 @@
                                             card + '_default.dat'))
                 except IOError:
                     logger.warning("Failed to copy " + card + ".dat to default")
-                    
+        elif os.getcwd() == os.path.realpath(self.dir_path):
+            logger.info('working in local directory: %s' % \
+                                                os.path.realpath(self.dir_path))
+            # distutils.dir_util.copy_tree since dir_path already exists
+            dir_util.copy_tree(pjoin(self.mgme_dir, 'Template/LO'), 
+                               self.dir_path)
+#            for name in glob.glob(pjoin(self.mgme_dir, 'Template/LO/*')):
+#                name = os.path.basename(name)
+#                filname = pjoin(self.mgme_dir, 'Template','LO',name)
+#                if os.path.isfile(filename):
+#                    files.cp(filename, pjoin(self.dir_path,name))
+#                elif os.path.isdir(filename):
+#                     shutil.copytree(filename, pjoin(self.dir_path,name), True)
+            # distutils.dir_util.copy_tree since dir_path already exists
+            dir_util.copy_tree(pjoin(self.mgme_dir, 'Template/Common'), 
+                               self.dir_path)
+            # Duplicate run_card and plot_card
+            for card in ['run_card', 'plot_card']:
+                try:
+                    shutil.copy(pjoin(self.dir_path, 'Cards',
+                                             card + '.dat'),
+                               pjoin(self.dir_path, 'Cards',
+                                            card + '_default.dat'))
+                except IOError:
+                    logger.warning("Failed to copy " + card + ".dat to default")            
         elif not os.path.isfile(pjoin(self.dir_path, 'TemplateVersion.txt')):
             assert self.mgme_dir, \
                       "No valid MG_ME path given for MG4 run directory creation."
@@ -2083,7 +2107,7 @@
             replace_dict['passcuts_begin'] = "IF (PASSCUTS(PP)) THEN"
             replace_dict['passcuts_end'] = "ENDIF"
             replace_dict['define_subdiag_lines'] = ""
-            replace_dict['cutsdone'] = "      cutsdone=.false."
+            replace_dict['cutsdone'] = "      cutsdone=.false.\n       cutspassed=.false."
 
         file = open(pjoin(_file_path, \
                           'iolibs/template_files/auto_dsig_v4.inc')).read()
@@ -3378,6 +3402,10 @@
         #    self.params_indep.insert(0, self.params_dep.pop(index))
         # No need to add it if not defined   
             
+        if 'aS' not in self.params_ext:
+            logger.critical('aS not define as external parameter adding it!')
+            #self.model['parameters']['aS'] = base_objects.ParamCardVariable('aS', 0.138,'DUMMY',(1,))
+            self.params_indep.append( base_objects. ModelVariable('aS', '0.138','real'))
             
     def build(self, wanted_couplings = [], full=True):
         """modify the couplings to fit with MG4 convention and creates all the 
@@ -3675,16 +3703,15 @@
                             self.params_indep if param.type == 'complex' and
                             is_valid(param.name)]
 
-        fsock.writelines('double complex '+','.join(complex_parameters)+'\n')
-        fsock.writelines('common/params_C/ '+','.join(complex_parameters)+'\n\n')
-        if self.opt['mp']:
-            mp_fsock.writelines(self.mp_complex_format+' '+','.join([\
+        if complex_parameters:
+            fsock.writelines('double complex '+','.join(complex_parameters)+'\n')
+            fsock.writelines('common/params_C/ '+','.join(complex_parameters)+'\n\n')
+            if self.opt['mp']:
+                mp_fsock.writelines(self.mp_complex_format+' '+','.join([\
                             self.mp_prefix+p for p in complex_parameters])+'\n')
-            mp_fsock.writelines('common/MP_params_C/ '+','.join([\
+                mp_fsock.writelines('common/MP_params_C/ '+','.join([\
                           self.mp_prefix+p for p in complex_parameters])+'\n\n')                
     
-    
-
     def create_intparam_def(self, dp=True, mp=False):
         """ create intparam_definition.inc setting the internal parameters.
         Output the double precision and/or the multiple precision parameters
@@ -3975,8 +4002,8 @@
         model_path = self.model.get('modelpath')
         if os.path.exists(pjoin(model_path,'Fortran','functions.f')):
             fsock.write_comment_line(' USER DEFINE FUNCTIONS ')
-            input = pjoin(self.model_path,'Fortran','functions.f')
-            fsock.writelines(open(input).read())
+            input = pjoin(model_path,'Fortran','functions.f')
+            file.writelines(fsock, open(input).read())
             fsock.write_comment_line(' END USER DEFINE FUNCTIONS ')
 
     def create_makeinc(self):
@@ -4111,8 +4138,19 @@
     def create_param_card(self):
         """ create the param_card.dat """
 
-        out_path = pjoin(self.dir_path, 'param_card.dat')
-        param_writer.ParamCardWriter(self.model, out_path)
+        #1. Check if a default param_card is present:
+        done = False
+        if hasattr(self.model, 'restrict_card'):
+            restrict_name = os.path.basename(self.model.restrict_card)[9:-4]
+            model_path = self.model.get('modelpath')
+            if os.path.exists(pjoin(model_path,'paramcard_%s.dat' % restrict_name)):
+                done = True
+                files.cp(pjoin(model_path,'paramcard_%s.dat' % restrict_name),
+                         pjoin(self.dir_path, 'param_card.dat'))
+        if not done:
+            out_path = pjoin(self.dir_path, 'param_card.dat')
+            param_writer.ParamCardWriter(self.model, out_path)
+            
         out_path2 = None
         if hasattr(self.model, 'rule_card'):
             out_path2 = pjoin(self.dir_path, 'param_card_rule.dat')

=== modified file 'madgraph/loop/loop_exporters.py'
--- madgraph/loop/loop_exporters.py	2013-12-10 23:20:13 +0000
+++ madgraph/loop/loop_exporters.py	2014-01-19 08:21:29 +0000
@@ -186,7 +186,7 @@
                      
         # Write the cts_mpc.h and cts_mprec.h files imported from CutTools
         self.write_mp_files(writers.FortranWriter('cts_mprec.h'),\
-                            writers.FortranWriter('cts_mpc.h'),)
+                                            writers.FortranWriter('cts_mpc.h'))
 
         # Return to original PWD
         os.chdir(cwd)
@@ -237,7 +237,7 @@
                                                                  new_helas_call)
 
     def make_source_links(self):
-        """ In the loop output, we don't need the files fromt he Source folder """
+        """ In the loop output, we don't need the files from the Source folder """
         pass
 
     def make_model_symbolic_link(self):

=== modified file 'madgraph/various/cluster.py'
--- madgraph/various/cluster.py	2013-12-03 21:46:01 +0000
+++ madgraph/various/cluster.py	2014-01-19 08:21:29 +0000
@@ -111,6 +111,9 @@
             cwd = os.getcwd()
         if not os.path.exists(prog):
             prog = os.path.join(cwd, prog)
+            
+        if not required_output and output_files:
+            required_output = output_files
         
         if not hasattr(self, 'temp_dir') or not self.temp_dir or \
             (input_files == [] == output_files):
@@ -777,6 +780,9 @@
            input/output file should be give relative to cwd
         """
         
+        if not required_output and output_files:
+            required_output = output_files
+        
         if (input_files == [] == output_files):
             return self.submit(prog, argument, cwd, stdout, stderr, log, 
                                required_output=required_output, nb_submit=nb_submit)
@@ -1006,12 +1012,13 @@
             if 'Unknown' in line:
                 return 'F'
             elif line.startswith(str(id)):
-                status = line.split()[4]
+                jobstatus = line.split()[4]
+                
         if status.returncode != 0:
             raise ClusterManagmentError, 'server fails in someway (errorcode %s)' % status.returncode
-        if status in self.idle_tag:
+        if jobstatus in self.idle_tag:
             return 'I' 
-        elif status in self.running_tag:                
+        elif jobstatus in self.running_tag:                
             return 'R' 
         return 'F'
         

=== modified file 'madgraph/various/process_checks.py'
--- madgraph/various/process_checks.py	2013-12-11 00:48:08 +0000
+++ madgraph/various/process_checks.py	2014-01-19 08:21:29 +0000
@@ -546,13 +546,20 @@
 class LoopMatrixElementEvaluator(MatrixElementEvaluator):
     """Class taking care of matrix element evaluation for loop processes."""
 
-    def __init__(self,cuttools_dir=None,cmd=FakeInterface(),*args,**kwargs):
+    def __init__(self,cuttools_dir=None, output_path=None, 
+                                            cmd=FakeInterface(),*args,**kwargs):
         """Allow for initializing the MG5 root where the temporary fortran
         output for checks is placed."""
         
         super(LoopMatrixElementEvaluator,self).__init__(*args,cmd=cmd,**kwargs)
 
         self.mg_root=self.cmd._mgme_dir
+        # If no specific output path is specified, then write in MG5 root directory
+        if output_path is None:
+            self.output_path = self.cmd._mgme_dir
+        else:
+            self.output_path = output_path
+            
         self.cuttools_dir=cuttools_dir
         self.loop_optimized_output = cmd.options['loop_optimized_output']
         # Set proliferate to true if you want to keep the produced directories
@@ -595,16 +602,16 @@
                  ].index(matrix_element)][1]
             logger.debug("Reusing generated output %s"%str(export_dir))
         else:        
-            export_dir=os.path.join(self.mg_root,temp_dir_prefix)
+            export_dir=os.path.join(self.output_path,temp_dir_prefix)
             if os.path.isdir(export_dir):
                 if not self.proliferate:
                     raise InvalidCmd("The directory %s already exist. Please remove it."%str(export_dir))
                 else:
                     id=1
-                    while os.path.isdir(os.path.join(self.mg_root,\
+                    while os.path.isdir(os.path.join(self.output_path,\
                                         '%s_%i'%(temp_dir_prefix,id))):
                         id+=1
-                    export_dir=os.path.join(self.mg_root,'%s_%i'%(temp_dir_prefix,id))
+                    export_dir=os.path.join(self.output_path,'%s_%i'%(temp_dir_prefix,id))
             
             if self.proliferate:
                 self.stored_quantities['loop_matrix_elements'].append(\
@@ -1177,7 +1184,7 @@
 
         if not reusing:
             if os.path.isdir(export_dir):
-                clean_up(self.mg_root)
+                clean_up(self.output_path)
                 if os.path.isdir(export_dir):
                     raise InvalidCmd(\
                       "The directory %s already exist. Please remove it."\
@@ -1278,7 +1285,7 @@
         else:
             proc_name = matrix_element.shell_string()[2:]
         
-        export_dir=os.path.join(self.mg_root,('SAVED' if keep_folder else '')+\
+        export_dir=os.path.join(self.output_path,('SAVED' if keep_folder else '')+\
                                                 temp_dir_prefix+"_%s"%proc_name)
 
         res_timings = self.setup_process(matrix_element,export_dir, \
@@ -1435,7 +1442,7 @@
         else:
             process = matrix_element
         proc_name = process.shell_string()[2:]
-        export_dir=os.path.join(self.mg_root,("SAVED" if keep_folder else "")+\
+        export_dir=os.path.join(self.output_path,("SAVED" if keep_folder else "")+\
                                                 temp_dir_prefix+"_%s"%proc_name)
         if not infos:
             infos = self.setup_process(matrix_element,export_dir, \
@@ -1915,7 +1922,7 @@
 #===============================================================================
 # Generate a loop matrix element
 #===============================================================================
-def generate_loop_matrix_element(process_definition, reuse, 
+def generate_loop_matrix_element(process_definition, reuse, output_path=None,
                                                          cmd = FakeInterface()):
     """ Generate a loop matrix element from the process definition, and returns
     it along with the timing information dictionary.
@@ -1924,7 +1931,10 @@
     assert isinstance(process_definition,base_objects.ProcessDefinition)
     assert process_definition.get('perturbation_couplings')!=[]
     
-    mg_root = cmd._mgme_dir
+    if not output_path is None:
+        root_path = output_path
+    else:
+        root_path = cmd._mgme_dir
     # By default, set all entries to None
     timing = {'Diagrams_generation': None,
               'n_loops': None,
@@ -1945,7 +1955,7 @@
     # Now generate a process based on the ProcessDefinition given in argument.
     process = process_definition.get_process(isids,fsids)
     
-    proc_dir = os.path.join(mg_root,"SAVED"+temp_dir_prefix+"_%s"%(
+    proc_dir = os.path.join(root_path,"SAVED"+temp_dir_prefix+"_%s"%(
                                '_'.join(process.shell_string().split('_')[1:])))
     if reuse and os.path.isdir(proc_dir):
         logger.info("Reusing directory %s"%str(proc_dir))
@@ -1990,7 +2000,7 @@
 # check profile for loop process (timings + stability in one go)
 #===============================================================================
 def check_profile(process_definition, param_card = None,cuttools="",
-                            options = {}, cmd = FakeInterface()):
+                         options = {}, output_path=None, cmd = FakeInterface()):
     """For a single loop process, check both its timings and then its stability
     in one go without regenerating it."""
 
@@ -1999,10 +2009,11 @@
     model=process_definition.get('model')
 
     timing1, matrix_element = generate_loop_matrix_element(process_definition,
-                                                             keep_folder,cmd=cmd)
+                                    keep_folder,output_path=output_path,cmd=cmd)
     reusing = isinstance(matrix_element, base_objects.Process)
     options['reuse'] = reusing
-    myProfiler = LoopMatrixElementTimer(cuttools_dir=cuttools,model=model, cmd=cmd)
+    myProfiler = LoopMatrixElementTimer(cuttools_dir=cuttools,model=model,
+                                               output_path=output_path, cmd=cmd)
     if not reusing and not matrix_element.get('processes')[0].get('has_born'):
         myProfiler.loop_optimized_output=False
     timing2 = myProfiler.time_matrix_element(matrix_element, reusing, 
@@ -2028,7 +2039,7 @@
 # check_timing for loop processes
 #===============================================================================
 def check_stability(process_definition, param_card = None,cuttools="", 
-                               options=None,nPoints=100, cmd = FakeInterface()):
+             options=None,nPoints=100, output_path=None, cmd = FakeInterface()):
     """For a single loop process, give a detailed summary of the generation and
     execution timing."""
     
@@ -2038,11 +2049,11 @@
     model=process_definition.get('model')
 
     timing, matrix_element = generate_loop_matrix_element(process_definition,
-                                                                 reuse, cmd=cmd)
+                                        reuse, output_path=output_path, cmd=cmd)
     reusing = isinstance(matrix_element, base_objects.Process)
     options['reuse'] = reusing
     myStabilityChecker = LoopMatrixElementTimer(cuttools_dir=cuttools,
-                                                            model=model,cmd=cmd)
+                                    output_path=output_path,model=model,cmd=cmd)
     if not reusing and not matrix_element.get('processes')[0].get('has_born'):
         myStabilityChecker.loop_optimized_output=False
     stability = myStabilityChecker.check_matrix_element_stability(matrix_element, 
@@ -2059,17 +2070,18 @@
 # check_timing for loop processes
 #===============================================================================
 def check_timing(process_definition, param_card= None, cuttools="",
-                                          options={}, cmd = FakeInterface()):
+                           output_path=None, options={}, cmd = FakeInterface()):
     """For a single loop process, give a detailed summary of the generation and
     execution timing."""
 
     keep_folder = options['reuse']
     model=process_definition.get('model')
     timing1, matrix_element = generate_loop_matrix_element(process_definition,
-                                                           keep_folder, cmd=cmd)
+                                  keep_folder, output_path=output_path, cmd=cmd)
     reusing = isinstance(matrix_element, base_objects.Process)
     options['reuse'] = reusing
-    myTimer = LoopMatrixElementTimer(cuttools_dir=cuttools,model=model, cmd=cmd)
+    myTimer = LoopMatrixElementTimer(cuttools_dir=cuttools,model=model,
+                                               output_path=output_path, cmd=cmd)
     if not reusing and not matrix_element.get('processes')[0].get('has_born'):
         myTimer.loop_optimized_output=False
     timing2 = myTimer.time_matrix_element(matrix_element, reusing, param_card,
@@ -2087,12 +2099,11 @@
 # check_processes
 #===============================================================================
 def check_processes(processes, param_card = None, quick = [],cuttools="",
-                             options=None, reuse = False, cmd = FakeInterface()):
+          options=None, reuse = False, output_path=None, cmd = FakeInterface()):
     """Check processes by generating them with all possible orderings
     of particles (which means different diagram building and Helas
     calls), and comparing the resulting matrix element values."""
 
-    mg_root = cmd._mgme_dir
     cmass_scheme = cmd.options['complex_mass_scheme']
     if isinstance(processes, base_objects.ProcessDefinition):
         # Generate a list of unique processes
@@ -2107,7 +2118,7 @@
         else:
             evaluator = LoopMatrixElementEvaluator(cuttools_dir=cuttools, 
                             model=model, auth_skipping = True,
-                            reuse = False, cmd = cmd)
+                            reuse = False, output_path=output_path, cmd = cmd)
        
         results = run_multiprocs_no_crossings(check_process,
                                               multiprocess,
@@ -2120,7 +2131,7 @@
             
         if multiprocess.get('perturbation_couplings')!=[] and not reuse:
             # Clean temporary folders created for the running of the loop processes
-            clean_up(mg_root)
+            clean_up(output_path)
             
         return results, evaluator.stored_quantities["used_lorentz"]
 
@@ -2144,7 +2155,7 @@
         evaluator = LoopMatrixElementEvaluator(cuttools_dir=cuttools, model=model,
                                            param_card=param_card,
                                            auth_skipping = True, reuse = False,
-                                           cmd = cmd)
+                                           output_path=output_path, cmd = cmd)
 
     # Keep track of tested processes, matrix elements, color and already
     # initiated Lorentz routines, to reuse as much as possible
@@ -2171,7 +2182,7 @@
     
     if processes[0].get('perturbation_couplings')!=[] and not reuse:
         # Clean temporary folders created for the running of the loop processes
-        clean_up(mg_root)    
+        clean_up(output_path)    
     
     return comparison_results, evaluator.stored_quantities["used_lorentz"]
 
@@ -2336,11 +2347,17 @@
 def clean_up(mg_root):
     """Clean-up the possible left-over outputs from 'evaluate_matrix element' of
     the LoopMatrixEvaluator (when its argument proliferate is set to true). """
+    
+    if mg_root is None:
+        pass
+    
     directories = glob.glob(os.path.join(mg_root, '%s*'%temp_dir_prefix))
     if directories != []:
         logger.debug("Cleaning temporary %s* check runs."%temp_dir_prefix)
     for dir in directories:
-        shutil.rmtree(dir)
+        # For safety make sure that the directory contains a folder SubProcesses
+        if os.path.isdir(os.path.join(dir,'SubProcesses')):
+            shutil.rmtree(dir)
 
 def format_output(output,format):
     """ Return a string for 'output' with the specified format. If output is 
@@ -2351,7 +2368,7 @@
     else:
         return 'NA'
 
-def output_profile(myprocdef, stability, timing, mg_root, reusing=False):
+def output_profile(myprocdef, stability, timing, output_path, reusing=False):
     """Present the results from a timing and stability consecutive check"""
 
     opt = timing['loop_optimized_output']
@@ -2362,10 +2379,10 @@
 
     text += '\nStability result for the '+('optimized' if opt else 'default')+\
                                                                     ' output:\n'
-    text += output_stability(stability,mg_root=mg_root, reusing=reusing)
+    text += output_stability(stability,output_path, reusing=reusing)
 
     mode = 'optimized' if opt else 'default'
-    logFilePath =  os.path.join(mg_root, 'profile_%s_%s.log'\
+    logFilePath =  os.path.join(output_path, 'profile_%s_%s.log'\
                                     %(mode,stability['Process'].shell_string()))        
     logFile = open(logFilePath, 'w')
     logFile.write(text)
@@ -2374,10 +2391,10 @@
                                                               %str(logFilePath))
     return text
 
-def output_stability(stability, mg_root, reusing=False):
+def output_stability(stability, output_path, reusing=False):
     """Present the result of a stability check in a nice format.
     The full info is printed out in 'Stability_result_<proc_shell_string>.dat'
-    under the MadGraph5_aMC@NLO root folder (mg_root)"""
+    under the MadGraph5_aMC@NLO root folder (output_path)"""
     
     def accuracy(eval_list):
         """ Compute the accuracy from different evaluations."""
@@ -2538,7 +2555,7 @@
   The tuple printed out is (log(median(C)),log(min(C)),log(max(C)))
 """
 
-    logFile = open(os.path.join(mg_root, 'stability_%s_%s.log'\
+    logFile = open(os.path.join(output_path, 'stability_%s_%s.log'\
                                            %(mode,process.shell_string())), 'w')
     logFile.write('Stability check results\n\n')
     logFile.write(res_str)
@@ -2605,8 +2622,8 @@
                                                         'close the plot window')
             plt.show()
         else:
-            fig_output_file = str(os.path.join(mg_root, 'stability_plot_%s_%s.png'\
-                                                %(mode,process.shell_string())))
+            fig_output_file = str(os.path.join(output_path, 
+                     'stability_plot_%s_%s.png'%(mode,process.shell_string())))
             logger.info('Stability plot output to file %s. '%fig_output_file)
             plt.savefig(fig_output_file)
         return res_str
@@ -2781,12 +2798,11 @@
 # check_gauge
 #===============================================================================
 def check_gauge(processes, param_card = None,cuttools="", reuse = False, 
-                                     options=None, cmd = FakeInterface()):
+                         options=None, output_path=None, cmd = FakeInterface()):
     """Check gauge invariance of the processes by using the BRS check.
     For one of the massless external bosons (e.g. gluon or photon), 
     replace the polarization vector (epsilon_mu) with its momentum (p_mu)
     """
-    mg_root = cmd._mgme_dir
     cmass_scheme = cmd.options['complex_mass_scheme']
     if isinstance(processes, base_objects.ProcessDefinition):
         # Generate a list of unique processes
@@ -2800,8 +2816,9 @@
                                            auth_skipping = True, reuse = False)
         else:
             evaluator = LoopMatrixElementEvaluator(cuttools_dir=cuttools,
-                                           cmd= cmd,model=model, param_card=param_card,
-                                           auth_skipping = False, reuse = False)
+                                           cmd=cmd,model=model, param_card=param_card,
+                                           auth_skipping = False, reuse = False,
+                                           output_path=output_path)
 
         if not cmass_scheme and multiprocess.get('perturbation_couplings')==[]:
             # Set all widths to zero for gauge check
@@ -2817,7 +2834,7 @@
         
         if multiprocess.get('perturbation_couplings')!=[] and not reuse:
             # Clean temporary folders created for the running of the loop processes
-            clean_up(mg_root)
+            clean_up(output_path)
         
         return results
 
@@ -2841,7 +2858,7 @@
         evaluator = LoopMatrixElementEvaluator(cuttools_dir=cuttools,
                                            model=model, param_card=param_card,
                                            auth_skipping = False, reuse = False,
-                                           cmd = cmd)
+                                           output_path=output_path, cmd = cmd)
     comparison_results = []
     comparison_explicit_flip = []
 
@@ -2862,7 +2879,7 @@
 
     if processes[0].get('perturbation_couplings')!=[] and not reuse:
         # Clean temporary folders created for the running of the loop processes
-        clean_up(mg_root)
+        clean_up(output_path)
             
     return comparison_results
 
@@ -3044,11 +3061,10 @@
 # check_lorentz
 #===============================================================================
 def check_lorentz(processes, param_card = None,cuttools="", options=None, \
-                                          reuse = False, cmd = FakeInterface()):
+                 reuse = False, output_path=None, cmd = FakeInterface()):
     """ Check if the square matrix element (sum over helicity) is lorentz 
         invariant by boosting the momenta with different value."""
 
-    mg_root = cmd._mgme_dir
     cmass_scheme = cmd.options['complex_mass_scheme']
     if isinstance(processes, base_objects.ProcessDefinition):
         # Generate a list of unique processes
@@ -3062,7 +3078,8 @@
                                 cmd= cmd, auth_skipping = False, reuse = True)
         else:
             evaluator = LoopMatrixElementEvaluator(cuttools_dir=cuttools,
-                     model=model, auth_skipping = False, reuse = True,cmd = cmd)
+                     model=model, auth_skipping = False, reuse = True,
+                                             output_path=output_path, cmd = cmd)
 
         if not cmass_scheme and processes.get('perturbation_couplings')==[]:
             # Set all widths to zero for lorentz check
@@ -3078,7 +3095,7 @@
         
         if multiprocess.get('perturbation_couplings')!=[] and not reuse:
             # Clean temporary folders created for the running of the loop processes
-            clean_up(mg_root)
+            clean_up(output_path)
         
         return results
         
@@ -3102,7 +3119,7 @@
         evaluator = LoopMatrixElementEvaluator(cuttools_dir=cuttools, model=model,
                                            param_card=param_card,
                                            auth_skipping = False, reuse = True,
-                                           cmd = cmd)
+                                           output_path=output_path, cmd = cmd)
 
     comparison_results = []
 
@@ -3123,7 +3140,7 @@
 
     if processes[0].get('perturbation_couplings')!=[] and not reuse:
         # Clean temporary folders created for the running of the loop processes
-        clean_up(mg_root)
+        clean_up(output_path)
 
     return comparison_results
 
@@ -3232,13 +3249,12 @@
 # check_gauge
 #===============================================================================
 def check_unitary_feynman(processes_unit, processes_feynm, param_card=None, 
-                               options=None,
+                               options=None, output_path=None,
                                cuttools="", reuse=False, cmd = FakeInterface()):
     """Check gauge invariance of the processes by flipping
        the gauge of the model
     """
 
-    mg_root = cmd._mgme_dir
     cmass_scheme = cmd.options['complex_mass_scheme']
     if isinstance(processes_unit, base_objects.ProcessDefinition):
         # Generate a list of unique processes
@@ -3255,7 +3271,9 @@
             evaluator = LoopMatrixElementEvaluator(cuttools_dir=cuttools,
                                            cmd=cmd, model=model,
                                            param_card=param_card,
-                                           auth_skipping = False, reuse = False)
+                                           auth_skipping = False, 
+                                           output_path=output_path,
+                                           reuse = False)
         if not cmass_scheme and multiprocess_unit.get('perturbation_couplings')==[]:
             logger.info('Set All width to zero for non complex mass scheme checks')
             for particle in evaluator.full_model.get('particles'):
@@ -3270,7 +3288,7 @@
         clean_added_globals(ADDED_GLOBAL)
        # Clear up previous run if checking loop output
         if processes_unit.get('perturbation_couplings')!=[]:
-            clean_up(mg_root)
+            clean_up(output_path)
 
         momentum = {}
         for data in output_u:
@@ -3288,7 +3306,9 @@
             evaluator = LoopMatrixElementEvaluator(cuttools_dir=cuttools,
                                            cmd= cmd, model=model,
                                            param_card=param_card,
-                                           auth_skipping = False, reuse = False)
+                                           auth_skipping = False, 
+                                           output_path=output_path,
+                                           reuse = False)
 
         if not cmass_scheme and multiprocess_feynm.get('perturbation_couplings')==[]:
             # Set all widths to zero for gauge check
@@ -3310,7 +3330,7 @@
         
         if processes_feynm.get('perturbation_couplings')!=[] and not reuse:
             # Clean temporary folders created for the running of the loop processes
-            clean_up(mg_root)
+            clean_up(output_path)
 
         return output
 #    elif isinstance(processes, base_objects.Process):

=== modified file 'mg5decay/decay_objects.py'
--- mg5decay/decay_objects.py	2013-11-20 11:29:32 +0000
+++ mg5decay/decay_objects.py	2014-01-19 08:21:29 +0000
@@ -4019,7 +4019,11 @@
                     structure = model.lorentz_dict[vertex['lorentz'][key[1]]].structure 
                     new_structure = self.lor_pattern.sub(self.simplify_lorentz,
                                                          structure)
-                    lorentz_factor += abs(eval(v))**2 * eval(new_structure % q_dict_lor)**2
+                    lor_value = eval(new_structure % q_dict_lor)
+                    if lor_value == 0:
+                        new_structure = new_structure.replace('-','+')
+                        lor_value = eval(new_structure % q_dict_lor)
+                    lorentz_factor += abs(eval(v))**2 * lor_value**2
 
                 apx_m *= lorentz_factor
 

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2013-12-07 10:52:12 +0000
+++ models/import_ufo.py	2014-01-19 08:21:29 +0000
@@ -232,12 +232,12 @@
         # which indicate a loop model or if this model is only meant for 
         # tree-level computations
         self.perturbation_couplings = {}
-        for order in model.all_orders:
-            try:
+        try:
+            for order in model.all_orders:
                 if(order.perturbative_expansion>0):
                     self.perturbation_couplings[order.name]=order.perturbative_expansion
-            except AttributeError:
-                    pass
+        except AttributeError:
+            pass
 
         if self.perturbation_couplings!={}:
             self.model = loop_base_objects.LoopModel({'perturbation_couplings':\
@@ -302,8 +302,14 @@
         # If we deal with a Loop model here, the order hierarchy MUST be 
         # defined in the file coupling_orders.py and we import it from 
         # there.
-
-        all_orders = self.ufomodel.all_orders
+        all_orders = []
+        try:
+            all_orders = self.ufomodel.all_orders
+        except AttributeError:
+            if self.perturbation_couplings:
+                raise MadGraph5Error, "The loop model MG5 attemps to import does not specify the attribute 'all_order'." 
+            else:
+                pass            
 
         hierarchy={}
         try:
@@ -319,29 +325,20 @@
         
         # Also set expansion_order, i.e., maximum coupling order per process
         expansion_order={}
+        # And finally the UVCT coupling order counterterms        
+        coupling_order_counterterms={}        
         try:
             for order in all_orders:
                 expansion_order[order.name]=order.expansion_order
-        except AttributeError:
-            if self.perturbation_couplings:
-                raise MadGraph5Error, 'The loop model MG5 attemps to import does not specify an expansion_order for all coupling orders.' 
-            else:
-                pass
-        else:
-            self.model.set('expansion_order', expansion_order)
-        
-        # And finally the UVCT coupling order counterterms
-        coupling_order_counterterms={}
-        try:
-            for order in all_orders:
-                coupling_order_counterterms[order.name]=order.expansion_order
-        except AttributeError:
-            if self.perturbation_couplings:
-                raise MadGraph5Error, 'The loop model MG5 attemps to import does not specify an expansion_order for all coupling orders.' 
-            else:
-                pass
-        else:
-            self.model.set('expansion_order', expansion_order)
+                coupling_order_counterterms[order.name]=order.expansion_order                
+        except AttributeError:
+            if self.perturbation_couplings:
+                raise MadGraph5Error, 'The loop model MG5 attemps to import does not specify an expansion_order for all coupling orders.' 
+            else:
+                pass
+        else:
+            self.model.set('expansion_order', expansion_order)
+            self.model.set('expansion_order', expansion_order)            
 
         #clean memory
         del self.checked_lor
@@ -841,7 +838,7 @@
         return output
       
 class OrganizeModelExpression:
-    """Organize the couplings/parameters of a model"""
+    """Organize the cou plings/parameters of a model"""
     
     track_dependant = ['aS','aEWM1','MU_R'] # list of variable from which we track 
                                    #dependencies those variables should be define
@@ -861,12 +858,12 @@
     
         self.model = model  # UFOMODEL
         self.perturbation_couplings = {}
-        for order in model.all_orders: # Check if it is a loop model or not
-            try:
+        try:
+            for order in model.all_orders: # Check if it is a loop model or not
                 if(order.perturbative_expansion>0):
                     self.perturbation_couplings[order.name]=order.perturbative_expansion
-            except AttributeError:
-                    pass
+        except AttributeError:
+            pass
         self.params = {}     # depend on -> ModelVariable
         self.couplings = {}  # depend on -> ModelVariable
         self.all_expr = {} # variable_name -> ModelVariable

=== modified file 'models/model_reader.py'
--- models/model_reader.py	2013-11-29 07:28:53 +0000
+++ models/model_reader.py	2014-01-19 08:21:29 +0000
@@ -30,6 +30,7 @@
 import madgraph.loop.loop_base_objects as loop_base_objects
 import models.check_param_card as card_reader
 from madgraph import MadGraph5Error, MG5DIR
+import madgraph.various.misc as misc
 
 ZERO = 0
 
@@ -99,7 +100,9 @@
     Unknown block : %s''' % (set(key), set(parameter_dict.keys()),
                              ','.join(set(parameter_dict.keys()).difference(set(key))),
                              ','.join(set(key).difference(set(parameter_dict.keys()))))
-                if self['name'].startswith('mssm-') or self['name'] == 'mssm':
+
+                if msg =="Invalid restriction card (not same block)\n    set(['yu', 'umix', 'ae', 'ad', 'decay', 'nmix', 'ye', 'sbotmix', 'msoft', 'yd', 'vmix', 'au', 'mass', 'alpha', 'modsel', 'sminputs', 'staumix', 'stopmix', 'hmix']) != set(['umix', 'msoft', 'msu2', 'fralpha', 'msd2', 'msl2', 'decay', 'tu', 'selmix', 'td', 'te', 'usqmix', 'dsqmix', 'ye', 'yd', 'sminputs', 'yu', 'mse2', 'nmix', 'vmix', 'msq2', 'mass', 'hmix']).\n    Missing block: te,msl2,dsqmix,tu,selmix,msu2,msq2,usqmix,td,fralpha,mse2,msd2\n    Unknown block : ae,ad,sbotmix,au,alpha,modsel,staumix,stopmix" \
+                or self['name'].startswith('mssm-') or self['name'] == 'mssm':
                     if not set(parameter_dict.keys()).difference(set(key)):
                         fail = False
                     else:

=== added file 'models/nmssm/propagators.py'
--- models/nmssm/propagators.py	1970-01-01 00:00:00 +0000
+++ models/nmssm/propagators.py	2014-01-19 08:21:29 +0000
@@ -0,0 +1,35 @@
+# This file was automatically created by FeynRules 1.7.69
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Mon 1 Oct 2012 14:58:26
+
+from object_library import all_propagators, Propagator
+
+
+# define only once the denominator since this is always the same
+denominator = "P('mu', id) * P('mu', id) - Mass(id) * Mass(id) + complex(0,1) * Mass(id) * Width(id)"
+
+# propagator for the scalar
+S = Propagator(name = "S",
+               numerator = "complex(0,1)",
+               denominator = denominator
+               )
+
+# propagator for the incoming fermion # the one for the outcomming is computed on the flight
+F = Propagator(name = "F",
+                numerator = "complex(0,1) * (Gamma('mu', s1, s2) * P('mu', id) + Mass(id) * Identity(s1, s2))",
+                denominator = denominator
+               )
+
+# massive vector in the unitary gauge, can't be use for massless particles
+V1 = Propagator(name = "V1",
+                numerator = "complex(0,1) * (-1 * Metric(l1, l2) + Metric(l1,'mu')* P('mu', id) * P(l2, id) / Mass(id)**2 ",
+                denominator = denominator
+               )
+
+# massless vector and massive vector in unitary gauge
+V2 = Propagator(name = "V2",
+                numerator = "complex(0,-1) * Metric(l1, l2)",
+                denominator =  "P('mu', id) * P('mu', id)"
+               )
+
+

=== modified file 'tests/acceptance_tests/test_cmd.py'
--- tests/acceptance_tests/test_cmd.py	2013-11-29 07:28:53 +0000
+++ tests/acceptance_tests/test_cmd.py	2014-01-19 08:21:29 +0000
@@ -89,7 +89,16 @@
         
         self.do('generate e+ ve > V2 > e+ ve mu+ mu-')
         self.assertEqual(len(self.cmd._curr_amps[0].get('diagrams')), 8)
+       
+    def test_import_model(self):
+        """check that old UFO model are loaded correctly"""
         
+        self.do('''import model DY_SM''')
+        self.do('''import model TopEffTh''')
+        self.do('''import model uutt_tch_scalar''')
+        self.do('''import model uutt_sch_4fermion''')
+        self.do('''import model 2HDM''')
+                
     def test_draw(self):
         """ command 'draw' works """
 

=== modified file 'tests/acceptance_tests/test_cmd_amcatnlo.py'
--- tests/acceptance_tests/test_cmd_amcatnlo.py	2013-12-14 22:59:27 +0000
+++ tests/acceptance_tests/test_cmd_amcatnlo.py	2014-01-19 08:21:29 +0000
@@ -256,6 +256,20 @@
         self.assertTrue(os.path.exists('%s/Events/run_01/res_1.txt' % self.path))
 
 
+    def test_launch_amcatnlo_name(self):
+        """tests if the p p > e+ ve process works specifying the run name"""
+        self.generate(['p p > e+ ve [QCD]'], 'sm')
+
+        self.do('launch aMC@NLO -fp -n myrun')
+
+        # test the lhe event file exists
+        self.assertTrue(os.path.exists('%s/Events/myrun/events.lhe.gz' % self.path))
+        self.assertTrue(os.path.exists('%s/Events/myrun/summary.txt' % self.path))
+        self.assertTrue(os.path.exists('%s/Events/myrun/myrun_tag_1_banner.txt' % self.path))
+        self.assertTrue(os.path.exists('%s/Events/myrun/res_0.txt' % self.path))
+        self.assertTrue(os.path.exists('%s/Events/myrun/res_1.txt' % self.path))
+
+
     @set_global()
     def test_ppgogo_nlo(self):
         """tests if the p p > go go (in the mssm) process works at fixed order"""
@@ -321,11 +335,29 @@
                         os.path.getsize('%s/Events/run_01/events.lhe.gz' % self.path))
 
 
+    def test_generate_events_name(self):
+        """test if the generate_events and successively the shower script in 
+        the bin directory works fine"""
+        
+        self.generate_production()
+        # to check that the cleaning of files work well
+        os.system('touch %s/SubProcesses/P0_udx_epve/GF1' % self.path)
+        self.do('quit')
+        misc.call([pjoin('.','bin','generate_events'), '-fp', '-n myrun'], cwd='%s' % self.path,
+                stdout = open(os.devnull, 'w'))
+        # test the lhe event file exists
+        self.assertTrue(os.path.exists('%s/Events/myrun/events.lhe.gz' % self.path))
+        self.assertTrue(os.path.exists('%s/Events/myrun/summary.txt' % self.path))
+        self.assertTrue(os.path.exists('%s/Events/myrun/myrun_tag_1_banner.txt' % self.path))
+        self.assertTrue(os.path.exists('%s/Events/myrun/res_0.txt' % self.path))
+        self.assertTrue(os.path.exists('%s/Events/myrun/res_1.txt' % self.path))
+
+
     def test_generate_events_lo_hwpp_set(self):
         """test the param_card created is correct"""
         
         self.generate_production()
-        cmd = """generate_events LO -p
+        cmd = """generate_events aMC@LO -p
                  set parton_shower herwigpp
                  set nevents 100
                  """
@@ -347,7 +379,7 @@
         """test the param_card created is correct"""
         
         self.generate_production()
-        cmd = """generate_events LO
+        cmd = """generate_events aMC@LO
                  set parton_shower herwig6
                  set nevents 100
                  """
@@ -374,7 +406,7 @@
         """test the param_card created is correct"""
         
         self.generate_production()
-        cmd = """generate_events LO
+        cmd = """generate_events aMC@LO
                  set nevents 100
                  """
         open('/tmp/mg5_cmd','w').write(cmd)
@@ -404,7 +436,7 @@
         #change to py6
         card = open('%s/Cards/run_card.dat' % self.path).read()
         open('%s/Cards/run_card.dat' % self.path, 'w').write(card.replace('HERWIG6', 'PYTHIA6Q'))       
-        self.do('generate_events LO -f')        
+        self.do('generate_events aMC@LO -f')        
         
         # test the lhe event file exists
         self.assertTrue(os.path.exists('%s/Events/run_01_LO/events.lhe.gz' % self.path))
@@ -458,7 +490,7 @@
         """test the param_card created is correct"""
         
         self.generate_production()
-        self.do('generate_events NLO -f')
+        self.do('generate_events aMC@NLO -f')
         
         # test the lhe event file exists
         self.assertTrue(os.path.exists('%s/Events/run_01/events.lhe.gz' % self.path))
@@ -479,7 +511,7 @@
         #change splitevent generation
         card = open('%s/Cards/run_card.dat' % self.path).read()
         open('%s/Cards/run_card.dat' % self.path, 'w').write(card.replace(' -1 = nevt_job', ' 100 = nevt_job'))
-        self.do('generate_events NLO -fp')        
+        self.do('generate_events aMC@NLO -fp')        
         
         # test the lhe event file exists
         self.assertTrue(os.path.exists('%s/Events/run_01/events.lhe.gz' % self.path))
@@ -497,7 +529,7 @@
         card = open('%s/Cards/run_card.dat' % self.path).read()
         open('%s/Cards/run_card.dat' % self.path, 'w').write(card.replace('HERWIG6', 'PYTHIA6Q'))
         
-        self.do('generate_events NLO -f')        
+        self.do('generate_events aMC@NLO -f')        
         
         # test the lhe event file exists
         self.assertTrue(os.path.exists('%s/Events/run_01/events.lhe.gz' % self.path))

=== modified file 'tests/acceptance_tests/test_model_equivalence.py'
--- tests/acceptance_tests/test_model_equivalence.py	2013-12-14 22:59:27 +0000
+++ tests/acceptance_tests/test_model_equivalence.py	2014-01-19 08:21:29 +0000
@@ -270,6 +270,10 @@
                             mg5_color[i] = simp[0]
                             continue
                 self.assertEqual(str(mg4_color), str(mg5_color))
+
+
+        
+    
         
 class TestModelCreation(unittest.TestCase, CheckFileCreate):
 

=== modified file 'tests/parallel_tests/compare_with_old_mg5_version.py'
--- tests/parallel_tests/compare_with_old_mg5_version.py	2013-12-07 10:52:12 +0000
+++ tests/parallel_tests/compare_with_old_mg5_version.py	2014-01-19 08:21:29 +0000
@@ -38,7 +38,7 @@
     """A class to compare the value of a old MG5 version and the current one"""
     
     old_mg5 = None # link to the previous version of MG5 (prevent multiple build)
-    reference_number = 237 #1.5.6
+    reference_number = 249 #2.0.0
     nb_test = 0
     
     
@@ -371,8 +371,8 @@
         # Create a list of processes to check automatically                                                                                                                             
         my_proc_list = ['p p > t t~']
         values = {'number_of_P0': '2', 
-                  'cross_P0_qq_ttx': '0.74191E+02', 
-                  'cross_P0_gg_ttx': '0.48006E+03'}
+                  'cross_P0_qq_ttx': '65.93', 
+                  'cross_P0_gg_ttx': '399.1'}
 
         # Store list of non-zero processes and results in file                                                                                                                          
         self.compare_cross_section_to_values(values, my_proc_list,
@@ -383,11 +383,10 @@
         """Test a short list of sm processes""" 
         my_proc_list = ['u j > W+ g', 'g g > W+ j j']
 
-
         values = {'number_of_P0': '1', 
          'number_of_P1': '1', 
-         'cross_P0_qq_wpg': '0.27889E+04', 
-         'cross_P1_gg_wpqq': '0.45254E+03'}      
+         'cross_P0_qq_wpg': '0.25882E+04', 
+         'cross_P1_gg_wpqq': '0.39004E+03'}      
         self.compare_cross_section_to_values(values, my_proc_list,
                              orders = {'QED':99, 'QCD':99},
                              filename = "short_cs_sm2.log")
@@ -397,7 +396,7 @@
         my_proc_list = ['g g > t t~, (t > b W+, W+ > e+ ve)']
 
         values =  {'number_of_P0': '1', 
-                   'cross_P0_gg_ttx_t_bwp_wp_lvl': '0.45836E+02'} 
+                   'cross_P0_gg_ttx_t_bwp_wp_lvl': '0.38078E+02'} 
                   
         self.compare_cross_section_to_values(values, my_proc_list,
                              orders = {'QED':99, 'QCD':99},
@@ -407,7 +406,7 @@
         """Test a short list of sm processes""" 
         my_proc_list = ['g g > go go']
 
-        values = {'number_of_P0': '1', 'cross_P0_gg_gogo': '0.43433E+01'}
+        values = {'number_of_P0': '1', 'cross_P0_gg_gogo': '0.31630E+01'}
         
         self.compare_cross_section_to_values(values, my_proc_list,
                              model='mssm',

=== modified file 'tests/parallel_tests/input_files/mg5_short_paralleltest_heft.pkl'
Binary files tests/parallel_tests/input_files/mg5_short_paralleltest_heft.pkl	2012-12-20 14:33:14 +0000 and tests/parallel_tests/input_files/mg5_short_paralleltest_heft.pkl	2014-01-19 08:21:29 +0000 differ
=== modified file 'tests/parallel_tests/input_files/mg5_short_paralleltest_mssm.pkl'
Binary files tests/parallel_tests/input_files/mg5_short_paralleltest_mssm.pkl	2012-12-20 14:33:14 +0000 and tests/parallel_tests/input_files/mg5_short_paralleltest_mssm.pkl	2014-01-19 08:21:29 +0000 differ
=== modified file 'tests/parallel_tests/input_files/mg5_short_paralleltest_sm.pkl'
Binary files tests/parallel_tests/input_files/mg5_short_paralleltest_sm.pkl	2012-12-20 14:33:14 +0000 and tests/parallel_tests/input_files/mg5_short_paralleltest_sm.pkl	2014-01-19 08:21:29 +0000 differ
=== modified file 'tests/time_db'
--- tests/time_db	2013-12-15 16:46:18 +0000
+++ tests/time_db	2014-01-19 08:21:29 +0000
@@ -5,10 +5,12 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_values_for_prop>]> 0.0001220703125
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_full_sm_decay_groups_advance>]> 2.03565192223
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_get_amplitude_givenfinal>]> 0.241197824478
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_drawing_eps.TestDrawingOption testMethod=test_option_multi_type>]> 0.0388491153717
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.ProcCardV4ReaderTest testMethod=test_line_creation>]> 0.0172848701477
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_f_product>]> 0.00337600708008
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_generate_helas_diagrams_uux_gepem>]> 0.0183539390564
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_multi_gluons>]> 0.251565933228
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_dxu_wpgg>]> 45.2221391201
+<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_uu_uug>]> 0.0557870864868
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T_simplify>]> 0.000298023223877
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_standalone_cpp_output>]> 2.42965912819
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_error_interaction_save>]> 7.20024108887e-05
@@ -18,24 +20,23 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWritting testMethod=test_order_param>]> 0.0765249729156
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testmultvarint>]> 7.29560852051e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultadd_legacy>]> 0.000188112258911
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_lhe_parser.TESTLHEParser testMethod=test_read_write_lhe>]> 0.00316500663757
+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_all_reconstructed_dd_eemm>]> 0.120349884033
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_correct>]> 0.000885009765625
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorSextetModel testMethod=test_check_u_u_six_g>]> 0.506669998169
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_check_majoranas>]> 0.00102400779724
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_multi_process_ppwj>]> 9.92277693748
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_drawing_eps.TestDrawingS_EPS testMethod=test_schedular>]> 0.184823036194
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_gg_ggg>]> 0.128249883652
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_httx>]> 52.1056978703
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddadd>]> 0.0001380443573
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_generating_dict_to_1>]> 0.00120282173157
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_gg_gogo>]> 0.014230966568
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_building>]> 0.000118970870972
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_apx_decaywidth>]> 0.572462081909
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_representation>]> 0.000179052352905
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_simplify>]> 0.000159025192261
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_process_cc_file>]> 0.0698401927948
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_gg_ng>]> 1.61963582039
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCallWriterTest testMethod=test_UFO_Python_helas_call_writer>]> 0.0118069648743
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_file>]> 0.00247812271118
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sm>]> 6.47176480293
+<__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.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
@@ -50,8 +51,9 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_interaction_list>]> 0.000237941741943
 <__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.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_zero_iden_couplings>]> 0.08682513237
 <__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
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_ufo_aloha>]> 8.15419101715
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_majorana_conjugate_process>]> 0.116066932678
 <__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_group_subprocs.SubProcessGroupTest testMethod=test_even_more_special_group_decay_chain>]> 0.344223976135
@@ -62,17 +64,17 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_process_init>]> 1.48353791237
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestBlock testMethod=test_block_load_string>]> 6.07967376709e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_setget_multi_leg_exceptions>]> 0.0001060962677
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_w_production_with_ms_decay>]> 56.5486888885
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWritting testMethod=test_define_not_dep_param>]> 0.0775101184845
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_setgetinit_correct>]> 0.111829996109
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_all_gg_gg>]> 0.0899338722229
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_gg_gg>]> 0.0423669815063
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_ud_ggdu>]> 1.26658701897
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_generate_events_nlo_py6pt_fsr>]> 1.46954607964
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_pythia8_output>]> 2.83663797379
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_remove_interactions>]> 0.0940480232239
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_generate_ab_amplitudes>]> 0.394317865372
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_def_level>]> 8.58306884766e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_wavefunctions testMethod=test_V>]> 0.000189065933228
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_uux_ddx>]> 0.002357006073
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_triplet_diquarks>]> 8.50123596191
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddadd>]> 0.000109910964966
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_conjugate_index>]> 0.00273394584656
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_Tr_simplify>]> 0.000442028045654
@@ -80,18 +82,20 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_line_ordering_in_load>]> 0.000735998153687
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_electrons>]> 0.107378005981
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCard testMethod=test_mod_card>]> 0.000471830368042
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_zttx>]> 80.9429941177
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_multiple_lorentz_subset>]> 0.0512928962708
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_load_diagram>]> 0.000556945800781
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_values_for_prop>]> 0.000109910964966
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testgammaproperty>]> 0.0654649734497
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_py6pt_stdhep>]> 58.9974210262
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_get_color_data_lines_from_color_matrix>]> 1.95838093758
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_setget_leg_correct>]> 8.39233398438e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_dealing_with_last_line>]> 0.000260829925537
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_find_process_classes_and_mapping_diagrams>]> 3.02310013771
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.IOImportV4Test testMethod=test_read_interactions>]> 0.00336003303528
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWritting testMethod=test_write_param>]> 0.0741550922394
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_diagram_list>]> 0.000178098678589
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_flipping>]> 0.0031681060791
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_setget_process_correct>]> 0.000624895095825
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasordinate_wronginput>]> 0.000245809555054
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_find_fks_j_from_i>]> 0.0350108146667
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator5>]> 0.182165145874
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_colorize_uu_gg>]> 0.00682902336121
@@ -99,7 +103,6 @@
 <__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.various.test_aloha.testLorentzObject testMethod=test_part_spin32propagator>]> 0.0205278396606
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_full_sm_decay_groups>]> 5.82679080963
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_uux_uuxddx>]> 0.00144910812378
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_py6_stdhep>]> 38.5469400883
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_emep_emepemep>]> 0.24795794487
@@ -117,7 +120,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_failed_process>]> 1.92713904381
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_coupling_orders_uux_ddxng>]> 0.389806032181
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_drawing_eps.TestDrawingOption testMethod=test_option_6g>]> 0.0658371448517
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticleList testMethod=test_convert>]> 0.000968933105469
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_uux_ddx>]> 0.002357006073
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOExportMadLoopUnitTest testMethod=test_IOTests>]> 12.0391700268
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.TestIdentifyMETagFKS testMethod=test_identify_me_tag_qq_qg>]> 0.0854730606079
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_replace_indices>]> 0.000101089477539
@@ -125,7 +128,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.ProcCardV4ReaderTest testMethod=test_check_init>]> 0.0175278186798
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_line_orientation>]> 0.000136137008667
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization5>]> 0.000308036804199
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_redef_position>]> 9.70363616943e-05
 <__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.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_decay_chain_and_fermion_flow>]> 0.0173728466034
@@ -134,9 +136,9 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_drawing_eps.TestDrawingS_EPS testMethod=test_blob>]> 0.0159959793091
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestExtendedCmd testMethod=test_the_exit_from_child_cmd>]> 0.000255107879639
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_has_ordinate_failure>]> 0.000160932540894
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testeinsteinsum2>]> 0.00269603729248
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_gluons>]> 0.0548150539398
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_get_color_pdg_antipdg>]> 0.0100948810577
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_shower_scripts>]> 31.1297941208
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massivecase>]> 0.000519037246704
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_lh_order>]> 0.000610113143921
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gd_gd>]> 2.84897994995
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_representation>]> 0.389190196991
@@ -149,6 +151,7 @@
 <__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.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>]> 60.9571709633
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_gluons>]> 0.00331091880798
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_d_product>]> 0.00334000587463
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_pert_particles_interactionsi_mssm>]> 7.10099411011
@@ -164,28 +167,29 @@
 <__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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_wavefunctions testMethod=test_T>]> 0.00113582611084
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_profile_epem_ttx>]> 15.8373379707
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_wmdxu>]> 45.5971930027
+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_LO_draw_with_NLO_generation>]> 0.695207118988
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_emep_emepa>]> 0.0428278446198
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_long_decay>]> 0.0534508228302
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_read_param_card>]> 2.07473993301
-<__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>]> 96.4886369705
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_identical_parameters>]> 0.0867898464203
 <__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.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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_get_pdg_code>]> 0.000124931335449
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization3>]> 0.000184774398804
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_ufo_standard_sm>]> 0.142593860626
 <__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.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_python_export_functions>]> 0.0172030925751
+<__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.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_notion_of_egality>]> 0.000488996505737
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_mssm1>]> 4.24386501312
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order1>]> 0.0381689071655
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_8fs>]> 0.104753017426
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_colorize_uux_ggg>]> 0.0345070362091
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_vertex_list>]> 7.5101852417e-05
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_to_immutable>]> 5.88893890381e-05
 <__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_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_split>]> 85.3567028046
@@ -205,6 +209,7 @@
 <__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.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
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_wavefunctions testMethod=test_OR>]> 0.000894069671631
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_setget_particle_exceptions>]> 0.000194072723389
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_representation>]> 5.88893890381e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_wavefunctions testMethod=test_IR>]> 0.000931978225708
@@ -220,7 +225,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_born_hel>]> 0.0338699817657
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWritting testMethod=test_create_param_dict>]> 0.0762360095978
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_v4_heft>]> 8.9085290432
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_gluons>]> 0.00796890258789
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_group_decay_chains>]> 0.438848972321
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_F77writer_complex_mass_scheme>]> 0.0254271030426
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_nlo>]> 11.7403600216
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasDecayChainProcessTest testMethod=test_helas_decay_chain_process>]> 0.479960918427
@@ -228,23 +233,26 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_helas_multi_process>]> 0.0335440635681
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_K6_objects>]> 0.000303030014038
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.HelperTest testMethod=test_make_unique>]> 5.00679016113e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_ddxwpduxgg_gdxwpuxgg>]> 1.28763198853
+<__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.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_complex_mass_scheme>]> 0.095272064209
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testscalarmanipulation>]> 0.000458955764771
 <__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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_stop_decay>]> 0.01522397995
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_define_level>]> 0.000642061233521
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_ssx_azg>]> 56.4366059303
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_setget_process_definition_exceptions>]> 0.000463008880615
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummultint>]> 9.48905944824e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_combine_ij>]> 0.00774097442627
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_udx_htbx>]> 18.4214160442
 <__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_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_fermion_flow_clash>]> 0.034786939621
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_decayBW_file>]> 0.00429511070251
+<__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.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000109910964966
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testConjugateOperator>]> 0.0886290073395
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_pass_in_standard_name>]> 0.0025041103363
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000128984451294
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_multiprocess>]> 0.708781957626
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_decay_chain>]> 8.23388409615
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_setget_channel>]> 0.227739095688
@@ -254,7 +262,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_3>]> 50.3050301075
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_IdentifyHelasTag testMethod=test_collect_helascalls>]> 0.0538630485535
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_born_nhel_file>]> 0.0593218803406
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_import_LoopUFOModel.LoopUFOImportTest testMethod=test_loadingLoopToyModel>]> 0.174286842346
+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_NLOAmplitude>]> 0.381425857544
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_replace>]> 0.000383138656616
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_gutdb_butd>]> 0.0145020484924
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_mssm_equivalence>]> 4.6789290905
@@ -275,12 +283,14 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_e_p_collision>]> 21.8384239674
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_inverse_pid_for_type>]> 0.000257968902588
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_misc.TEST_misc testMethod=test_equal>]> 0.000149965286255
-<__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_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_pdgs>]> 0.0846738815308
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_setget_process_correct>]> 0.000761985778809
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_product>]> 9.89437103271e-05
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_ufo_standard_sm>]> 0.142593860626
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_name>]> 47.3614420891
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization3>]> 0.000184774398804
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_getsetvertexlist_correct>]> 0.112138986588
 <__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.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
@@ -290,30 +300,31 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestImportUFO testMethod=test_coupling_hierarchy>]> 0.043447971344
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uux_uuxuux>]> 0.461228847504
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_ppwy>]> 41.3791599274
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_pythia8_export_functions>]> 0.0397579669952
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_python_export_functions>]> 0.0172030925751
 <__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.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_multidiagram_decay_chains>]> 0.431716918945
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_color_links>]> 0.00164699554443
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_group_decay_chains>]> 0.438848972321
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_decaytable_string>]> 0.357012033463
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_gluons>]> 0.00796890258789
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_values_for_prop>]> 0.0001060962677
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_parse_to_cpp>]> 0.0238230228424
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_gauge_loop_p1>]> 427.859879017
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_multi_process_pptt>]> 4.34664011002
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_NLOAmplitude>]> 0.381425857544
+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_import_LoopUFOModel.LoopUFOImportTest testMethod=test_loadingLoopToyModel>]> 0.174286842346
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_help_generate_ab_amplitude_2>]> 0.363662004471
+<__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.interface.test_cmd.TestValidCmd testMethod=test_help_category>]> 0.00254201889038
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_color_basis_uux_aggg>]> 0.256009817123
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_run_python_matrix_element>]> 0.234958171844
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_setup_interactions>]> 0.228127002716
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_gb_t1go_tttxn1x1m>]> 0.135241031647
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_find_symmetry_uu_tt>]> 0.129317045212
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_setup_particles>]> 0.195822954178
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_fixed_indices>]> 0.000831842422485
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_read>]> 0.000303030014038
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.TestDiagramTag testMethod=test_reorder_permutation>]> 0.0726900100708
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_group_subprocess>]> 68.4718120098
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_amcatnlo_from_file>]> 35.7223939896
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator>]> 0.154071092606
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_generate_helas_diagrams_ae_ae>]> 0.0106971263885
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_ufo_aloha>]> 8.15419101715
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_f_d_product>]> 0.00230002403259
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_brs_gd_gd>]> 12.9648890495
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarmult>]> 7.60555267334e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCALLWriterComplexMass testMethod=test_UFO_fortran_helas_call_writer>]> 0.194958925247
@@ -325,9 +336,8 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_decay_chain_with_subprocess_group>]> 0.295508146286
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_get_analytic_info>]> 0.52717590332
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_ppgogo_nlo>]> 76.1395959854
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_subproc_group_symmetry>]> 14.9934668541
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testbasicoperation>]> 0.000213861465454
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_add_ab_interaction>]> 0.129942893982
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_short_gauge>]> 28.5228588581
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_f_object>]> 0.000140905380249
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_mparticles>]> 0.00264000892639
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_ug_ttxz>]> 0.11712884903
@@ -337,16 +347,18 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=test_sumofLorentzObj>]> 0.00670909881592
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_setget_vertex_correct>]> 5.50746917725e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_spin3half>]> 0.154654026031
-<__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.VertexTest testMethod=test_vertex_list>]> 7.5101852417e-05
 <__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_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_multi_process_ppz>]> 1.70217895508
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.000133991241455
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell1 testMethod=test_import_model>]> 0.106930971146
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_representation>]> 5.91278076172e-05
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.TestModelCreation testMethod=test_all>]> 0.951196908951
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_epsilon_object>]> 0.000172138214111
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFV>]> 0.10179400444
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_process_init>]> 0.00924706459045
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_import_banner_command>]> 1.45100903511
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_zz_n1n1>]> 0.0138208866119
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_create_all_pickle>]> 85.1342711449
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_ij_lines>]> 0.0146369934082
 <__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
@@ -356,6 +368,7 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_split_evt_gen>]> 6.80820512772
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_get_initialfinal>]> 0.125761032104
 <__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.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm2>]> 22.172164917
 <__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.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_cpp>]> 0.000547170639038
@@ -367,41 +380,44 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_photons>]> 0.107678890228
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummultmul>]> 0.000133991241455
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8_analyse>]> 0.000602960586548
+<__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.core.test_helas_objects.HelasAmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.000211000442505
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_values_for_prop>]> 0.110687971115
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_dxd_zzg>]> 66.4006011486
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_base_amplitude>]> 0.140361070633
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_standard>]> 3.79085540771e-05
 <__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.various.test_decay.Test_DecayParticle testMethod=test_reset_decaywidth>]> 0.13299202919
+<__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.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.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF3>]> 0.325031042099
 <__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.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_nogroup>]> 0.109572172165
 <__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.TestCmdShell2 testMethod=test_custom_propa>]> 1.53734087944
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_particle_save>]> 0.000370025634766
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_wpwmz>]> 50.1016280651
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_get_type>]> 0.000255107879639
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_multi_quarks>]> 0.155210018158
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.FortranHelasCallWriterTest testMethod=test_generate_wavefunctions_and_amplitudes>]> 0.00574684143066
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_get_onshell>]> 0.126470804214
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testspincontraction>]> 0.0458018779755
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_init_setget>]> 0.332448005676
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_all_reconstructed_dd_eemm>]> 0.120349884033
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_lhe_parser.TESTLHEParser testMethod=test_read_write_lhe>]> 0.00316500663757
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_real_me_wrapper>]> 0.0157730579376
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_drawing_eps.TestDrawingOption testMethod=test_option_multi_type>]> 0.0388491153717
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_redef_position>]> 9.70363616943e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_file_writers.FortranWriterTest testMethod=test_write_fortran_line>]> 0.000858068466187
-<__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.iolibs.test_helas_call_writers.UFOHELASCallWriterTest testMethod=test_UFO_Python_helas_call_writer>]> 0.0118069648743
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testspinsum>]> 0.00285291671753
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_standalone_cpp>]> 12.2329871655
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_epem_ddx>]> 0.67814207077
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_complex_mass_SA>]> 1.51796483994
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_link_gghgg_gghg>]> 0.115737915039
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWWW>]> 0.0192968845367
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_equality>]> 0.000424861907959
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator4>]> 0.025171995163
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWZA>]> 0.0144498348236
@@ -415,7 +431,8 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_values_for_prop>]> 9.60826873779e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_colorize_funny_model>]> 0.00600600242615
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_helas_forbidden_s_channel_uux_uuxng>]> 0.17527794838
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massivecase>]> 0.000519037246704
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_shower_scripts>]> 31.1297941208
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.UFO_model_to_mg4_Test testMethod=test_case_sensitive>]> 0.122036933899
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testequality>]> 0.000127077102661
 <__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
@@ -424,27 +441,30 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_expand_list>]> 0.00167798995972
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_use_of_library_spin2>]> 0.103766918182
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testtensorialproductspin>]> 0.070338010788
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_wavefunctions testMethod=test_OR>]> 0.000894069671631
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testeinsteinsum2>]> 0.00269603729248
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_setget_interaction_correct>]> 0.000202894210815
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_dec_multiprocess_files>]> 0.481742143631
+<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_ddxwpduxgg_gdxwpuxgg>]> 1.28763198853
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_IdentifyHelasTag testMethod=test_helas_helpers>]> 0.0438580513
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_22>]> 360.097683191
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_running_couplings>]> 7.48882603645
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_helper_lcm_functions>]> 0.000735998153687
 <__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.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_lo>]> 26.0977950096
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasordinate>]> 0.00022292137146
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_generating_dict_to_0>]> 0.000486850738525
 <__main__.TestSuiteModified tests=[<tests.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.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.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_values_for_prop>]> 0.0001060962677
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_decaytable_string>]> 0.357012033463
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization4>]> 0.000848054885864
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.FortranHelasCallWriterTest testMethod=test_w_and_z_amplitudes>]> 0.00282502174377
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_read>]> 0.000303030014038
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_fixed_indices>]> 0.000831842422485
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.TestIdentifyMETag testMethod=test_non_identify_me_tag_qq_qqg>]> 0.221249103546
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_set>]> 45.5628159046
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_zccx>]> 80.6770009995
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testmultvarAdd>]> 0.000159025192261
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_born_fks>]> 0.057590007782
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_uux_ddx>]> 2.72820210457
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_diagram_equality>]> 0.00447082519531
@@ -456,14 +476,14 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hw6>]> 0.000626087188721
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testCAlgebraDefinition>]> 0.0381119251251
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_uuddg_uugg>]> 0.0265622138977
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_define_order>]> 0.214026927948
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_reset_decaywidth>]> 0.13299202919
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorSextetModel testMethod=test_sextet_color_flow_output>]> 0.819326162338
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_export_complicated_majorana_decay_chain>]> 0.0769350528717
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj>]> 0.145397901535
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testspincontraction>]> 0.0458018779755
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_get_onshell>]> 0.126470804214
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_process_cc_file_uu_six>]> 0.0613379478455
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCALLWriterComplexMass testMethod=test_UFO_Python_helas_call_writer>]> 0.197067022324
-<__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.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.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_complex_equality>]> 0.453453063965
@@ -471,15 +491,16 @@
 <__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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_one_initial_state_particle>]> 0.00104308128357
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasordinate>]> 0.00022292137146
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_lo>]> 26.0977950096
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSRealProcess_init>]> 0.0786809921265
 <__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.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_save_load>]> 1.68547606468
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramFDStructTest testMethod=test_gg_5gglgl_bubble_tag>]> 0.00427198410034
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_special_parameters>]> 0.0848360061646
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_coeff_string>]> 0.0342230796814
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_script>]> 30.6620099545
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_13>]> 41.2373769283
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_attx>]> 81.0487728119
 <__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.core.test_drawing.TestFeynmanDiagram testMethod=test_no_cutting_line>]> 0.0152459144592
@@ -495,9 +516,10 @@
 <__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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_multistage_decay_chain_process>]> 0.203777074814
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_hhttx>]> 293.488785028
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestTchannelModels testMethod=test_uu_to_tt_tch>]> 7.79628753662e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestConvertSLAH testMethod=test_convert_to_mg5>]> 0.0130620002747
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_zz_n1n1>]> 0.0138208866119
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_import_banner_command>]> 1.45100903511
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_gg_tt_fullylept>]> 0.189878940582
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCard testMethod=test_mod_param>]> 0.000418901443481
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=test_split>]> 0.00737619400024
@@ -511,6 +533,7 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_madevent_directory>]> 16.0076999664
 <__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.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805
 <__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
@@ -523,15 +546,16 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testgetrepresentation>]> 0.00228095054626
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p3>]> 27.4707448483
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_matrix_element_fks>]> 0.0163419246674
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_uu_uug>]> 0.0557870864868
+<__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_madloop.TestCmdLoop testMethod=test_ML_check_full_epem_ttx>]> 42.7599339485
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarint>]> 6.48498535156e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_duxhuduxux_guxhuuxux>]> 1.03614902496
+<__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.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_ufo_helas_diagrams_gg_gogo>]> 0.0135381221771
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummulvar>]> 0.000131845474243
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_subproc_group_symmetry>]> 14.9934668541
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_values_for_prop>]> 0.000351905822754
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWritting testMethod=test_define_not_dep_param>]> 0.0775101184845
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_w_production_with_ms_decay>]> 56.5486888885
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_uuxng>]> 0.343585014343
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_generate_loop.TestGenerateLoopFKS testMethod=test_generate_virtuals_helas_matrix_element>]> 2.81991004944
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_multi_leg_list>]> 0.00020694732666
@@ -544,8 +568,9 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_ddxng>]> 0.179573059082
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_cmd.TestInstall testMethod=test_configuration_file>]> 0.000146865844727
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_conjugate_index_majoranas>]> 0.00603890419006
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_zttx>]> 85.9512209892
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_find_optimal_order>]> 0.190226793289
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_getsetvertexlist_exceptions>]> 0.110853910446
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_ddx_wpwmg>]> 49.2504761219
 <__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.unit_tests.various.test_diquark_models.TestColorSextetModel testMethod=test_uu_to_six_g>]> 0.172813892365
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_cpp_go_process_cc_file>]> 0.0690608024597
@@ -555,12 +580,14 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_FO_analyse_card.TestFOAnalyseCard testMethod=test_analyse_card_default>]> 0.000207901000977
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_input_string>]> 0.00074315071106
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_Tr_product>]> 0.0111749172211
+<__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_cmd.TestInstall testMethod=test_install_update>]> 0.00136995315552
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_shell_and_continuation_line>]> 0.0123059749603
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_gttx>]> 114.093806028
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_ddx_wpwmg>]> 142.621704102
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_mirror_pp_3j>]> 0.479301929474
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_rotate_momenta>]> 0.533701896667
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_get_fks_j_from_i_lines>]> 2.00525093079
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_gauge_loop_p2>]> 3480.223248
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_subproc_group_decay_chain>]> 8.28355312347
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_C>]> 0.0504019260406
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_Plorentz>]> 0.0568020343781
@@ -572,22 +599,23 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_duplicate_lorentz_structures>]> 0.0115809440613
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=test_sum_with4ind>]> 0.0239880084991
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_ungroup_decay>]> 1.91394805908
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasordinate_wronginput>]> 0.000245809555054
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_building>]> 0.000118970870972
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testmultmultmult>]> 0.000118017196655
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_6_e500>]> 29.0589199066
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_insert_color_links>]> 0.0447919368744
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_dxd_zgg>]> 83.576171875
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_get_aloha_input>]> 0.216245174408
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_ppgogo_amcatnlo>]> 77.5487518311
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testmultvarAdd>]> 0.000159025192261
+<__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_base_objects.DiagramTest testMethod=test_diagram_list_nice_string>]> 0.00311493873596
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_values_for_prop>]> 0.110687971115
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_short_gauge_loop>]> 36.9988949299
 <__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.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_fortran>]> 0.000572919845581
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_decay_width_nlo_model>]> 14.2313911915
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uu_susu>]> 0.0135440826416
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_misc.IOMiscTest testMethod=test_parse_info_str_correct>]> 0.000116109848022
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_crossing_uux_gg>]> 0.00763201713562
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_dxd_zgg>]> 76.0861980915
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess>]> 0.970643043518
 <__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.core.test_get_s_and_t_channels.TestGetSandTchannels testMethod=test_get_s_and_t_ub_tdg>]> 0.11679315567
@@ -605,19 +633,21 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_generate_loop.TestGenerateLoopFKS testMethod=test_generate_virtuals_single_process>]> 1.24343204498
 <__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_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_wpwmbbx>]> 130.829271078
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_def_begin_end_point>]> 9.89437103271e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_setget_vertex_exceptions>]> 0.000106811523438
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestMadSpinFCT_in_interface testMethod=test_get_final_part>]> 0.12849187851
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCallWriterTest testMethod=test_UFO_fortran_helas_call_writer>]> 0.0117249488831
 <__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.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p2>]> 750.973557949
+<__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_aloha.testLorentzObject testMethod=test_spin2propagator3>]> 0.0653259754181
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_butdg_butd>]> 0.0965809822083
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_IdentifyHelasTag testMethod=test_helas_comparison>]> 0.225214958191
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_define_not_dep_param>]> 0.0751221179962
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_b_sf_fks>]> 2.02799201012
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_add_ab_interaction>]> 0.129942893982
 <__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
@@ -631,8 +661,8 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromPdirectory testMethod=test_run_fromP>]> 21.0784730911
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_wrong_multiparticle>]> 0.00848388671875
 <__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.various.test_aloha.TestVariable testMethod=testsumvarvar>]> 6.89029693604e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_den_factor_lines>]> 2.02332401276
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_nice_string>]> 0.000377178192139
 <__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.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464
@@ -649,7 +679,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_output>]> 0.0474369525909
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator2>]> 0.152077913284
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_pdgs>]> 0.0846738815308
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_file>]> 0.00247812271118
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hwpp_set>]> 29.2329268456
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_read_madgraph4_proc_card>]> 0.877720832825
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_setget_particle_correct>]> 0.000205039978027
@@ -658,12 +688,12 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell1 testMethod=test_generate>]> 0.300364971161
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_link_gghg_ggh>]> 0.0988841056824
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_pmass_file>]> 0.00053882598877
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_generate_events_nlo_py6pt_fsr>]> 1.46954607964
+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_ud_ggdu>]> 1.26658701897
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCALLWriterComplexMass testMethod=test_UFO_CPP_helas_call_writer>]> 0.197350025177
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_triplet_diquarks>]> 8.50123596191
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_short_ML5_sm_vs_stored_ML5>]> 140.824648142
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_colormultiplicity>]> 0.125108957291
-<__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.unit_tests.iolibs.test_import_v4.IOImportV4Test testMethod=test_read_interactions>]> 0.00336003303528
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_py6pt_stdhep>]> 58.9974210262
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_find_process_classes_and_mapping_diagrams>]> 3.02310013771
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_CT_vertices_generation_ddx_ddx>]> 0.930881977081
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_ddx_ddx>]> 3.87537407875
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_d_object>]> 0.00014591217041
@@ -671,34 +701,34 @@
 <__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.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_special_group_decay_chain>]> 0.162132024765
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_gluons>]> 0.0548150539398
+<__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.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_setget_amplitude_correct>]> 0.00019097328186
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T_pair_simplify>]> 0.000263929367065
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_ppzz_in_RS>]> 5.40944194794
-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_LO_draw_with_NLO_generation>]> 0.695207118988
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_profile_epem_ttx>]> 15.8373379707
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestLorentzInvariance testMethod=test_boost_momenta>]> 5.30410599709
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_particles_type>]> 1.96593403816
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_unused_decays_in_decay_chain_pp_jj>]> 0.199378967285
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin32propagator>]> 0.232930898666
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_splittings>]> 0.0126750469208
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization>]> 0.000458955764771
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_locate_couplings>]> 0.0886061191559
-<__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestEvent testMethod=test_madspin_event>]> 0.00227999687195
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_model_reader.TestModelReader testMethod=test_set_parameters_and_couplings>]> 0.0923321247101
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestImportUFO testMethod=test_expansion_order>]> 0.0448379516602
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_setget_model_correct>]> 0.00034499168396
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_CT_vertices_generation_gg_gg>]> 1.53292918205
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWWWA>]> 0.132983922958
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000128984451294
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_pass_in_standard_name>]> 0.0025041103363
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm3>]> 36.1485049725
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_multi_amp_majorana_process>]> 0.00927495956421
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gg_ggg>]> 0.551722049713
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_setgetinit_exceptions>]> 0.111714839935
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testmultvarMult>]> 8.82148742676e-05
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_dxd_agg>]> 58.4090330601
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.IOImportV4Test testMethod=test_full_import>]> 0.0387060642242
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_attx>]> 62.4550800323
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_from_immutable>]> 0.000111818313599
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_find_symmetry_uu_tt>]> 0.129317045212
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_add_line>]> 0.000107049942017
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_heft>]> 9.56633806229
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_gb_t1go_tttxn1x1m>]> 0.135241031647
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_values_for_prop>]> 0.000351905822754
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups_general>]> 7.73995018005
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_Tr_pair_simplify>]> 0.000292062759399
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_configs_file_born>]> 0.00420498847961
@@ -712,19 +742,22 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_get_particles_type>]> 0.128159046173
 <__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_helas_call_writers.HelasModelTest testMethod=test_setget_helas_model_correct>]> 0.00146913528442
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_dxd_agg>]> 62.7762000561
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_get_interactions_type>]> 0.169551134109
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_Pslashproperty>]> 0.0272090435028
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_helper_find_channels>]> 0.152440071106
 <__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.iolibs.test_export_v4.UFO_model_to_mg4_Test testMethod=test_case_sensitive>]> 0.122036933899
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection>]> 0.000416040420532
 <__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.core.test_helas_objects.HelasMultiProcessTest testMethod=test_equal_decay_chains>]> 0.134434938431
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticleList testMethod=test_convert>]> 0.000968933105469
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.00019907951355
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_level_with_flipping_triangle>]> 0.00130605697632
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_helper_lcm_functions>]> 0.000735998153687
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_getsetvertexlist_exceptions>]> 0.110853910446
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower3>]> 0.0128040313721
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_zero_iden_couplings>]> 0.08682513237
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_zzz>]> 46.8325479031
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin32propagator>]> 0.232930898666
 <__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_aloha.TestMultVariable testMethod=test_obj_are_not_modified>]> 0.000224113464355
@@ -735,47 +768,51 @@
 <__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_4fermion_models.TestSchannelModels testMethod=test_uu_to_tt_sch>]> 0.152179956436
-<__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_files.TestFilesGestion testMethod=test_is_uptodate>]> 1.0137488842
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_get_name>]> 0.030855178833
 <__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.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_representation>]> 0.000728130340576
+<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_duxhuduxux_guxhuuxux>]> 1.03614902496
 <__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
 <__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.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_enu_enu>]> 0.008131980896
+<__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_check_param_card.TestParamCardRule testMethod=test_check_param>]> 0.0894939899445
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_other>]> 4.31537628174e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_vector_clash_majorana_process>]> 0.012188911438
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_representation>]> 5.91278076172e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_expand_veto>]> 0.00188112258911
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_dxd_zzg>]> 65.2875192165
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_full_sm_decay_groups>]> 5.82679080963
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_gauge_loop_p2>]> 3480.223248
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_required_s_channel_uux_uuxng>]> 0.146993160248
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_export_majorana_decay_chain>]> 0.290829896927
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_remove_couplings>]> 0.0872521400452
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_single_decay_combinations>]> 0.0449919700623
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_helper_find_channels>]> 0.152440071106
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_setgetinit_exceptions>]> 0.111714839935
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_udxwpg_udxwp>]> 0.0118889808655
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_values_for_prop>]> 0.000183820724487
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_extract_info>]> 0.00151705741882
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_VVS>]> 0.0273261070251
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py6>]> 0.000173807144165
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarvar>]> 6.89029693604e-05
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_get_python_matrix_methods>]> 0.0204730033875
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_restrict_from_a_param_card>]> 0.106390953064
+<__main__.TestSuiteModified tests=[<tests.unit_tests.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.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testGammaAlgebraDefinition>]> 1.01560497284
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_color_flow_string_epsilon>]> 0.00355815887451
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_values_for_prop>]> 0.000351905822754
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_add_line>]> 0.000107049942017
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm1>]> 37.7807819843
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_gg>]> 0.00705409049988
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_reorder_permutation>]> 5.41210174561e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_uuuug_guug>]> 0.0394339561462
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_read_write_param_card>]> 0.00176000595093
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_4f_decay>]> 0.0363750457764
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_check_param>]> 0.0894939899445
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gs_emvexc>]> 17.4471540451
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_misc.IOMiscTest testMethod=test_parse_info_str_correct>]> 0.000116109848022
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_setget_leg_exceptions>]> 0.000114917755127
 <__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

=== modified file 'tests/unit_tests/iolibs/test_export_fks.py'
--- tests/unit_tests/iolibs/test_export_fks.py	2013-12-11 13:56:21 +0000
+++ tests/unit_tests/iolibs/test_export_fks.py	2014-01-19 08:21:29 +0000
@@ -155,10 +155,6 @@
       DOUBLE PRECISION WGT
       INTEGER NFKSPROCESS
       COMMON/C_NFKSPROCESS/NFKSPROCESS
-      REAL*4 TBEFORE, TAFTER
-      REAL*4 TTOT, TOLP, TFASTJET, TPDF
-      COMMON/TIMINGS/TTOT, TOLP, TFASTJET, TPDF
-      CALL CPU_TIME(TBEFORE)
       IF (NFKSPROCESS.EQ.1) THEN
         CALL SMATRIX_1(P, WGT)
       ELSEIF (NFKSPROCESS.EQ.2) THEN
@@ -179,8 +175,6 @@
         WRITE(*,*) 'ERROR: invalid n in real_matrix :', NFKSPROCESS
         STOP
       ENDIF
-      CALL CPU_TIME(TAFTER)
-      TPDF = TPDF + (TAFTER-TBEFORE)
       RETURN
       END
 
@@ -201,8 +195,10 @@
         goal = \
 """      DOUBLE PRECISION FUNCTION DLUM()
       IMPLICIT NONE
+      INCLUDE 'timing_variables.inc'
       INTEGER NFKSPROCESS
       COMMON/C_NFKSPROCESS/NFKSPROCESS
+      CALL CPU_TIME(TBEFORE)
       IF (NFKSPROCESS.EQ.1) THEN
         CALL DLUM_1(DLUM)
       ELSEIF (NFKSPROCESS.EQ.2) THEN
@@ -223,7 +219,8 @@
         WRITE(*,*) 'ERROR: invalid n in dlum :', NFKSPROCESS
         STOP
       ENDIF
-
+      CALL CPU_TIME(TAFTER)
+      TPDF = TPDF + (TAFTER-TBEFORE)
       RETURN
       END
 

=== modified file 'tests/unit_tests/iolibs/test_export_v4.py'
--- tests/unit_tests/iolibs/test_export_v4.py	2013-12-14 02:53:24 +0000
+++ tests/unit_tests/iolibs/test_export_v4.py	2014-01-19 08:21:29 +0000
@@ -1055,6 +1055,7 @@
 C     ----------
       DSIG=0D0
       CUTSDONE=.FALSE.
+      CUTSPASSED=.FALSE.
       IF(IMODE.EQ.1)THEN
 C       Set up process information from file symfact
         LUN=NEXTUNOPEN()

=== modified file 'tests/unit_tests/various/test_aloha.py'
--- tests/unit_tests/various/test_aloha.py	2013-11-12 23:52:05 +0000
+++ tests/unit_tests/various/test_aloha.py	2014-01-19 08:21:29 +0000
@@ -19,6 +19,7 @@
 import math
 import os
 import time
+import tempfile as tempfile
 from functools import wraps
 
 import aloha
@@ -29,7 +30,7 @@
 import aloha.aloha_writers as aloha_writers
 import models.sm.object_library as object_library
 import tests.unit_tests as unittest
-
+import madgraph.various.misc as misc
 
 def set_global(loop=False, unitary=True, mp=False, cms=False):
 
@@ -3382,33 +3383,33 @@
         self.assertEqual(linked, [])
         
         # Check that the file are correctly written
-        os.system('rm -r /tmp/mg5 &> /dev/null; mkdir /tmp/mg5 &> /dev/null')
-        helas_suite.write('/tmp/mg5', 'Fortran')
-        
-        content = set(os.listdir('/tmp/mg5'))
-        self.assertEqual(content, set(['FFV1_0.f',
-                                       'FFV1C1_0.f','FFV2C1_0.f']))
-        
-        # Check the content of FFV1__FFV2C1_0.f
-        fsock = open('/tmp/mg5/FFV1C1_0.f')
-        goal = """
-      SUBROUTINE FFV1_2C1_0(F2, F1, V3, COUP1, COUP2,VERTEX)
-      IMPLICIT NONE
-      COMPLEX*16 F1(*)
-      COMPLEX*16 F2(*)
-      COMPLEX*16 V3(*)
-      COMPLEX*16 COUP1
-      COMPLEX*16 COUP2
-      COMPLEX*16 VERTEX
-      COMPLEX*16 TMP
-      CALL FFV1C1_0(F2,F1,V3,COUP1,VERTEX)
-      CALL FFV2C1_0(F2,F1,V3,COUP2,TMP)
-      VERTEX = VERTEX + TMP
-      END"""
-
-        data = fsock.read().split('\n')
-        for line in goal.split('\n'):
-                self.assertTrue(line in data)
+        with misc.TMP_directory(prefix='mg5') as path:
+            helas_suite.write(path, 'Fortran')
+            
+            content = set(os.listdir(path))
+            self.assertEqual(content, set(['FFV1_0.f',
+                                           'FFV1C1_0.f','FFV2C1_0.f']))
+            
+            # Check the content of FFV1__FFV2C1_0.f
+            fsock = open('%s/FFV1C1_0.f' % path)
+            goal = """
+          SUBROUTINE FFV1_2C1_0(F2, F1, V3, COUP1, COUP2,VERTEX)
+          IMPLICIT NONE
+          COMPLEX*16 F1(*)
+          COMPLEX*16 F2(*)
+          COMPLEX*16 V3(*)
+          COMPLEX*16 COUP1
+          COMPLEX*16 COUP2
+          COMPLEX*16 VERTEX
+          COMPLEX*16 TMP
+          CALL FFV1C1_0(F2,F1,V3,COUP1,VERTEX)
+          CALL FFV2C1_0(F2,F1,V3,COUP2,TMP)
+          VERTEX = VERTEX + TMP
+          END"""
+    
+            data = [ l.strip() for l in fsock.read().split('\n')]
+            for line in goal.split('\n'):
+                    self.assertTrue(line.strip() in data)
         
         
         

=== modified file 'vendor/CutTools/README'
--- vendor/CutTools/README	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/README	2014-01-19 08:21:29 +0000
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
  
-              CutTools V1.9.0 (Apr 25 2013)
+              CutTools V1.9.2 (Jan 17 2014)
 
               contact author: [e-mail]
 
@@ -481,6 +481,19 @@
 - more precise computation of del12 in dp_bild_l and mp_build_l and 
   protection added against 1/0
 
+- December 13 2013:
+
+  line logical, intent(in) :: ext_num_for_r1in moved before
+  include 'cts_mpinit.h' 
+  in cts_cuttools.f90
+
+- Jan 17 2014:
+
+  interfaced with OneLOop-3.4.tgz
+  To do so cts_qpinit.in <- cts_mpinit.in 
+  and      cts_qprec.in  <- cts_mprec.in 
+  in directory cts
+
 ---------------------------------------------------------------------------
-Last modification of this document: Apr 25 2013
+Last modification of this document: Jan 17 2014
 ---------------------------------------------------------------------------

=== modified symlink 'vendor/CutTools/examples/cts_mpc.h'
=== target was u'../src/cts/cts_mpc.h'
--- vendor/CutTools/examples/cts_mpc.h	1970-01-01 00:00:00 +0000
+++ vendor/CutTools/examples/cts_mpc.h	2014-01-19 08:21:29 +0000
@@ -0,0 +1,1 @@
+ complex(kind=16)&

=== modified symlink 'vendor/CutTools/examples/cts_mpr.h'
=== target was u'../src/cts/cts_mpr.h'
--- vendor/CutTools/examples/cts_mpr.h	1970-01-01 00:00:00 +0000
+++ vendor/CutTools/examples/cts_mpr.h	2014-01-19 08:21:29 +0000
@@ -0,0 +1,1 @@
+ real(kind=16)&

=== modified symlink 'vendor/CutTools/examples/cts_mprec.h'
=== target was u'../src/cts/cts_mprec.h'
--- vendor/CutTools/examples/cts_mprec.h	1970-01-01 00:00:00 +0000
+++ vendor/CutTools/examples/cts_mprec.h	2014-01-19 08:21:29 +0000
@@ -0,0 +1,1 @@
+  use mpmodule

=== removed symlink 'vendor/CutTools/examples/includects'
=== target was u'../includects/'
=== modified file 'vendor/CutTools/examples/testdir/out10_ccc'
--- vendor/CutTools/examples/testdir/out10_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out10_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #

=== modified file 'vendor/CutTools/examples/testdir/out11_ccc'
--- vendor/CutTools/examples/testdir/out11_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out11_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #

=== modified file 'vendor/CutTools/examples/testdir/out20_ccc'
--- vendor/CutTools/examples/testdir/out20_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out20_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #

=== modified file 'vendor/CutTools/examples/testdir/out21_ccc'
--- vendor/CutTools/examples/testdir/out21_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out21_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #
@@ -40,10 +40,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -11.260154916719337     , 6.40628317614876357E-015)
+  finite part           amp(0)= ( -11.260154916719335     , 6.40628317614876357E-015)
   coeff of 1/eps   pole amp(1)= (  23.884777499999988     ,-1.46963142289692862E-014)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -11.260154916719337     , 6.40628317614876357E-015)
+                         ampcc= ( -11.260154916719335     , 6.40628317614876357E-015)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -54,10 +54,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -11.260154916719337     , 6.40628317614876357E-015)
+  finite part           amp(0)= ( -11.260154916719335     , 6.40628317614876357E-015)
   coeff of 1/eps   pole amp(1)= (  23.884777499999988     ,-1.46963142289692862E-014)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -11.260154916719337     , 6.40628317614876357E-015)
+                         ampcc= ( -11.260154916719335     , 6.40628317614876357E-015)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -68,10 +68,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -11.260154916719337     , 6.40628317614876357E-015)
+  finite part           amp(0)= ( -11.260154916719335     , 6.40628317614876357E-015)
   coeff of 1/eps   pole amp(1)= (  23.884777499999988     ,-1.46963142289692862E-014)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -11.260154916719337     , 6.40628317614876357E-015)
+                         ampcc= ( -11.260154916719335     , 6.40628317614876357E-015)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -82,10 +82,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -11.260154916719337     , 6.40628317614876357E-015)
+  finite part           amp(0)= ( -11.260154916719335     , 6.40628317614876357E-015)
   coeff of 1/eps   pole amp(1)= (  23.884777499999988     ,-1.46963142289692862E-014)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -11.260154916719337     , 6.40628317614876357E-015)
+                         ampcc= ( -11.260154916719335     , 6.40628317614876357E-015)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -96,10 +96,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -11.260154916719337     , 6.40628317614876357E-015)
+  finite part           amp(0)= ( -11.260154916719335     , 6.40628317614876357E-015)
   coeff of 1/eps   pole amp(1)= (  23.884777499999988     ,-1.46963142289692862E-014)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -11.260154916719337     , 6.40628317614876357E-015)
+                         ampcc= ( -11.260154916719335     , 6.40628317614876357E-015)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -110,10 +110,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -11.260154916719337     , 6.40628317614876357E-015)
+  finite part           amp(0)= ( -11.260154916719335     , 6.40628317614876357E-015)
   coeff of 1/eps   pole amp(1)= (  23.884777499999988     ,-1.46963142289692862E-014)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -11.260154916719337     , 6.40628317614876357E-015)
+                         ampcc= ( -11.260154916719335     , 6.40628317614876357E-015)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -124,10 +124,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -11.260154916719337     , 6.40628317614876357E-015)
+  finite part           amp(0)= ( -11.260154916719335     , 6.40628317614876357E-015)
   coeff of 1/eps   pole amp(1)= (  23.884777499999988     ,-1.46963142289692862E-014)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -11.260154916719337     , 6.40628317614876357E-015)
+                         ampcc= ( -11.260154916719335     , 6.40628317614876357E-015)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -138,10 +138,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -11.260154916719337     , 6.40628317614876357E-015)
+  finite part           amp(0)= ( -11.260154916719335     , 6.40628317614876357E-015)
   coeff of 1/eps   pole amp(1)= (  23.884777499999988     ,-1.46963142289692862E-014)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -11.260154916719337     , 6.40628317614876357E-015)
+                         ampcc= ( -11.260154916719335     , 6.40628317614876357E-015)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -152,10 +152,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -11.260154916719337     , 6.40628317614876357E-015)
+  finite part           amp(0)= ( -11.260154916719335     , 6.40628317614876357E-015)
   coeff of 1/eps   pole amp(1)= (  23.884777499999988     ,-1.46963142289692862E-014)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -11.260154916719337     , 6.40628317614876357E-015)
+                         ampcc= ( -11.260154916719335     , 6.40628317614876357E-015)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -166,10 +166,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -11.260154916719337     , 6.40628317614876357E-015)
+  finite part           amp(0)= ( -11.260154916719335     , 6.40628317614876357E-015)
   coeff of 1/eps   pole amp(1)= (  23.884777499999988     ,-1.46963142289692862E-014)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -11.260154916719337     , 6.40628317614876357E-015)
+                         ampcc= ( -11.260154916719335     , 6.40628317614876357E-015)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 

=== modified file 'vendor/CutTools/examples/testdir/out22_ccc'
--- vendor/CutTools/examples/testdir/out22_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out22_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #
@@ -40,10 +40,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143522E-012)
+  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143361E-012)
   coeff of 1/eps   pole amp(1)= ( -125.84630512828434     , 2.11222590344266051E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -40.464410939684718     ,-2.34048142514532464E-012)
+                         ampcc= ( -40.464410939684718     ,-2.34048142514532303E-012)
                             R1= ( -684.64374989984867     ,-4.30408033432611058E-012)
                         stable= T
                 
@@ -54,10 +54,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143522E-012)
+  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143361E-012)
   coeff of 1/eps   pole amp(1)= ( -125.84630512828434     , 2.11222590344266051E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -40.464410939684718     ,-2.34048142514532464E-012)
+                         ampcc= ( -40.464410939684718     ,-2.34048142514532303E-012)
                             R1= ( -684.64374989984867     ,-4.30408033432611058E-012)
                         stable= T
                 
@@ -68,10 +68,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143522E-012)
+  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143361E-012)
   coeff of 1/eps   pole amp(1)= ( -125.84630512828434     , 2.11222590344266051E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -40.464410939684718     ,-2.34048142514532464E-012)
+                         ampcc= ( -40.464410939684718     ,-2.34048142514532303E-012)
                             R1= ( -684.64374989984867     ,-4.30408033432611058E-012)
                         stable= T
                 
@@ -82,10 +82,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143522E-012)
+  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143361E-012)
   coeff of 1/eps   pole amp(1)= ( -125.84630512828434     , 2.11222590344266051E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -40.464410939684718     ,-2.34048142514532464E-012)
+                         ampcc= ( -40.464410939684718     ,-2.34048142514532303E-012)
                             R1= ( -684.64374989984867     ,-4.30408033432611058E-012)
                         stable= T
                 
@@ -96,10 +96,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143522E-012)
+  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143361E-012)
   coeff of 1/eps   pole amp(1)= ( -125.84630512828434     , 2.11222590344266051E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -40.464410939684718     ,-2.34048142514532464E-012)
+                         ampcc= ( -40.464410939684718     ,-2.34048142514532303E-012)
                             R1= ( -684.64374989984867     ,-4.30408033432611058E-012)
                         stable= T
                 
@@ -110,10 +110,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143522E-012)
+  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143361E-012)
   coeff of 1/eps   pole amp(1)= ( -125.84630512828434     , 2.11222590344266051E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -40.464410939684718     ,-2.34048142514532464E-012)
+                         ampcc= ( -40.464410939684718     ,-2.34048142514532303E-012)
                             R1= ( -684.64374989984867     ,-4.30408033432611058E-012)
                         stable= T
                 
@@ -124,10 +124,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143522E-012)
+  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143361E-012)
   coeff of 1/eps   pole amp(1)= ( -125.84630512828434     , 2.11222590344266051E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -40.464410939684718     ,-2.34048142514532464E-012)
+                         ampcc= ( -40.464410939684718     ,-2.34048142514532303E-012)
                             R1= ( -684.64374989984867     ,-4.30408033432611058E-012)
                         stable= T
                 
@@ -138,10 +138,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143522E-012)
+  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143361E-012)
   coeff of 1/eps   pole amp(1)= ( -125.84630512828434     , 2.11222590344266051E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -40.464410939684718     ,-2.34048142514532464E-012)
+                         ampcc= ( -40.464410939684718     ,-2.34048142514532303E-012)
                             R1= ( -684.64374989984867     ,-4.30408033432611058E-012)
                         stable= T
                 
@@ -152,10 +152,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143522E-012)
+  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143361E-012)
   coeff of 1/eps   pole amp(1)= ( -125.84630512828434     , 2.11222590344266051E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -40.464410939684718     ,-2.34048142514532464E-012)
+                         ampcc= ( -40.464410939684718     ,-2.34048142514532303E-012)
                             R1= ( -684.64374989984867     ,-4.30408033432611058E-012)
                         stable= T
                 
@@ -166,10 +166,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143522E-012)
+  finite part           amp(0)= ( -725.10816083953341     ,-6.64456175947143361E-012)
   coeff of 1/eps   pole amp(1)= ( -125.84630512828434     , 2.11222590344266051E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -40.464410939684718     ,-2.34048142514532464E-012)
+                         ampcc= ( -40.464410939684718     ,-2.34048142514532303E-012)
                             R1= ( -684.64374989984867     ,-4.30408033432611058E-012)
                         stable= T
                 

=== modified file 'vendor/CutTools/examples/testdir/out30_ccc'
--- vendor/CutTools/examples/testdir/out30_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out30_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #

=== modified file 'vendor/CutTools/examples/testdir/out31_ccc'
--- vendor/CutTools/examples/testdir/out31_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out31_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #

=== modified file 'vendor/CutTools/examples/testdir/out32_ccc'
--- vendor/CutTools/examples/testdir/out32_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out32_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #
@@ -40,10 +40,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  1165.7555238553341     , -756.43677312626676     )
+  finite part           amp(0)= (  1165.7555238553339     , -756.43677312626676     )
   coeff of 1/eps   pole amp(1)= ( -237.80384892032046     , 1.42825808107079455E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  1401.4570378555129     , -756.43677312672651     )
+                         ampcc= (  1401.4570378555127     , -756.43677312672651     )
                             R1= ( -235.70151400017878     , 4.59795046481303881E-010)
                         stable= T
                 
@@ -54,10 +54,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  1165.7555238553341     , -756.43677312626676     )
+  finite part           amp(0)= (  1165.7555238553339     , -756.43677312626676     )
   coeff of 1/eps   pole amp(1)= ( -237.80384892032046     , 1.42825808107079455E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  1401.4570378555129     , -756.43677312672651     )
+                         ampcc= (  1401.4570378555127     , -756.43677312672651     )
                             R1= ( -235.70151400017878     , 4.59795046481303881E-010)
                         stable= T
                 
@@ -68,10 +68,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  1165.7555238553341     , -756.43677312626676     )
+  finite part           amp(0)= (  1165.7555238553339     , -756.43677312626676     )
   coeff of 1/eps   pole amp(1)= ( -237.80384892032046     , 1.42825808107079455E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  1401.4570378555129     , -756.43677312672651     )
+                         ampcc= (  1401.4570378555127     , -756.43677312672651     )
                             R1= ( -235.70151400017878     , 4.59795046481303881E-010)
                         stable= T
                 
@@ -82,10 +82,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  1165.7555238553341     , -756.43677312626676     )
+  finite part           amp(0)= (  1165.7555238553339     , -756.43677312626676     )
   coeff of 1/eps   pole amp(1)= ( -237.80384892032046     , 1.42825808107079455E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  1401.4570378555129     , -756.43677312672651     )
+                         ampcc= (  1401.4570378555127     , -756.43677312672651     )
                             R1= ( -235.70151400017878     , 4.59795046481303881E-010)
                         stable= T
                 
@@ -96,10 +96,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  1165.7555238553341     , -756.43677312626676     )
+  finite part           amp(0)= (  1165.7555238553339     , -756.43677312626676     )
   coeff of 1/eps   pole amp(1)= ( -237.80384892032046     , 1.42825808107079455E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  1401.4570378555129     , -756.43677312672651     )
+                         ampcc= (  1401.4570378555127     , -756.43677312672651     )
                             R1= ( -235.70151400017878     , 4.59795046481303881E-010)
                         stable= T
                 
@@ -110,10 +110,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  1165.7555238553341     , -756.43677312626676     )
+  finite part           amp(0)= (  1165.7555238553339     , -756.43677312626676     )
   coeff of 1/eps   pole amp(1)= ( -237.80384892032046     , 1.42825808107079455E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  1401.4570378555129     , -756.43677312672651     )
+                         ampcc= (  1401.4570378555127     , -756.43677312672651     )
                             R1= ( -235.70151400017878     , 4.59795046481303881E-010)
                         stable= T
                 
@@ -124,10 +124,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  1165.7555238553341     , -756.43677312626676     )
+  finite part           amp(0)= (  1165.7555238553339     , -756.43677312626676     )
   coeff of 1/eps   pole amp(1)= ( -237.80384892032046     , 1.42825808107079455E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  1401.4570378555129     , -756.43677312672651     )
+                         ampcc= (  1401.4570378555127     , -756.43677312672651     )
                             R1= ( -235.70151400017878     , 4.59795046481303881E-010)
                         stable= T
                 
@@ -138,10 +138,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  1165.7555238553341     , -756.43677312626676     )
+  finite part           amp(0)= (  1165.7555238553339     , -756.43677312626676     )
   coeff of 1/eps   pole amp(1)= ( -237.80384892032046     , 1.42825808107079455E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  1401.4570378555129     , -756.43677312672651     )
+                         ampcc= (  1401.4570378555127     , -756.43677312672651     )
                             R1= ( -235.70151400017878     , 4.59795046481303881E-010)
                         stable= T
                 
@@ -152,10 +152,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  1165.7555238553341     , -756.43677312626676     )
+  finite part           amp(0)= (  1165.7555238553339     , -756.43677312626676     )
   coeff of 1/eps   pole amp(1)= ( -237.80384892032046     , 1.42825808107079455E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  1401.4570378555129     , -756.43677312672651     )
+                         ampcc= (  1401.4570378555127     , -756.43677312672651     )
                             R1= ( -235.70151400017878     , 4.59795046481303881E-010)
                         stable= T
                 
@@ -166,10 +166,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  1165.7555238553341     , -756.43677312626676     )
+  finite part           amp(0)= (  1165.7555238553339     , -756.43677312626676     )
   coeff of 1/eps   pole amp(1)= ( -237.80384892032046     , 1.42825808107079455E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  1401.4570378555129     , -756.43677312672651     )
+                         ampcc= (  1401.4570378555127     , -756.43677312672651     )
                             R1= ( -235.70151400017878     , 4.59795046481303881E-010)
                         stable= T
                 

=== modified file 'vendor/CutTools/examples/testdir/out33_ccc'
--- vendor/CutTools/examples/testdir/out33_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out33_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #
@@ -40,10 +40,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  238998.32320877584     , -146283.60261429186     )
+  finite part           amp(0)= (  238998.32320877619     , -146283.60261429186     )
   coeff of 1/eps   pole amp(1)= ( -46301.743464380786     ,-2.87887525699021594E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  245394.92917627466     , -146283.60261415568     )
+                         ampcc= (  245394.92917627501     , -146283.60261415568     )
                             R1= ( -6396.6059674988119     ,-1.36166859958344587E-007)
                         stable= T
                 
@@ -54,10 +54,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  238998.32320877584     , -146283.60261429186     )
+  finite part           amp(0)= (  238998.32320877619     , -146283.60261429186     )
   coeff of 1/eps   pole amp(1)= ( -46301.743464380786     ,-2.87887525699021594E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  245394.92917627466     , -146283.60261415568     )
+                         ampcc= (  245394.92917627501     , -146283.60261415568     )
                             R1= ( -6396.6059674988119     ,-1.36166859958344587E-007)
                         stable= T
                 
@@ -68,10 +68,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  238998.32320877584     , -146283.60261429186     )
+  finite part           amp(0)= (  238998.32320877619     , -146283.60261429186     )
   coeff of 1/eps   pole amp(1)= ( -46301.743464380786     ,-2.87887525699021594E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  245394.92917627466     , -146283.60261415568     )
+                         ampcc= (  245394.92917627501     , -146283.60261415568     )
                             R1= ( -6396.6059674988119     ,-1.36166859958344587E-007)
                         stable= T
                 
@@ -82,10 +82,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  238998.32320877584     , -146283.60261429186     )
+  finite part           amp(0)= (  238998.32320877619     , -146283.60261429186     )
   coeff of 1/eps   pole amp(1)= ( -46301.743464380786     ,-2.87887525699021594E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  245394.92917627466     , -146283.60261415568     )
+                         ampcc= (  245394.92917627501     , -146283.60261415568     )
                             R1= ( -6396.6059674988119     ,-1.36166859958344587E-007)
                         stable= T
                 
@@ -96,10 +96,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  238998.32320877584     , -146283.60261429186     )
+  finite part           amp(0)= (  238998.32320877619     , -146283.60261429186     )
   coeff of 1/eps   pole amp(1)= ( -46301.743464380786     ,-2.87887525699021594E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  245394.92917627466     , -146283.60261415568     )
+                         ampcc= (  245394.92917627501     , -146283.60261415568     )
                             R1= ( -6396.6059674988119     ,-1.36166859958344587E-007)
                         stable= T
                 
@@ -110,10 +110,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  238998.32320877584     , -146283.60261429186     )
+  finite part           amp(0)= (  238998.32320877619     , -146283.60261429186     )
   coeff of 1/eps   pole amp(1)= ( -46301.743464380786     ,-2.87887525699021594E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  245394.92917627466     , -146283.60261415568     )
+                         ampcc= (  245394.92917627501     , -146283.60261415568     )
                             R1= ( -6396.6059674988119     ,-1.36166859958344587E-007)
                         stable= T
                 
@@ -124,10 +124,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  238998.32320877584     , -146283.60261429186     )
+  finite part           amp(0)= (  238998.32320877619     , -146283.60261429186     )
   coeff of 1/eps   pole amp(1)= ( -46301.743464380786     ,-2.87887525699021594E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  245394.92917627466     , -146283.60261415568     )
+                         ampcc= (  245394.92917627501     , -146283.60261415568     )
                             R1= ( -6396.6059674988119     ,-1.36166859958344587E-007)
                         stable= T
                 
@@ -138,10 +138,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  238998.32320877584     , -146283.60261429186     )
+  finite part           amp(0)= (  238998.32320877619     , -146283.60261429186     )
   coeff of 1/eps   pole amp(1)= ( -46301.743464380786     ,-2.87887525699021594E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  245394.92917627466     , -146283.60261415568     )
+                         ampcc= (  245394.92917627501     , -146283.60261415568     )
                             R1= ( -6396.6059674988119     ,-1.36166859958344587E-007)
                         stable= T
                 
@@ -152,10 +152,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  238998.32320877584     , -146283.60261429186     )
+  finite part           amp(0)= (  238998.32320877619     , -146283.60261429186     )
   coeff of 1/eps   pole amp(1)= ( -46301.743464380786     ,-2.87887525699021594E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  245394.92917627466     , -146283.60261415568     )
+                         ampcc= (  245394.92917627501     , -146283.60261415568     )
                             R1= ( -6396.6059674988119     ,-1.36166859958344587E-007)
                         stable= T
                 
@@ -166,10 +166,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  238998.32320877584     , -146283.60261429186     )
+  finite part           amp(0)= (  238998.32320877619     , -146283.60261429186     )
   coeff of 1/eps   pole amp(1)= ( -46301.743464380786     ,-2.87887525699021594E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  245394.92917627466     , -146283.60261415568     )
+                         ampcc= (  245394.92917627501     , -146283.60261415568     )
                             R1= ( -6396.6059674988119     ,-1.36166859958344587E-007)
                         stable= T
                 

=== modified file 'vendor/CutTools/examples/testdir/out40_ccc'
--- vendor/CutTools/examples/testdir/out40_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out40_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #
@@ -40,10 +40,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-4.84630819028038817E-005, 2.49768452969808145E-005)
+  finite part           amp(0)= (-4.84630819028038749E-005, 2.49768452969807941E-005)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-4.84630819028038817E-005, 2.49768452969808145E-005)
+                         ampcc= (-4.84630819028038749E-005, 2.49768452969807941E-005)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -54,10 +54,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-4.88160030502475628E-005, 2.51620429491179092E-005)
+  finite part           amp(0)= (-4.88160030502475832E-005, 2.51620429491179024E-005)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-4.88160030502475628E-005, 2.51620429491179092E-005)
+                         ampcc= (-4.88160030502475832E-005, 2.51620429491179024E-005)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -68,10 +68,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-7.08107320251647387E-004, 3.98870422833456136E-004)
+  finite part           amp(0)= (-7.08107320251646953E-004, 3.98870422833456299E-004)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-7.08107320251647387E-004, 3.98870422833456136E-004)
+                         ampcc= (-7.08107320251646953E-004, 3.98870422833456299E-004)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -82,10 +82,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-1.37256471791122922E-004, 7.23848890852895249E-005)
+  finite part           amp(0)= (-1.37256471791122922E-004, 7.23848890852891861E-005)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-1.37256471791122922E-004, 7.23848890852895249E-005)
+                         ampcc= (-1.37256471791122922E-004, 7.23848890852891861E-005)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -96,10 +96,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-4.56466567443516264E-005, 2.35000951158759183E-005)
+  finite part           amp(0)= (-4.56466567443516196E-005, 2.35000951158759115E-005)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-4.56466567443516264E-005, 2.35000951158759183E-005)
+                         ampcc= (-4.56466567443516196E-005, 2.35000951158759115E-005)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -110,10 +110,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-1.56914968408188515E-004, 8.30592950319282555E-005)
+  finite part           amp(0)= (-1.56914968408188515E-004, 8.30592950319283097E-005)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-1.56914968408188515E-004, 8.30592950319282555E-005)
+                         ampcc= (-1.56914968408188515E-004, 8.30592950319283097E-005)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -124,10 +124,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-6.39439425494636162E-004, 3.58083597201789303E-004)
+  finite part           amp(0)= (-6.39439425494635946E-004, 3.58083597201789194E-004)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-6.39439425494636162E-004, 3.58083597201789303E-004)
+                         ampcc= (-6.39439425494635946E-004, 3.58083597201789194E-004)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -152,10 +152,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-1.96350281342022083E-004, 1.04631968532772993E-004)
+  finite part           amp(0)= (-1.96350281342022083E-004, 1.04631968532772776E-004)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-1.96350281342022083E-004, 1.04631968532772993E-004)
+                         ampcc= (-1.96350281342022083E-004, 1.04631968532772776E-004)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -166,10 +166,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-1.33334943228459349E-004, 7.02622957661183152E-005)
+  finite part           amp(0)= (-1.33334943228459376E-004, 7.02622957661185456E-005)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-1.33334943228459349E-004, 7.02622957661183152E-005)
+                         ampcc= (-1.33334943228459376E-004, 7.02622957661185456E-005)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 

=== modified file 'vendor/CutTools/examples/testdir/out41_ccc'
--- vendor/CutTools/examples/testdir/out41_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out41_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #
@@ -40,10 +40,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( 1.48009653220694548E-004,-8.27003358455888652E-004)
+  finite part           amp(0)= ( 1.48009653220701487E-004,-8.27003358455879979E-004)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( 1.48009653220694548E-004,-8.27003358455888652E-004)
+                         ampcc= ( 1.48009653220701487E-004,-8.27003358455879979E-004)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -54,10 +54,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-2.72886464615850616E-003, 2.00301183551678625E-003)
+  finite part           amp(0)= (-2.72886464615850269E-003, 2.00301183551677064E-003)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-2.72886464615850616E-003, 2.00301183551678625E-003)
+                         ampcc= (-2.72886464615850269E-003, 2.00301183551677064E-003)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -68,10 +68,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-1.94505927282371677E-002, 1.06147685926884332E-002)
+  finite part           amp(0)= (-1.94505927282371538E-002, 1.06147685926884384E-002)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-1.94505927282371677E-002, 1.06147685926884332E-002)
+                         ampcc= (-1.94505927282371538E-002, 1.06147685926884384E-002)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -82,10 +82,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-4.53193446658491095E-003, 2.56371349177672396E-003)
+  finite part           amp(0)= (-4.53193446658491008E-003, 2.56371349177671008E-003)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-4.53193446658491095E-003, 2.56371349177672396E-003)
+                         ampcc= (-4.53193446658491008E-003, 2.56371349177671008E-003)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -96,10 +96,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-5.91535413534321390E-004,-6.27828278863557524E-005)
+  finite part           amp(0)= (-5.91535413534324860E-004,-6.27828278863505482E-005)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-5.91535413534321390E-004,-6.27828278863557524E-005)
+                         ampcc= (-5.91535413534324860E-004,-6.27828278863505482E-005)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -110,10 +110,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-9.67049196078779982E-003, 6.97339173783925390E-003)
+  finite part           amp(0)= (-9.67049196078779288E-003, 6.97339173783925736E-003)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-9.67049196078779982E-003, 6.97339173783925390E-003)
+                         ampcc= (-9.67049196078779288E-003, 6.97339173783925736E-003)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -124,10 +124,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( 6.06196152256835430E-004,-5.23119018815609588E-003)
+  finite part           amp(0)= ( 6.06196152256838899E-004,-5.23119018815609415E-003)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( 6.06196152256835430E-004,-5.23119018815609588E-003)
+                         ampcc= ( 6.06196152256838899E-004,-5.23119018815609415E-003)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -152,10 +152,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( 4.16979571251810139E-003,-5.72129254360100818E-003)
+  finite part           amp(0)= ( 4.16979571251810139E-003,-5.72129254360098736E-003)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( 4.16979571251810139E-003,-5.72129254360100818E-003)
+                         ampcc= ( 4.16979571251810139E-003,-5.72129254360098736E-003)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -166,10 +166,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( 7.88875672019997347E-004,-2.24018339579623712E-003)
+  finite part           amp(0)= ( 7.88875672019999081E-004,-2.24018339579625273E-003)
   coeff of 1/eps   pole amp(1)= (  0.0000000000000000     ,  0.0000000000000000     )
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( 7.88875672019997347E-004,-2.24018339579623712E-003)
+                         ampcc= ( 7.88875672019999081E-004,-2.24018339579625273E-003)
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 

=== modified file 'vendor/CutTools/examples/testdir/out42_ccc'
--- vendor/CutTools/examples/testdir/out42_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out42_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #
@@ -40,10 +40,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-0.10728550383454026     , 0.81607473181265533     )
+  finite part           amp(0)= (-0.10728550383454354     , 0.81607473181264822     )
   coeff of 1/eps   pole amp(1)= (-1.70870262383715499E-016,-3.90162437247010935E-015)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-0.10728550383454026     , 0.81607473181265533     )
+                         ampcc= (-0.10728550383454354     , 0.81607473181264822     )
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -54,10 +54,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-0.75132113659545252     ,  1.4786201367290359     )
+  finite part           amp(0)= (-0.75132113659545507     ,  1.4786201367290346     )
   coeff of 1/eps   pole amp(1)= ( 1.50573997714786856E-015,-6.82469910821949124E-015)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-0.75132113659545252     ,  1.4786201367290359     )
+                         ampcc= (-0.75132113659545507     ,  1.4786201367290346     )
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -68,10 +68,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -2.9973507366309757     ,  3.3594740661757183     )
+  finite part           amp(0)= ( -2.9973507366309762     ,  3.3594740661757183     )
   coeff of 1/eps   pole amp(1)= (-1.12757025938492461E-017, 1.75444269771324771E-015)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -2.9973507366309757     ,  3.3594740661757183     )
+                         ampcc= ( -2.9973507366309762     ,  3.3594740661757183     )
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -82,10 +82,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-0.79761114554389101     ,  1.5336728725090178     )
+  finite part           amp(0)= (-0.79761114554389279     ,  1.5336728725090183     )
   coeff of 1/eps   pole amp(1)= (-3.51932025188794739E-016,-1.82858090689019125E-015)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-0.79761114554389101     ,  1.5336728725090178     )
+                         ampcc= (-0.79761114554389279     ,  1.5336728725090183     )
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -96,10 +96,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-2.97386818387803120E-002, 0.61951380329602579     )
+  finite part           amp(0)= (-2.97386818387874174E-002, 0.61951380329603289     )
   coeff of 1/eps   pole amp(1)= (-4.37323788293753069E-015,-2.96860821123537261E-015)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-2.97386818387803120E-002, 0.61951380329602579     )
+                         ampcc= (-2.97386818387874174E-002, 0.61951380329603289     )
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -110,10 +110,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -3.1577828758875630     ,  4.1733977270314870     )
+  finite part           amp(0)= ( -3.1577828758875630     ,  4.1733977270314879     )
   coeff of 1/eps   pole amp(1)= ( 3.60822483003175876E-016, 2.89405452819065772E-015)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -3.1577828758875630     ,  4.1733977270314870     )
+                         ampcc= ( -3.1577828758875630     ,  4.1733977270314879     )
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -124,10 +124,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -1.2335837504776364     ,  2.4560711026215940     )
+  finite part           amp(0)= ( -1.2335837504776375     ,  2.4560711026215944     )
   coeff of 1/eps   pole amp(1)= (-2.22044604925031308E-015, 8.28252625262081010E-017)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -1.2335837504776364     ,  2.4560711026215940     )
+                         ampcc= ( -1.2335837504776375     ,  2.4560711026215944     )
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -138,10 +138,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -2.4689860892478919     ,  4.2884556185442708     )
+  finite part           amp(0)= ( -2.4689860892478919     ,  4.2884556185442717     )
   coeff of 1/eps   pole amp(1)= ( 6.43582409587395432E-016, 3.07710846760681157E-016)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -2.4689860892478919     ,  4.2884556185442708     )
+                         ampcc= ( -2.4689860892478919     ,  4.2884556185442717     )
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -152,10 +152,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -1.4676330447956174     ,  3.0394625771986745     )
+  finite part           amp(0)= ( -1.4676330447956174     ,  3.0394625771986723     )
   coeff of 1/eps   pole amp(1)= ( 6.66133814775093924E-016,-8.55177854952909161E-017)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -1.4676330447956174     ,  3.0394625771986745     )
+                         ampcc= ( -1.4676330447956174     ,  3.0394625771986723     )
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 
@@ -166,10 +166,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (-0.45668416421782787     ,  1.5057231563028759     )
+  finite part           amp(0)= (-0.45668416421782698     ,  1.5057231563028670     )
   coeff of 1/eps   pole amp(1)= (-9.71445146547011973E-017,-2.30899160210593773E-015)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (-0.45668416421782787     ,  1.5057231563028759     )
+                         ampcc= (-0.45668416421782698     ,  1.5057231563028670     )
                             R1= (  0.0000000000000000     ,  0.0000000000000000     )
                         stable= T
                 

=== modified file 'vendor/CutTools/examples/testdir/out43_ccc'
--- vendor/CutTools/examples/testdir/out43_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out43_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #
@@ -40,10 +40,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -63.415977119251821     , -90.510086314630314     )
+  finite part           amp(0)= ( -63.415977119253625     , -90.510086314632588     )
   coeff of 1/eps   pole amp(1)= ( 1.63043190060108145E-012,-1.64857874178971422E-011)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( 1.76373867735583750E-002, -90.510086314912130     )
+                         ampcc= ( 1.76373867717513483E-002, -90.510086314914403     )
                             R1= ( -63.433614506025378     , 2.81818302028113986E-010)
                         stable= T
                 
@@ -54,10 +54,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -195.72595079225420     ,  752.14672612199286     )
+  finite part           amp(0)= ( -195.72595079226886     ,  752.14672612203651     )
   coeff of 1/eps   pole amp(1)= (-8.04185884550889796E-012,-1.54093698782129478E-011)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -211.26496116491896     ,  752.14672612283096     )
+                         ampcc= ( -211.26496116493362     ,  752.14672612287461     )
                             R1= (  15.539010372664762     ,-8.38110736367525574E-010)
                         stable= T
                 
@@ -68,10 +68,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -506.59199964805902     ,  734.88569402002349     )
+  finite part           amp(0)= ( -506.59199964805936     ,  734.88569402002338     )
   coeff of 1/eps   pole amp(1)= (-2.05799821628716018E-011,-9.09325421369707763E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -507.66606632188331     ,  734.88569401998279     )
+                         ampcc= ( -507.66606632188365     ,  734.88569401998268     )
                             R1= (  1.0740666738242677     , 4.06743971836931476E-011)
                         stable= T
                 
@@ -82,10 +82,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -144.22985296252631     ,  437.17321758329945     )
+  finite part           amp(0)= ( -144.22985296252676     ,  437.17321758330650     )
   coeff of 1/eps   pole amp(1)= ( 5.51225731726390222E-014, 3.04441987490268187E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -143.47193614008688     ,  437.17321758321185     )
+                         ampcc= ( -143.47193614008734     ,  437.17321758321890     )
                             R1= (-0.75791682243943992     , 8.76164918395261416E-011)
                         stable= T
                 
@@ -96,10 +96,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -39.238319415036003     ,  60.450938537966699     )
+  finite part           amp(0)= ( -39.238319414977795     ,  60.450938538083115     )
   coeff of 1/eps   pole amp(1)= ( 1.24431801667990172E-011,-8.08473868960806191E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -21.862151299785285     ,  60.450938537334864     )
+                         ampcc= ( -21.862151299727078     ,  60.450938537451279     )
                             R1= ( -17.376168115250721     , 6.31837338005425388E-010)
                         stable= T
                 
@@ -124,10 +124,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -95.383832304777656     , -135.63530586981969     )
+  finite part           amp(0)= ( -95.383832304777656     , -135.63530586981975     )
   coeff of 1/eps   pole amp(1)= ( 1.28785870856518159E-012, 7.00903838616795050E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -59.868859758060381     , -135.63530587020881     )
+                         ampcc= ( -59.868859758060395     , -135.63530587020887     )
                             R1= ( -35.514972546717267     , 3.89128063105204092E-010)
                         stable= T
                 
@@ -152,10 +152,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= (  169.04049810038916     , -950.12871340818378     )
+  finite part           amp(0)= (  169.04049810038907     , -950.12871340818378     )
   coeff of 1/eps   pole amp(1)= (-1.18106913138404934E-012, 2.03160958550507606E-012)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= (  169.62153632401419     , -950.12871340833681     )
+                         ampcc= (  169.62153632401410     , -950.12871340833681     )
                             R1= (-0.58103822362502200     , 1.53022483573295176E-010)
                         stable= T
                 
@@ -166,10 +166,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -66.441853461848638     , -211.72014200367050     )
+  finite part           amp(0)= ( -66.441853461846023     , -211.72014200367141     )
   coeff of 1/eps   pole amp(1)= ( 3.78030939884865802E-014,-6.65936496127973901E-014)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -54.986674200892274     , -211.72014200389617     )
+                         ampcc= ( -54.986674200889659     , -211.72014200389708     )
                             R1= ( -11.455179260956371     , 2.25659491093210818E-010)
                         stable= T
                 

=== modified file 'vendor/CutTools/examples/testdir/out44_ccc'
--- vendor/CutTools/examples/testdir/out44_ccc	2013-04-25 15:21:17 +0000
+++ vendor/CutTools/examples/testdir/out44_ccc	2014-01-19 08:21:29 +0000
@@ -8,7 +8,7 @@
      
   
 ------------------------------------------------------------------------
-|              You are using CutTools - Version 1.9.0                  |
+|              You are using CutTools - Version 1.9.1                  |
 |              Authors: G. Ossola, C. Papadopoulos, R. Pittau          |
 |              Published in JHEP 0803:042,2008                         |
 |              http://www.ugr.es/~pittau/CutTools                      |
@@ -18,12 +18,12 @@
    
 ########################################################################
 #                                                                      #
-#                      You are using OneLOop-3.2                       #
+#                      You are using OneLOop-3.4                       #
 #                                                                      #
 # for the evaluation of 1-loop scalar 1-, 2-, 3- and 4-point functions #
 #                                                                      #
 # author: Andreas van Hameren <[e-mail]>           #
-#   date: 19-07-2012                                                   #
+#   date: 02-01-2014                                                   #
 #                                                                      #
 # Please cite                                                          #
 #    A. van Hameren,                                                   #
@@ -40,10 +40,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -507883.66802478966     ,  217964.05133750444     )
+  finite part           amp(0)= ( -507883.66802476032     ,  217964.05133754169     )
   coeff of 1/eps   pole amp(1)= (  113101.34112262535     ,-1.94253750938434956E-008)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -659883.21308092528     ,  217964.05177372295     )
+                         ampcc= ( -659883.21308089595     ,  217964.05177376021     )
                             R1= (  151999.54505613563     ,-4.36218515624010276E-004)
                         stable= T
                 
@@ -54,10 +54,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -549520.17436470906     ,  562915.10232542176     )
+  finite part           amp(0)= ( -549520.17436462059     ,  562915.10232546646     )
   coeff of 1/eps   pole amp(1)= (  113101.34112263727     ,-8.08654717870685346E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -660104.29322004807     ,  562915.10219307954     )
+                         ampcc= ( -660104.29321995960     ,  562915.10219312424     )
                             R1= (  110584.11885533905     , 1.32342184556391167E-004)
                         stable= T
                 
@@ -68,10 +68,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -542184.46423711721     ,  471124.65732143965     )
+  finite part           amp(0)= ( -542184.46423711721     ,  471124.65732143959     )
   coeff of 1/eps   pole amp(1)= (  113101.34112258273     , 5.88676111804393854E-008)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -694224.29518976784     ,  471124.65732055105     )
+                         ampcc= ( -694224.29518976796     ,  471124.65732055099     )
                             R1= (  152039.83095265069     , 8.88607484933521039E-007)
                         stable= T
                 
@@ -82,10 +82,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -495832.52671702398     ,  363827.38931902114     )
+  finite part           amp(0)= ( -495832.52671702363     ,  363827.38931902108     )
   coeff of 1/eps   pole amp(1)= (  113101.34112263878     , 6.27636064943094960E-009)
   coeff of 1/eps^2 pole amp(2)= (  0.0000000000000000     ,  0.0000000000000000     )
-                         ampcc= ( -707361.21828620159     ,  363827.38931782776     )
+                         ampcc= ( -707361.21828620124     ,  363827.38931782771     )
                             R1= (  211528.69156917761     , 1.19334816204684482E-006)
                         stable= T
                 
@@ -96,10 +96,10 @@
   Complete Amplitude (without r2):     
                 
                 
-  finite part           amp(0)= ( -527397.47924665874     ,  188292.69753792789     )