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

Proposed by Olivier Mattelaer on 2019-06-26
Status: Merged
Merged at revision: 282
Proposed branch: lp:~mg5core1/mg5amcnlo/2.6.6
Merge into: lp:mg5amcnlo
Diff against target: 4242 lines (+1277/-823)
58 files modified
Template/LO/Cards/run_card.dat (+1/-14)
Template/LO/Source/BIAS/ptj_bias/makefile (+1/-5)
Template/LO/Source/PDF/pdg2pdf.f (+8/-5)
Template/LO/Source/PDF/pdg2pdf_lhapdf.f (+1/-0)
Template/LO/Source/PDF/pdg2pdf_lhapdf6.f (+8/-5)
Template/LO/SubProcesses/dummy_fct.f (+10/-0)
Template/LO/SubProcesses/genps.f (+10/-4)
Template/LO/SubProcesses/myamp.f (+1/-1)
Template/LO/SubProcesses/reweight.f (+1/-1)
Template/LO/SubProcesses/setcuts.f (+9/-2)
Template/NLO/Source/PDF/pdg2pdf.f (+8/-5)
Template/NLO/Source/PDF/pdg2pdf_lhapdf.f (+8/-5)
Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f (+8/-5)
Template/NLO/SubProcesses/fks_singular.f (+6/-4)
Template/NLO/SubProcesses/genps_fks.f (+1/-0)
Template/NLO/SubProcesses/handling_lhe_events.f (+1/-1)
Template/NLO/SubProcesses/write_event.f (+1/-1)
Template/loop_material/StandAlone/SubProcesses/makefile (+2/-2)
UpdateNotes.txt (+17/-0)
VERSION (+1/-1)
bin/mg5_aMC (+7/-0)
madgraph/core/base_objects.py (+2/-0)
madgraph/core/diagram_generation.py (+4/-3)
madgraph/core/drawing.py (+1/-1)
madgraph/core/helas_objects.py (+6/-3)
madgraph/fks/fks_common.py (+18/-4)
madgraph/fks/fks_helas_objects.py (+13/-0)
madgraph/interface/common_run_interface.py (+99/-39)
madgraph/interface/extended_cmd.py (+3/-2)
madgraph/interface/madevent_interface.py (+60/-79)
madgraph/interface/madgraph_interface.py (+34/-7)
madgraph/interface/master_interface.py (+18/-8)
madgraph/interface/reweight_interface.py (+12/-4)
madgraph/iolibs/export_v4.py (+32/-1)
madgraph/iolibs/template_files/madevent_makefile_source (+4/-5)
madgraph/iolibs/template_files/matrix_madevent_v4.inc (+1/-1)
madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_cc.inc (+47/-45)
madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_h.inc (+5/-3)
madgraph/loop/loop_exporters.py (+1/-1)
madgraph/various/banner.py (+103/-41)
madgraph/various/diagram_symmetry.py (+7/-2)
madgraph/various/histograms.py (+138/-112)
madgraph/various/lhe_parser.py (+33/-12)
madgraph/various/misc.py (+59/-16)
madgraph/various/shower_card.py (+38/-31)
models/check_param_card.py (+3/-0)
models/import_ufo.py (+28/-5)
models/write_param_card.py (+4/-3)
tests/acceptance_tests/test_cmd.py (+6/-6)
tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_nogroup/matrix.f (+2/-2)
tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/CKKWL_djrs_output.gnuplot (+53/-54)
tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/MLM_djrs_output.gnuplot (+53/-54)
tests/input_files/IOTestsComparison/IOTest_Histogram/gnuplot_histo_output/HistoOut.gnuplot (+53/-54)
tests/time_db (+91/-89)
tests/unit_tests/iolibs/test_export_cpp.py (+50/-46)
tests/unit_tests/various/test_banner.py (+42/-0)
tests/unit_tests/various/test_shower_card.py (+16/-1)
tests/unit_tests/various/test_write_param.py (+28/-28)
To merge this branch: bzr merge lp:~mg5core1/mg5amcnlo/2.6.6
Reviewer Review Type Date Requested Status
Olivier Mattelaer Approve on 2019-06-27
Review via email: mp+369323@code.launchpad.net

Commit message

Time to release this branch

To post a comment you must log in.
lp:~mg5core1/mg5amcnlo/2.6.6 updated on 2019-06-27
332. By olivier-mattelaer on 2019-06-26

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

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

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

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

fix issue with pythia8 mode

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

update gnuplot

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

fixing small issue from the review + adding info in UpdatesNotes

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Template/LO/Cards/run_card.dat'
2--- Template/LO/Cards/run_card.dat 2018-05-29 13:11:53 +0000
3+++ Template/LO/Cards/run_card.dat 2019-06-27 13:48:48 +0000
4@@ -26,7 +26,6 @@
5 #*********************************************************************
6 # Number of events and rnd seed *
7 # Warning: Do not generate more than 1M events in a single run *
8-# If you want to run Pythia, avoid more than 50k events in a run. *
9 #*********************************************************************
10 %(nevents)s = nevents ! Number of unweighted events requested
11 %(iseed)s = iseed ! rnd seed (0=assigned automatically=default))
12@@ -121,19 +120,7 @@
13 %(missetmax)s = missetmax ! maximum missing Et (sum of neutrino's momenta)
14 %(pt_min_pdg)s = pt_min_pdg ! pt cut for other particles (use pdg code). Applied on particle and anti-particle
15 %(pt_max_pdg)s = pt_max_pdg ! pt cut for other particles (syntax e.g. {6: 100, 25: 50})
16-#*********************************************************************
17-# Minimum and maximum E's (in the center of mass frame) *
18-#*********************************************************************
19- %(ej)s = ej ! minimum E for the jets
20- %(eb)s = eb ! minimum E for the b
21- %(ea)s = ea ! minimum E for the photons
22- %(el)s = el ! minimum E for the charged leptons
23- %(ejmax)s = ejmax ! maximum E for the jets
24- %(ebmax)s = ebmax ! maximum E for the b
25- %(eamax)s = eamax ! maximum E for the photons
26- %(elmax)s = elmax ! maximum E for the charged leptons
27- %(e_min_pdg)s = e_min_pdg ! E cut for other particles (use pdg code). Applied on particle and anti-particle
28- %(e_max_pdg)s = e_max_pdg ! E cut for other particles (syntax e.g. {6: 100, 25: 50})
29+$ecut
30 #*********************************************************************
31 # Maximum and minimum absolute rapidity (for max, -1 means no cut) *
32 #*********************************************************************
33
34=== modified file 'Template/LO/Source/BIAS/ptj_bias/makefile'
35--- Template/LO/Source/BIAS/ptj_bias/makefile 2016-08-13 05:32:47 +0000
36+++ Template/LO/Source/BIAS/ptj_bias/makefile 2019-06-27 13:48:48 +0000
37@@ -19,9 +19,5 @@
38 # 'VALID' is the keyword that *must* be returned if everything is in order.
39 #
40 requirements:
41-ifeq ($(shell $(call CHECK_MG5AMC_VERSION,2.4.2)),True)
42 @echo "VALID"
43-else
44- @echo "Error:: MG5aMC is not recent enough (found "$(MG5AMC_VERSION)")"
45- @echo "FAIL"
46-endif
47+
48
49=== modified file 'Template/LO/Source/PDF/pdg2pdf.f'
50--- Template/LO/Source/PDF/pdg2pdf.f 2018-03-07 23:11:46 +0000
51+++ Template/LO/Source/PDF/pdg2pdf.f 2019-06-27 13:48:48 +0000
52@@ -58,12 +58,14 @@
53 endif
54
55 ipart=ipdg
56- if(iabs(ipart).eq.21) ipart=0
57- if(iabs(ipart).eq.22) ipart=7
58- iporg=ipart
59-
60+ if(iabs(ipart).eq.21) then
61+ ipart=0
62+ else if(iabs(ipart).eq.22) then
63+ ipart=7
64+ else if(iabs(ipart).eq.7) then
65+ ipart=7
66 c This will be called for any PDG code, but we only support up to 7
67- if(iabs(ipart).gt.7)then
68+ else if(iabs(ipart).gt.7)then
69 write(*,*) 'PDF not supported for pdg ',ipdg
70 write(*,*) 'For lepton colliders, please set the lpp* '//
71 $ 'variables to 0 in the run_card'
72@@ -72,6 +74,7 @@
73 stop 1
74 endif
75
76+ iporg=ipart
77 ireuse = 0
78 do i=1,2
79 c Check if result can be reused since any of last two calls
80
81=== modified file 'Template/LO/Source/PDF/pdg2pdf_lhapdf.f'
82--- Template/LO/Source/PDF/pdg2pdf_lhapdf.f 2018-03-07 23:11:46 +0000
83+++ Template/LO/Source/PDF/pdg2pdf_lhapdf.f 2019-06-27 13:48:48 +0000
84@@ -57,6 +57,7 @@
85 ipart=ipdg
86 if(ipart.eq.21) ipart=0
87 if(iabs(ipart).eq.22) ipart=7
88+ if(iabs(ipart).eq.7) ipart=7
89 iporg=ipart
90
91 c This will be called for any PDG code, but we only support up to 7
92
93=== modified file 'Template/LO/Source/PDF/pdg2pdf_lhapdf6.f'
94--- Template/LO/Source/PDF/pdg2pdf_lhapdf6.f 2018-03-07 23:11:46 +0000
95+++ Template/LO/Source/PDF/pdg2pdf_lhapdf6.f 2019-06-27 13:48:48 +0000
96@@ -54,12 +54,14 @@
97 endif
98
99 ipart=ipdg
100- if(iabs(ipart).eq.21) ipart=0
101- if(iabs(ipart).eq.22) ipart=7
102- iporg=ipart
103-
104+ if(iabs(ipart).eq.21) then
105+ ipart=0
106+ else if(iabs(ipart).eq.22) then
107+ ipart=7
108+ else if (iabs(ipart).eq.7) then
109+ ipart=7
110 c This will be called for any PDG code, but we only support up to 7
111- if(iabs(ipart).gt.7)then
112+ else if(iabs(ipart).gt.7)then
113 write(*,*) 'PDF not supported for pdg ',ipdg
114 write(*,*) 'For lepton colliders, please set the lpp* '//
115 $ 'variables to 0 in the run_card'
116@@ -68,6 +70,7 @@
117 stop 1
118 endif
119
120+ iporg=ipart
121 c Determine the iset used in lhapdf
122 call getnset(iset)
123 if (iset.ne.1) then
124
125=== modified file 'Template/LO/SubProcesses/dummy_fct.f'
126--- Template/LO/SubProcesses/dummy_fct.f 2018-01-11 16:16:25 +0000
127+++ Template/LO/SubProcesses/dummy_fct.f 2019-06-27 13:48:48 +0000
128@@ -86,3 +86,13 @@
129 shat = x(1)*x(2)*ebeam(1)*ebeam(2)
130 return
131 end
132+
133+
134+ logical function dummy_boostframe()
135+ implicit none
136+c
137+c
138+ dummy_boostframe = .false.
139+ return
140+ end
141+
142
143=== modified file 'Template/LO/SubProcesses/genps.f'
144--- Template/LO/SubProcesses/genps.f 2018-06-27 09:03:22 +0000
145+++ Template/LO/SubProcesses/genps.f 2019-06-27 13:48:48 +0000
146@@ -185,7 +185,8 @@
147 c External function
148 double precision SumDot
149 external SumDot
150-
151+ logical dummy_boostframe
152+ external dummy_boostframe
153 c
154 c data
155 c
156@@ -304,8 +305,12 @@
157 c First Generate Momentum for initial state particles
158 c
159 if (lpp(1).eq.9.or.lpp(2).eq.9)then
160- p(:,1) = pi1(:)
161- p(:,2) = pi2(:)
162+ if (dummy_boostframe())then
163+ call mom2cx(m(-nbranch),m(1),m(2),1d0,0d0,p(0,1),p(0,2))
164+ else
165+ p(:,1) = pi1(:)
166+ p(:,2) = pi2(:)
167+ endif
168 else if(nincoming.eq.2) then
169 call mom2cx(m(-nbranch),m(1),m(2),1d0,0d0,p(0,1),p(0,2))
170 else
171@@ -840,7 +845,7 @@
172 m12 = m(itree(2,ibranch))**2
173 mn2 = m(ibranch-1)**2
174 c write(*,*) 'Enertering yminmax',sqrt(s1),sqrt(m12),sqrt(mn2)
175- call yminmax(s1,t,m12,ma2,mb2,mn2,tmin,tmax)
176+ call yminmax(s1,0d0,m12,ma2,mb2,mn2,tmin,tmax)
177 c
178 c Call for 0<x<1
179 c
180@@ -1114,6 +1119,7 @@
181 C This is the G function from Particle Kinematics by
182 C E. Byckling and K. Kajantie, Chapter 4 p. 91 eqs 5.28
183 C It is used to determine physical limits for Y based on inputs
184+C Y is not used in this formula (called with dummy value)
185 C**************************************************************************
186 implicit none
187 c
188
189=== modified file 'Template/LO/SubProcesses/myamp.f'
190--- Template/LO/SubProcesses/myamp.f 2018-10-08 04:02:27 +0000
191+++ Template/LO/SubProcesses/myamp.f 2019-06-27 13:48:48 +0000
192@@ -501,7 +501,7 @@
193 c Use 1/10000 of sqrt(s) as minimum, to always get integration
194 xo = xo*xo/stot
195 if (xo.eq.0d0)then
196- xo=1d0/stot
197+ xo=1/10000d0
198 write(*,*) 'Warning: No cutoff for shat integral found'
199 write(*,*) ' Minimum set to ', xo
200 endif
201
202=== modified file 'Template/LO/SubProcesses/reweight.f'
203--- Template/LO/SubProcesses/reweight.f 2019-01-25 10:41:09 +0000
204+++ Template/LO/SubProcesses/reweight.f 2019-06-27 13:48:48 +0000
205@@ -399,7 +399,7 @@
206 c exotic q > gluon q'
207 ipart(1,imo)=ipart(1,ida1)
208 ipart(2,imo)=0
209- else if (get_color(idmo).eq.1.or.get_color(idmo).eq.2) then
210+ else if (get_color(idmo).eq.1.or.get_color(idmo).eq.2.or.get_color(idda1).eq.2.or.get_color(idda2).eq.2) then
211 c Color singlet
212 ipart(1,imo)=ipart(1,ida1)
213 ipart(2,imo)=ipart(1,ida2)
214
215=== modified file 'Template/LO/SubProcesses/setcuts.f'
216--- Template/LO/SubProcesses/setcuts.f 2018-03-11 12:10:19 +0000
217+++ Template/LO/SubProcesses/setcuts.f 2019-06-27 13:48:48 +0000
218@@ -664,14 +664,21 @@
219 endif
220 enddo
221
222-c ensure symmetry of s_min(i,j)
223+c ensure symmetry of s_min(i,j) + mass effect
224 do i=nincoming+1,nexternal-1
225 do j=nincoming+1,nexternal-1
226 if(j.lt.i)then
227- s_min(i,j) = max(s_min(j,i),s_min(i,j))
228+ s_min(i,j) = max(s_min(j,i), s_min(i,j), (pmass(i)+pmass(j))**2)
229 endif
230 enddo
231 enddo
232+
233+c ensure that smin is bigger than mass threshold
234+ smin_p = 0d0
235+ do i=nincoming+1, nexternal
236+ smin_p = smin_p + pmass(i)
237+ enddo
238+ smin = max(smin, smin_p**2)
239 write(*,*) "Define smin to", smin
240
241 c Check that results are consistent among all the grouped subprocesses
242
243=== modified file 'Template/NLO/Source/PDF/pdg2pdf.f'
244--- Template/NLO/Source/PDF/pdg2pdf.f 2015-10-21 14:57:34 +0000
245+++ Template/NLO/Source/PDF/pdg2pdf.f 2019-06-27 13:48:48 +0000
246@@ -66,12 +66,14 @@
247 endif
248
249 ipart=ipdg
250- if(iabs(ipart).eq.21) ipart=0
251- if(iabs(ipart).eq.22) ipart=7
252- iporg=ipart
253-
254+ if(iabs(ipart).eq.21) then
255+ ipart=0
256+ else if(iabs(ipart).eq.22) then
257+ ipart=7
258+ else if(iabs(ipart).eq.7) then
259+ ipart=7
260+ else if(iabs(ipart).gt.7)then
261 c This will be called for any PDG code, but we only support up to 7
262- if(iabs(ipart).gt.7)then
263 write(*,*) 'PDF not supported for pdg ',ipdg
264 write(*,*) 'For lepton colliders, please set the lpp* '//
265 $ 'variables to 0 in the run_card'
266@@ -80,6 +82,7 @@
267 stop 1
268 endif
269
270+ iporg=ipart
271 ireuse = 0
272 ii=i_replace
273 do i=1,20
274
275=== modified file 'Template/NLO/Source/PDF/pdg2pdf_lhapdf.f'
276--- Template/NLO/Source/PDF/pdg2pdf_lhapdf.f 2016-02-09 14:17:01 +0000
277+++ Template/NLO/Source/PDF/pdg2pdf_lhapdf.f 2019-06-27 13:48:48 +0000
278@@ -64,12 +64,14 @@
279 endif
280
281 ipart=ipdg
282- if(iabs(ipart).eq.21) ipart=0
283- if(iabs(ipart).eq.22) ipart=7
284- iporg=ipart
285-
286+ if(iabs(ipart).eq.21) then
287+ ipart=0
288+ else if(iabs(ipart).eq.22) then
289+ ipart=7
290+ else if(iabs(ipart).eq.7) then
291+ ipart=7
292+ else if(iabs(ipart).gt.7)then
293 c This will be called for any PDG code, but we only support up to 7
294- if(iabs(ipart).gt.7)then
295 write(*,*) 'PDF not supported for pdg ',ipdg
296 write(*,*) 'For lepton colliders, please set the lpp* '//
297 $ 'variables to 0 in the run_card'
298@@ -82,6 +84,7 @@
299 c Determine the member of the set (function of lhapdf)
300 call getnmem(iset,imem)
301
302+ iporg=ipart
303 ireuse = 0
304 ii=i_replace
305 do i=1,20
306
307=== modified file 'Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f'
308--- Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f 2016-02-11 19:09:10 +0000
309+++ Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f 2019-06-27 13:48:48 +0000
310@@ -65,12 +65,14 @@
311 endif
312
313 ipart=ipdg
314- if(iabs(ipart).eq.21) ipart=0
315- if(iabs(ipart).eq.22) ipart=7
316- iporg=ipart
317-
318+ if(iabs(ipart).eq.21) then
319+ ipart=0
320+ else if(iabs(ipart).eq.22) then
321+ ipart=7
322+ else if(iabs(ipart).eq.7) then
323+ ipart=7
324+ else if(iabs(ipart).gt.7)then
325 c This will be called for any PDG code, but we only support up to 7
326- if(iabs(ipart).gt.7)then
327 write(*,*) 'PDF not supported for pdg ',ipdg
328 write(*,*) 'For lepton colliders, please set the lpp* '//
329 $ 'variables to 0 in the run_card'
330@@ -82,6 +84,7 @@
331 c Determine the member of the set (function of lhapdf)
332 call getnmem(iset,imem)
333
334+ iporg=ipart
335 ireuse = 0
336 ii=i_replace
337 do i=1,20
338
339=== modified file 'Template/NLO/SubProcesses/fks_singular.f'
340--- Template/NLO/SubProcesses/fks_singular.f 2018-03-12 07:20:30 +0000
341+++ Template/NLO/SubProcesses/fks_singular.f 2019-06-27 13:48:48 +0000
342@@ -2896,10 +2896,12 @@
343 & pjet,njet,jet)
344 do i=1,NN
345 di(i)=sqrt(amcatnlo_fastjetdmergemax(i-1))
346- if (i.gt.1.and.di(i).gt.di(i-1))then
347- write(*,*)'Error in set_shower_scale_noshape'
348- write(*,*)NN,i,di(i),di(i-1)
349- stop
350+ if (i.gt.1)then
351+ if(di(i).gt.di(i-1))then
352+ write(*,*)'Error in set_shower_scale_noshape'
353+ write(*,*)NN,i,di(i),di(i-1)
354+ stop
355+ endif
356 endif
357 enddo
358 if(iSH.eq.1)shower_S_scale(iFKS)=di(NN)
359
360=== modified file 'Template/NLO/SubProcesses/genps_fks.f'
361--- Template/NLO/SubProcesses/genps_fks.f 2017-06-16 08:20:04 +0000
362+++ Template/NLO/SubProcesses/genps_fks.f 2019-06-27 13:48:48 +0000
363@@ -1512,6 +1512,7 @@
364 xp(3,2)=-xp(0,2)
365 c
366 xp(0,i_fks)=E_i_fks*(chy_lbst-shy_lbst*yijdir)
367+ p_i_fks(0)=p_i_fks(0)*(chy_lbst-shy_lbst*yijdir)
368 xpifksred(1)=sinth_i_fks*cosphi_i_fks
369 xpifksred(2)=sinth_i_fks*sinphi_i_fks
370 xpifksred(3)=chy_lbst*yijdir-shy_lbst
371
372=== modified file 'Template/NLO/SubProcesses/handling_lhe_events.f'
373--- Template/NLO/SubProcesses/handling_lhe_events.f 2017-06-15 19:31:40 +0000
374+++ Template/NLO/SubProcesses/handling_lhe_events.f 2019-06-27 13:48:48 +0000
375@@ -602,7 +602,7 @@
376 endif
377 write(ifile,'(a)')
378 # ' </init>'
379- 501 format(2(1x,i6),2(1x,e14.8),2(1x,i2),2(1x,i6),1x,i2,1x,i3)
380+ 501 format(2(1x,i6),2(1x,e14.8),2(1x,i2),2(1x,i8),1x,i2,1x,i3)
381 502 format(3(1x,e14.8),1x,i6)
382 c
383 return
384
385=== modified file 'Template/NLO/SubProcesses/write_event.f'
386--- Template/NLO/SubProcesses/write_event.f 2017-07-26 11:45:39 +0000
387+++ Template/NLO/SubProcesses/write_event.f 2019-06-27 13:48:48 +0000
388@@ -149,7 +149,7 @@
389 write(lunlhe,502)XSECUP(1),XERRUP(1),XMAXUP(1),LPRUP(1)
390 write(lunlhe,'(a)')' </init>'
391 250 format(1x,i8)
392- 501 format(2(1x,i6),2(1x,d14.8),2(1x,i2),2(1x,i6),1x,i2,1x,i3)
393+ 501 format(2(1x,i6),2(1x,d14.8),2(1x,i2),2(1x,i8),1x,i2,1x,i3)
394 502 format(3(1x,d14.8),1x,i6)
395
396 return
397
398=== modified file 'Template/loop_material/StandAlone/SubProcesses/makefile'
399--- Template/loop_material/StandAlone/SubProcesses/makefile 2017-09-01 09:45:48 +0000
400+++ Template/loop_material/StandAlone/SubProcesses/makefile 2019-06-27 13:48:48 +0000
401@@ -119,11 +119,11 @@
402 endif
403 matrix$(MENUM)py.so: ../$(OLP)_static f2py_wrapper.f
404 touch __init__.py
405- $(F2PY) $(MADLOOP_LIB) -m matrix$(MENUM)py -c f2py_wrapper.f --fcompiler=$(FC) -L../../lib/ -ldhelas -lmodel $(LINK_LOOP_LIBS) $(STDLIB)
406+ $(F2PY) $(MADLOOP_LIB) -m matrix$(MENUM)py -c f2py_wrapper.f --f77exec=$(FC) -L../../lib/ -ldhelas -lmodel $(LINK_LOOP_LIBS) $(STDLIB)
407
408 allmatrix$(MENUM)py.so: $(OLP)_static all_matrix.f $(LIBS) $(WRAPPER)
409 touch __init__.py
410- $(F2PY) $(MADLOOP_LIB) -m allmatrix$(MENUM)py -c all_matrix.f $(wildcard $(LOOP_PREFIX)*/f2py_wrapper.f) --fcompiler=$(FC) -L../lib/ -ldhelas -lmodel $(LINK_LOOP_LIBS) $(STDLIB)
411+ $(F2PY) $(MADLOOP_LIB) -m allmatrix$(MENUM)py -c all_matrix.f $(wildcard $(LOOP_PREFIX)*/f2py_wrapper.f) --f77exec=$(FC) -L../lib/ -ldhelas -lmodel $(LINK_LOOP_LIBS) $(STDLIB)
412
413 clean:
414 @rm -f *.o *.so *.$(libext) *.$(dylibext)
415
416=== modified file 'UpdateNotes.txt'
417--- UpdateNotes.txt 2019-02-03 21:25:06 +0000
418+++ UpdateNotes.txt 2019-06-27 13:48:48 +0000
419@@ -1,5 +1,21 @@
420 Update notes for MadGraph5_aMC@NLO (in reverse time order)
421
422+2.6.6(27/07/19)
423+ OM: Bug in the edition of the shower_card. The set command of logical parameter was never setting the
424+ parameter to False. (Thanks to Richard Ruiz)
425+ RF: Fixed a bug in the creation of the energy-stripped i_FKS momentum. Tested for several processes,
426+ and seems to have been completely harmless.
427+ OM: Forbidding the use of CKKW/default scale for some UFO model allowing gluon emission from quark with
428+ no dependence in aS
429+ OM: Add an option "keep_ordering" for reweighting feature to allow to sometimes use decay chain even if
430+ you have ambiguity between final state particles.
431+ OM: Fixed an issue with interference which sometimes happens when some polarization contribution were negative but not all of them.
432+ VH: Change in the pythia8 output mode (thanks to Peter Skands)
433+ OM: Any number in the cards (not only integer) can use multiplication, division and k/M suffix for times 1000 and 1 million respectively
434+ OM: Energy cut (at LO) are now hidden by default for LHC type of run but visible for lepton collider ones.
435+ OM: Same for beam polarization
436+
437+
438 2.6.5 (03/02/19)
439 OM: Fix some speed issue with the generated gridpack --speed issue introduced in 2.6.1--
440 OM: Fix a bug in the computation of systematics when running with Python 2.6.
441@@ -12,6 +28,7 @@
442 OM: Fix issue for BSM model with additional colored particle where the default dynamical scale choice
443 was crashing
444
445+
446 2.6.4 (09/11/18)
447 OM: add specific treatement for small width (at LO only and not for loop-induced)
448 if the width is smaller than 1e-6 times the mass, a fake width (at that value) is used for the
449
450=== modified file 'VERSION'
451--- VERSION 2019-02-03 21:25:06 +0000
452+++ VERSION 2019-06-27 13:48:48 +0000
453@@ -1,4 +1,4 @@
454-version = 2.6.5
455+version = 2.6.6.1
456 date = 2018-02-03
457
458
459
460=== modified file 'bin/mg5_aMC'
461--- bin/mg5_aMC 2018-11-28 22:24:56 +0000
462+++ bin/mg5_aMC 2019-06-27 13:48:48 +0000
463@@ -127,6 +127,13 @@
464 if __debug__ and time.time() - start > 0.5:
465 print( 'WARNING: loading of madgraph too slow!!!', time.time() - start)
466
467+try:
468+ import madgraph.various.misc as misc
469+ misc.EasterEgg('loading')
470+except:
471+ pass
472+
473+
474 if options.plugin:
475 if not os.path.exists(os.path.join(root_path, 'PLUGIN', options.plugin)):
476 print( "ERROR: %s is not present in the PLUGIN directory. Please install it first")
477
478=== modified file 'madgraph/core/base_objects.py'
479--- madgraph/core/base_objects.py 2018-12-03 22:10:49 +0000
480+++ madgraph/core/base_objects.py 2019-06-27 13:48:48 +0000
481@@ -1044,6 +1044,8 @@
482 self['version_tag'] = None # position of the directory (for security)
483 self['gauge'] = [0, 1]
484 self['case_sensitive'] = True
485+ self['allow_pickle'] = True
486+ self['limitations'] = [] # MLM means that the model can sometimes have issue with MLM/default scale.
487 # attribute which might be define if needed
488 #self['name2pdg'] = {'name': pdg}
489
490
491=== modified file 'madgraph/core/diagram_generation.py'
492--- madgraph/core/diagram_generation.py 2018-12-03 22:10:49 +0000
493+++ madgraph/core/diagram_generation.py 2019-06-27 13:48:48 +0000
494@@ -1334,7 +1334,7 @@
495 def __init__(self, argument = None, collect_mirror_procs = False,
496 ignore_six_quark_processes = False, loop_filter=None, diagram_filter=False):
497 """Allow initialization with Process and with ProcessDefinition"""
498-
499+
500 if isinstance(argument, base_objects.Process):
501 super(DecayChainAmplitude, self).__init__()
502 from madgraph.loop.loop_diagram_generation import LoopMultiProcess
503@@ -1373,7 +1373,8 @@
504 " incoming particle"
505 self['decay_chains'].append(\
506 DecayChainAmplitude(process, collect_mirror_procs,
507- ignore_six_quark_processes))
508+ ignore_six_quark_processes,
509+ diagram_filter=diagram_filter))
510
511 # Flag decaying legs in the core diagrams by onshell = True
512 decay_ids = sum([[a.get('process').get('legs')[0].get('id') \
513@@ -1782,7 +1783,7 @@
514 if not process.get('required_s_channels') and \
515 not process.get('forbidden_onsh_s_channels') and \
516 not process.get('forbidden_s_channels') and \
517- not process.get('is_decay_chain'):
518+ not process.get('is_decay_chain') and not diagram_filter:
519 try:
520 crossed_index = success_procs.index(sorted_legs)
521 # The relabeling of legs for loop amplitudes is cumbersome
522
523=== modified file 'madgraph/core/drawing.py'
524--- madgraph/core/drawing.py 2016-08-29 15:09:16 +0000
525+++ madgraph/core/drawing.py 2019-06-27 13:48:48 +0000
526@@ -1663,7 +1663,7 @@
527 # Set variable for storing text
528 self.text = ''
529 # Do we have to write a file? -> store in self.file
530- if file:
531+ if filename:
532 self.file = True # Note that this variable will be overwritten. THis
533 #will be the object file. [initialize]
534 else:
535
536=== modified file 'madgraph/core/helas_objects.py'
537--- madgraph/core/helas_objects.py 2018-10-26 08:20:43 +0000
538+++ madgraph/core/helas_objects.py 2019-06-27 13:48:48 +0000
539@@ -458,7 +458,7 @@
540 'loop_orders':vertex.get('loop_orders')}
541 else:
542 # Not that it is going to be used here, but it might be eventually
543- inter = model.get_interaction(vertex.get('id'))
544+ #inter = model.get_interaction(vertex.get('id'))
545 loop_info = {}
546
547 if last_vertex:
548@@ -4888,7 +4888,7 @@
549
550 return output
551
552- def get_used_couplings(self):
553+ def get_used_couplings(self, output=str):
554 """Return a list with all couplings used by this
555 HelasMatrixElement."""
556
557@@ -4896,7 +4896,10 @@
558 self.get_all_wavefunctions() + self.get_all_amplitudes() \
559 if wa.get('interaction_id') not in [0,-1]]
560 #some coupling have a minus one associated -> need to remove those
561- return [ [t] if not t.startswith('-') else [t[1:]] for t2 in tmp for t in t2]
562+ if output == str:
563+ return [ [t] if not t.startswith('-') else [t[1:]] for t2 in tmp for t in t2]
564+ elif output=="set":
565+ return set(sum([ [t] if not t.startswith('-') else [t[1:]] for t2 in tmp for t in t2],[]))
566
567
568 def get_mirror_processes(self):
569
570=== modified file 'madgraph/fks/fks_common.py'
571--- madgraph/fks/fks_common.py 2019-02-03 21:24:20 +0000
572+++ madgraph/fks/fks_common.py 2019-06-27 13:48:48 +0000
573@@ -454,12 +454,26 @@
574 for i, ii in model.get('interaction_dict').items():
575 # i want interections of pert_order: 1 (from LO to NLO),
576 # without any other orders
577+ # and of "base" type
578+ if ii.get('type') != 'base': continue
579+
580 if ii.get('orders') == {pert_order:1} and len(ii['particles']) == 3 :
581 masslist = [p.get('mass').lower() for p in ii['particles']]
582- # check that there is at least a massless particle, and that the
583- # remaining ones have the same mass
584- # (otherwise the real emission final state will not be degenerate
585- # with the born one
586+
587+ # require that at least one particle be soft and of even spin for the interaction to be IR singular
588+ found_soft_even_spin_particle = False
589+ for p in ii['particles']:
590+ if p.get('mass').lower()=='zero':
591+ if p.get('spin')%2==1:
592+ found_soft_even_spin_particle = True
593+ break
594+ if not found_soft_even_spin_particle:
595+ continue
596+
597+ # check that there is at least a massless particle, and that the
598+ # remaining ones have the same mass
599+ # (otherwise the real emission final state will not be degenerate
600+ # with the born one
601 try:
602 masslist.remove('zero')
603 except ValueError:
604
605=== modified file 'madgraph/fks/fks_helas_objects.py'
606--- madgraph/fks/fks_helas_objects.py 2017-06-16 12:58:46 +0000
607+++ madgraph/fks/fks_helas_objects.py 2019-06-27 13:48:48 +0000
608@@ -847,6 +847,19 @@
609 def __eq__(self, other):
610 """Equality operator:
611 compare two FKSHelasRealProcesses by comparing their dictionaries"""
612+
613+ if self.__dict__ == other.__dict__:
614+ return True
615+ else:
616+# failed = []
617+# for key in self.__dict__:
618+# if self.__dict__[key] != other.__dict__[key]:
619+# failed.append(key)
620+# import madgraph.various.misc as misc
621+
622+ return False
623+
624+
625 return self.__dict__ == other.__dict__
626
627 def __ne__(self, other):
628
629=== modified file 'madgraph/interface/common_run_interface.py'
630--- madgraph/interface/common_run_interface.py 2019-01-16 11:18:08 +0000
631+++ madgraph/interface/common_run_interface.py 2019-06-27 13:48:48 +0000
632@@ -2267,8 +2267,6 @@
633 """Require MG5 directory: Compute automatically the widths of a set
634 of particles"""
635
636-
637-
638 args = self.split_arg(line)
639 opts = self.check_compute_widths(args)
640
641@@ -2287,9 +2285,14 @@
642 (' '.join([str(i) for i in opts['particles']]),
643 ' '.join('--%s=%s' % (key,value) for (key,value) in opts.items()
644 if key not in ['model', 'force', 'particles'] and value))
645- cmd.exec_cmd(line, model=opts['model'])
646+ out = cmd.exec_cmd(line, model=opts['model'])
647+
648+
649 self.child = None
650 del cmd
651+ return out
652+
653+
654
655 ############################################################################
656 def do_print_results(self, line):
657@@ -3316,7 +3319,11 @@
658 logger.warning('Missing mass in the lhef file (%s) . Please fix this (use the "update missing" command if needed)', param.lhacode[0])
659 continue
660 if mass and abs(width/mass) < 1e-12:
661- logger.error('The width of particle %s is too small for an s-channel resonance (%s). If you have this particle in an s-channel, this is likely to create numerical instabilities .', param.lhacode[0], width)
662+ if hasattr(interface, 'run_card') and isinstance(interface.run_card, banner_mod.RunCardLO):
663+ if interface.run_card['small_width_treatment'] < 1e-12:
664+ logger.error('The width of particle %s is too small for an s-channel resonance (%s) and the small_width_paramer is too small to prevent numerical issues. If you have this particle in an s-channel, this is likely to create numerical instabilities .', param.lhacode[0], width)
665+ else:
666+ logger.error('The width of particle %s is too small for an s-channel resonance (%s). If you have this particle in an s-channel, this is likely to create numerical instabilities .', param.lhacode[0], width)
667 if CommonRunCmd.sleep_for_error:
668 time.sleep(5)
669 CommonRunCmd.sleep_for_error = False
670@@ -3677,7 +3684,7 @@
671 madspin_cmd.mg5cmd.options.update(self.options)
672 for key, value in self.options.items():
673 if isinstance(value, str):
674- madspin_cmd.mg5cmd.exec_cmd( 'set %s %s' %(key,value), errorhandling=False, printcmd=False, precmd=False, postcmd=True)
675+ madspin_cmd.mg5cmd.exec_cmd( 'set %s %s --no_save' %(key,value), errorhandling=False, printcmd=False, precmd=False, postcmd=True)
676 madspin_cmd.cluster = self.cluster
677
678 madspin_cmd.update_status = lambda *x,**opt: self.update_status(*x, level='madspin',**opt)
679@@ -4481,10 +4488,23 @@
680 if from_banner is None:
681 self.from_banner = {}
682 return
683- misc.sprint(from_banner)
684+
685 self.from_banner = {}
686- for card in from_banner:
687- self.from_banner[card] = banner.charge_card(card)
688+ try:
689+ for card in from_banner:
690+ self.from_banner[card] = banner.charge_card(card)
691+ except KeyError:
692+ if from_banner == ['param', 'run'] and banner.keys() == ['mgversion']:
693+ if self.mother_interface:
694+ results = self.mother_interface.results
695+ run_name = self.mother_interface.run_name
696+ run_tag = self.mother_interface.run_tag
697+ banner = banner_mod.recover_banner(results, 'parton', run_name, run_tag)
698+ self.mother_interface.banner = banner
699+ return self.init_from_banner(from_banner, banner)
700+ else:
701+ raise
702+
703 return self.from_banner
704
705
706@@ -5413,7 +5433,7 @@
707 val = ' '.join(args[start+1:])
708 val = val.split('#')[0]
709 else:
710- val = args[start+1]
711+ val = ' '.join(args[start+1:])
712 self.setR(args[start], val)
713 self.modified_card.add('run') # delayed writing of the run_card
714 # special mode for set run_card nocut T (generated by set no_parton_cut
715@@ -5585,7 +5605,7 @@
716 else:
717 args_str = ' '.join(str(a) for a in args[start+1:len(args)])
718 self.shower_card.set_param(args[start],args_str,self.paths['shower'])
719-
720+
721 # MadLoop Parameter ---------------------------------------------------
722 elif self.has_ml and args[start] in self.ml_vars \
723 and card in ['', 'MadLoop_card']:
724@@ -5768,22 +5788,53 @@
725
726 if mass:
727 if abs(width/mass) < self.run_card['small_width_treatment']:
728- logger.warning("Particle %s will use a fake width ( %s instead of %s ).\n" +
729- "Cross-section will be rescaled according to NWA if needed." +
730- "To force exact treatment reduce the value of 'small_width_treatment' parameter of the run_card",
731- param.lhacode[0], abs(mass*self.run_card['small_width_treatment']), width)
732+ logger.warning("Particle %s with small width detected (%s): See https://answers.launchpad.net/mg5amcnlo/+faq/3053 to learn the special handling of that case",
733+ param.lhacode[0], width)
734 elif abs(width/mass) < 1e-12:
735 logger.error('The width of particle %s is too small for an s-channel resonance (%s). If you have this particle in an s-channel, this is likely to create numerical instabilities .', param.lhacode[0], width)
736 if CommonRunCmd.sleep_for_error:
737 time.sleep(5)
738 CommonRunCmd.sleep_for_error = False
739-
740+
741+ # @LO if PY6 shower => event_norm on sum
742+ if 'pythia_card.dat' in self.cards and 'run' in self.allow_arg:
743+ if self.run_card['event_norm'] != 'sum':
744+ logger.info('Pythia6 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' )
745+ self.do_set('run_card event_norm sum')
746+ # @LO if PY6 shower => event_norm on sum
747+ elif 'pythia8_card.dat' in self.cards:
748+ if self.run_card['event_norm'] == 'sum':
749+ logger.info('Pythia8 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' )
750+ self.do_set('run_card event_norm average')
751+
752+ if 'MLM' in proc_charac['limitations']:
753+ if self.run_card['dynamical_scale_choice'] == -1:
754+ raise InvalidCmd, "Your model is identified as not fully supported within MG5aMC.\n" +\
755+ "As your process seems to be impacted by the issue,\n"+\
756+ "You can NOT run with CKKW dynamical scale for this model. Please choose another one."
757+ if self.run_card['ickkw']:
758+ raise InvalidCmd, "Your model is identified as not fully supported within MG5aMC.\n" +\
759+ "As your process seems to be impacted by the issue,\n" +\
760+ "You can NOT run with MLM matching/merging. Please check if merging outside MG5aMC are suitable or refrain to use merging with this model"
761+
762
763 ########################################################################
764 # NLO specific check
765 ########################################################################
766 # For NLO run forbid any pdg specific cut on massless particle
767 if isinstance(self.run_card,banner_mod.RunCardNLO):
768+
769+ try:
770+ proc_charac = self.mother_interface.proc_characteristics
771+ except:
772+ proc_charac = None
773+
774+ if proc_charac and 'MLM' in proc_charac['limitations']:
775+ if self.run_card['ickkw']:
776+ raise Exception, "Your model is identified as not fully supported within MG5aMC.\n" +\
777+ "You can NOT run with FxFx/UnLOPS matching/merging. Please check if merging outside MG5aMC are suitable or refrain to use merging with this model"
778+
779+
780 for pdg in set(self.run_card['pt_min_pdg'].keys()+self.run_card['pt_max_pdg'].keys()+
781 self.run_card['mxx_min_pdg'].keys()):
782
783@@ -5792,9 +5843,8 @@
784 if self.param_card.get_value('mass', int(pdg), default=0) ==0:
785 raise Exception, "For NLO runs, you can use PDG specific cuts only for massive particles: (failed for %s)" % pdg
786
787- # if NLO reweighting is ON: ensure that we keep the rwgt information
788- if 'reweight' in self.allow_arg and 'run' in self.allow_arg and \
789- isinstance(self.run_card,banner_mod.RunCardNLO) and \
790+ # if NLO reweighting is ON: ensure that we keep the rwgt information
791+ if 'reweight' in self.allow_arg and 'run' in self.allow_arg and \
792 not self.run_card['store_rwgt_info']:
793 #check if a NLO reweighting is required
794 re_pattern = re.compile(r'''^\s*change\s*mode\s* (LO\+NLO|LO|NLO|NLO_tree)\s*(?:#|$)''', re.M+re.I)
795@@ -5804,25 +5854,15 @@
796 logger.info('NLO reweighting is on ON. Automatically set store_rwgt_info to True', '$MG:BOLD' )
797 self.do_set('run_card store_rwgt_info True')
798
799- # if external computation for the systematics are asked then switch
800- #automatically the book-keeping of the weight for NLO
801- if 'run' in self.allow_arg and \
802- self.run_card['systematics_program'] == 'systematics' and \
803- isinstance(self.run_card,banner_mod.RunCardNLO) and \
804- not self.run_card['store_rwgt_info']:
805- logger.warning('To be able to run systematics program, we set store_rwgt_info to True')
806- self.do_set('run_card store_rwgt_info True')
807+ # if external computation for the systematics are asked then switch
808+ #automatically the book-keeping of the weight for NLO
809+ if 'run' in self.allow_arg and \
810+ self.run_card['systematics_program'] == 'systematics' and \
811+ not self.run_card['store_rwgt_info']:
812+ logger.warning('To be able to run systematics program, we set store_rwgt_info to True')
813+ self.do_set('run_card store_rwgt_info True')
814
815- # @LO if PY6 shower => event_norm on sum
816- if 'pythia_card.dat' in self.cards and 'run' in self.allow_arg:
817- if self.run_card['event_norm'] != 'sum':
818- logger.info('Pythia6 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' )
819- self.do_set('run_card event_norm sum')
820- # @LO if PY6 shower => event_norm on sum
821- elif 'pythia8_card.dat' in self.cards:
822- if self.run_card['event_norm'] == 'sum':
823- logger.info('Pythia8 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' )
824- self.do_set('run_card event_norm average')
825+
826
827 # Check the extralibs flag.
828 if self.has_shower and isinstance(self.run_card, banner_mod.RunCardNLO):
829@@ -5961,7 +6001,7 @@
830 elif pattern_width.search(param_text):
831 self.do_compute_widths('')
832 self.param_card = param_card_mod.ParamCard(self.paths['param'])
833-
834+
835 # calling the routine doing the work
836 self.update_dependent(self.mother_interface, self.me_dir, self.param_card,
837 self.paths['param'], timer)
838@@ -6011,7 +6051,7 @@
839 if name in self.modified_card:
840 self.modified_card.remove(name)
841 else:
842- raise Exception, "Need to add the associate writter proxy"
843+ raise Exception, "Need to add the associate writter proxy for %s" % name
844
845 def write_card_run(self):
846 """ write the run_card """
847@@ -6329,9 +6369,29 @@
848 line += ' --nlo'
849
850 try:
851- return self.mother_interface.do_compute_widths(line)
852+ out = self.mother_interface.do_compute_widths(line)
853 except InvalidCmd, error:
854 logger.error("Invalid command: %s " % error)
855+ else:
856+ if hasattr(self, 'run_card'):
857+ for pid, info in out.items():
858+ total = 0
859+ for key, partial in info:
860+ total += partial
861+ mass = self.param_card.get_value('mass', pid)
862+ try:
863+ small_width_treatment = self.run_card['small_width_treatment']
864+ except Exception: #NLO
865+ small_width_treatment = 0
866+
867+ if total and total/mass < small_width_treatment:
868+ text = "Particle %s with very small width (%g): Learn about special handling here: https://answers.launchpad.net/mg5amcnlo/+faq/3053"
869+ logger.warning(text,pid,total)
870+ elif total and total/mass < 1e-11:
871+ text = "Particle %s with very small width (%g): Numerical inaccuracies can occur if that particle is in a s-channel"
872+ logger.critical(text,pid,total)
873+
874+
875
876 def help_compute_widths(self):
877 signal.alarm(0) # avoid timer if any
878
879=== modified file 'madgraph/interface/extended_cmd.py'
880--- madgraph/interface/extended_cmd.py 2018-11-28 22:12:28 +0000
881+++ madgraph/interface/extended_cmd.py 2019-06-27 13:48:48 +0000
882@@ -2332,11 +2332,11 @@
883 elif line and hasattr(self, 'do_%s' % line.split()[0]):
884 # go to retry
885 reprint_opt = True
886- elif self.value == 'repeat':
887+ elif self.value in ['repeat', 'reask']:
888 reprint_opt = True
889 else:
890 raise Exception
891- except Exception, error:
892+ except Exception, error:
893 print """not valid argument. Valid argument are file path or value in (%s).""" \
894 % ','.join(self.allow_arg)
895 print 'please retry'
896@@ -2421,6 +2421,7 @@
897 allowed_args += ['%s=%s;' % (key,s) for s in self.get_allowed(key)]
898 # adding special mode
899 allowed_args += [key[4:]+';' for key in dir(self) if key.startswith('ans_')]
900+ allowed_args += [arg[:-1] for arg in allowed_args if arg[-1] == ';']
901 if 'allow_arg' in opts:
902 allowed_args += opts['allow_arg']
903 del opts['allow_arg']
904
905=== modified file 'madgraph/interface/madevent_interface.py'
906--- madgraph/interface/madevent_interface.py 2019-01-24 13:43:19 +0000
907+++ madgraph/interface/madevent_interface.py 2019-06-27 13:48:48 +0000
908@@ -2557,7 +2557,11 @@
909
910
911 self.create_plot('parton')
912- self.exec_cmd('store_events', postcmd=False)
913+ self.exec_cmd('store_events', postcmd=False)
914+ if self.run_card['boost_event'].strip() and self.run_card['boost_event'] != 'False':
915+ self.boost_events()
916+
917+
918 self.exec_cmd('reweight -from_cards', postcmd=False)
919 self.exec_cmd('decay_events -from_cards', postcmd=False)
920 if self.run_card['time_of_flight']>=0:
921@@ -2580,6 +2584,49 @@
922 self.results.current['cross'],
923 self.results.current['error']))
924
925+ def boost_events(self):
926+
927+ if not self.run_card['boost_event']:
928+ return
929+
930+ if self.run_card['boost_event'].startswith('lambda'):
931+ if not isinstance(self, cmd.CmdShell):
932+ raise Exception, "boost not allowed online"
933+ filter = eval(self.run_card['boost_event'])
934+ else:
935+ raise Exception
936+
937+ path = [pjoin(self.me_dir, 'Events', self.run_name, 'unweighted_events.lhe.gz'),
938+ pjoin(self.me_dir, 'Events', self.run_name, 'unweighted_events.lhe'),
939+ pjoin(self.me_dir, 'Events', self.run_name, 'events.lhe.gz'),
940+ pjoin(self.me_dir, 'Events', self.run_name, 'events.lhe')]
941+
942+ for p in path:
943+ if os.path.exists(p):
944+ event_path = p
945+ break
946+ else:
947+ raise Exception, "fail to find event file for the boost"
948+
949+
950+ lhe = lhe_parser.EventFile(event_path)
951+ with misc.TMP_directory() as tmp_dir:
952+ output = lhe_parser.EventFile(pjoin(tmp_dir, os.path.basename(event_path)), 'w')
953+ #write the banner to the output file
954+ output.write(lhe.banner)
955+ # Loop over all events
956+ for event in lhe:
957+ event.boost(filter)
958+ #write this modify event
959+ output.write(str(event))
960+ output.write('</LesHouchesEvent>\n')
961+ lhe.close()
962+ files.mv(pjoin(tmp_dir, os.path.basename(event_path)), event_path)
963+
964+
965+
966+
967+
968 def do_initMadLoop(self,line):
969 """Compile and run MadLoop for a certain number of PS point so as to
970 initialize MadLoop (setup the zero helicity and loop filter.)"""
971@@ -3356,8 +3403,7 @@
972 #fsock.close()
973
974 # Compile
975- for name in ['../bin/internal/gen_ximprove', 'all',
976- '../bin/internal/combine_events']:
977+ for name in ['../bin/internal/gen_ximprove', 'all']:
978 self.compile(arg=[name], cwd=os.path.join(self.me_dir, 'Source'))
979
980
981@@ -3516,11 +3562,9 @@
982 args = self.split_arg(line)
983 # Check argument's validity
984 self.check_combine_events(args)
985-
986 self.update_status('Combining Events', level='parton')
987
988
989-
990 if self.run_card['gridpack'] and isinstance(self, GridPackCmd):
991 return GridPackCmd.do_combine_events(self, line)
992
993@@ -3546,7 +3590,9 @@
994
995 partials = 0 # if too many file make some partial unweighting
996 sum_xsec, sum_xerru, sum_axsec = 0,[],0
997- for Gdir in self.get_Gdir():
998+ Gdirs = self.get_Gdir()
999+ Gdirs.sort()
1000+ for Gdir in Gdirs:
1001 if os.path.exists(pjoin(Gdir, 'events.lhe')):
1002 result = sum_html.OneResult('')
1003 result.read_results(pjoin(Gdir, 'results.dat'))
1004@@ -3555,7 +3601,6 @@
1005 result.get('xerru'),
1006 result.get('axsec')
1007 )
1008-
1009 sum_xsec += result.get('xsec')
1010 sum_xerru.append(result.get('xerru'))
1011 sum_axsec += result.get('axsec')
1012@@ -3580,7 +3625,6 @@
1013 get_wgt, trunc_error=1e-2, event_target=self.run_card['nevents'],
1014 log_level=logging.DEBUG, normalization=self.run_card['event_norm'],
1015 proc_charac=self.proc_characteristic)
1016-
1017 if partials:
1018 for i in range(partials):
1019 try:
1020@@ -5587,7 +5631,6 @@
1021 elif self.run_card['python_seed'] >= 0:
1022 import random
1023 random.seed(self.run_card['python_seed'])
1024-
1025 if self.run_card['ickkw'] == 2:
1026 logger.info('Running with CKKW matching')
1027 self.treat_ckkw_matching()
1028@@ -5603,7 +5646,7 @@
1029 logger.info("compile Source Directory")
1030
1031 # Compile
1032- for name in [ 'all', '../bin/internal/combine_events']:
1033+ for name in [ 'all']:#, '../bin/internal/combine_events']:
1034 self.compile(arg=[name], cwd=os.path.join(self.me_dir, 'Source'))
1035
1036 bias_name = os.path.basename(self.run_card['bias_module'])
1037@@ -6193,7 +6236,7 @@
1038
1039 if not banner:
1040 banner = self.banner
1041-
1042+
1043 if auto:
1044 self.ask_edit_cards(cards, from_banner=['param', 'run'],
1045 mode='auto', plot=(pythia_version==6), banner=banner
1046@@ -6570,7 +6613,9 @@
1047
1048 partials = 0 # if too many file make some partial unweighting
1049 sum_xsec, sum_xerru, sum_axsec = 0,[],0
1050- for Gdir in self.get_Gdir():
1051+ Gdirs = self.get_Gdir()
1052+ Gdirs.sort()
1053+ for Gdir in Gdirs:
1054 #mfactor already taken into accoun in auto_dsig.f
1055 if os.path.exists(pjoin(Gdir, 'events.lhe')):
1056 result = sum_html.OneResult('')
1057@@ -6598,7 +6643,8 @@
1058
1059 if not hasattr(self,'proc_characteristic'):
1060 self.proc_characteristic = self.get_characteristics()
1061-
1062+
1063+ self.banner.add_generation_info(sum_xsec, self.nb_event)
1064 nb_event = AllEvent.unweight(pjoin(outdir, self.run_name, "unweighted_events.lhe.gz"),
1065 get_wgt, trunc_error=1e-2, event_target=self.nb_event,
1066 log_level=logging.DEBUG, normalization=self.run_card['event_norm'],
1067@@ -6613,75 +6659,10 @@
1068 os.remove(pjoin(outdir, self.run_name, "partials%s.lhe" % i))
1069
1070 self.results.add_detail('nb_event', nb_event)
1071-
1072+ self.banner.add_generation_info(sum_xsec, nb_event)
1073 if self.run_card['bias_module'].lower() not in ['dummy', 'none']:
1074 self.correct_bias()
1075
1076- def do_combine_events_v4(self, line):
1077- """Advanced commands: Launch combine events"""
1078-
1079- args = self.split_arg(line)
1080-
1081- # Check argument's validity
1082- self.check_combine_events(args)
1083-
1084- self.update_status('Combining Events', level='parton')
1085-
1086- try:
1087- os.remove(pjoin(self.me_dir,'SubProcesses', 'combine.log'))
1088- except Exception:
1089- pass
1090-
1091- if not self.readonly:
1092- run_dir = pjoin(self.me_dir,'SubProcesses')
1093- stdout_file = pjoin(self.me_dir,'SubProcesses', 'combine.log')
1094- else:
1095- run_dir = pjoin('SubProcesses')
1096- stdout_file = pjoin('SubProcesses', 'combine.log')
1097-
1098- cluster.onecore.launch_and_wait('../bin/internal/run_combine',
1099- args=[self.run_name],
1100- cwd=run_dir,
1101- stdout=stdout_file,
1102- required_output=[pjoin(self.me_dir,'SubProcesses', 'combine.log')])
1103-
1104- output = misc.mult_try_open(stdout_file).read()
1105- # Store the number of unweighted events for the results object
1106- pat = re.compile(r'''\s*Unweighting\s*selected\s*(\d+)\s*events''')
1107- try:
1108- nb_event = pat.search(output).groups()[0]
1109- except AttributeError:
1110- time.sleep(10)
1111- output = misc.mult_try_open(pjoin(self.me_dir,'SubProcesses','combine.log')).read()
1112- try:
1113- nb_event = pat.search(output).groups()[0]
1114- except AttributeError:
1115- logger.warning('Fail to read the number of unweighted events in the combine.log file')
1116- nb_event = 0
1117- self.results.add_detail('nb_event', nb_event)
1118-
1119- # Define The Banner
1120- tag = self.run_card['run_tag']
1121-
1122- # Update the banner with the pythia card
1123- if not self.banner:
1124- self.banner = banner_mod.recover_banner(self.results, 'parton')
1125- self.banner.load_basic(self.me_dir)
1126- # Add cross-section/event information
1127- self.banner.add_generation_info(self.results.current['cross'], nb_event)
1128- if not hasattr(self, 'random_orig'): self.random_orig = 0
1129- self.banner.change_seed(self.random_orig)
1130- if not os.path.exists(pjoin(self.me_dir, 'Events', self.run_name)):
1131- os.mkdir(pjoin(self.me_dir, 'Events', self.run_name))
1132- self.banner.write(pjoin(self.me_dir, 'Events', self.run_name,
1133- '%s_%s_banner.txt' % (self.run_name, tag)))
1134-
1135-
1136- self.banner.add_to_file(pjoin(self.me_dir,'Events', 'events.lhe'),
1137- out=pjoin(self.me_dir,'Events', self.run_name, 'events.lhe'))
1138- self.banner.add_to_file(pjoin(self.me_dir,'Events', 'unweighted_events.lhe'),
1139- out=pjoin(self.me_dir,'Events', self.run_name, 'unweighted_events.lhe'))
1140-
1141
1142 class MadLoopInitializer(object):
1143 """ A container class for the various methods for initializing MadLoop. It is
1144
1145=== modified file 'madgraph/interface/madgraph_interface.py'
1146--- madgraph/interface/madgraph_interface.py 2019-02-03 21:24:20 +0000
1147+++ madgraph/interface/madgraph_interface.py 2019-06-27 13:48:48 +0000
1148@@ -1447,12 +1447,18 @@
1149 if not args[1].isdigit():
1150 raise self.InvalidCmd('%s values should be a integer' % args[0])
1151
1152+ if args[0] in ['low_mem_multicore_nlo_generation']:
1153+ if sys.version_info[0] == 2 and sys.version_info[1] == 6:
1154+ raise self.InvalidCmd('python2.6 does not support such functionalities please use python2.7')
1155+
1156+
1157 if args[0] in ['loop_optimized_output', 'loop_color_flows', 'low_mem_multicore_nlo_generation']:
1158 try:
1159 args[1] = banner_module.ConfigFile.format_variable(args[1], bool, args[0])
1160 except Exception:
1161 raise self.InvalidCmd('%s needs argument True or False'%args[0])
1162
1163+
1164 if args[0] in ['gauge']:
1165 if args[1] not in ['unitary','Feynman']:
1166 raise self.InvalidCmd('gauge needs argument unitary or Feynman.')
1167@@ -3081,6 +3087,14 @@
1168 " can only be given on one type of coupling and either on"+\
1169 " squared orders or amplitude orders, not both.")
1170
1171+ if myprocdef.get_ninitial() ==1 and myprocdef.get('squared_orders'):
1172+ logger.warning('''Computation of interference term with decay is not 100% validated.
1173+ Please check carefully your result.
1174+ One suggestion is also to compare the generation of your process with and without
1175+ set group_subprocesses True
1176+ (to write Before the generate command)
1177+ ''')
1178+
1179 cpu_time1 = time.time()
1180
1181 # Generate processes
1182@@ -4718,7 +4732,7 @@
1183 split_orders=list(set(perturbation_couplings_list+squared_orders.keys()))
1184 try:
1185 split_orders.sort(key=lambda elem: 0 if elem=='WEIGHTED' else
1186- self._curr_model['order_hierarchy']
1187+ self._curr_model.get('order_hierarchy')
1188 [elem if not elem.endswith('.sqrt') else elem[:-5]])
1189 except KeyError:
1190 raise self.InvalidCmd, "The loaded model does not defined a "+\
1191@@ -5825,8 +5839,8 @@
1192 'MadAnalysis':['arXiv:1206.1599'],
1193 'collier':['arXiv:1604.06792'],
1194 'oneloop':['arXiv:1007.4716'],
1195- 'maddm':['arXiv:1505.04190'],
1196- 'maddump':['arXiv:1806.xxxxx']}
1197+ 'maddm':['arXiv:1804.00444'],
1198+ 'maddump':['arXiv:1812.06771']}
1199
1200 install_server = ['http://madgraph.phys.ucl.ac.be/package_info.dat',
1201 'http://madgraph.physics.illinois.edu/package_info.dat']
1202@@ -7292,7 +7306,11 @@
1203 # We don't want to go through the MasterCommand again
1204 # because it messes with the interface switching when
1205 # importing a loop model from MG5
1206- MadGraphCmd.do_import(self,'model %s' %model_name, force=True)
1207+ if 'modelname' in self.history.get('full_model_line'):
1208+ opts = '--modelname'
1209+ else:
1210+ opts=''
1211+ MadGraphCmd.do_import(self,'model %s %s' % (model_name, opts), force=True)
1212 elif log:
1213 logger.info('Note that you have to reload the model')
1214
1215@@ -8132,7 +8150,7 @@
1216 madevent_interface.MadEventCmd.update_width_in_param_card(decay_info,
1217 opts['path'], opts['output'])
1218 if float(opts['body_decay']) == 2:
1219- return
1220+ return decay_info
1221 else:
1222 skip_2body = True
1223
1224@@ -8153,7 +8171,7 @@
1225
1226
1227
1228- return
1229+ return decay_info
1230
1231 # Do the MadEvent integration!!
1232 with misc.TMP_directory(dir=os.getcwd()) as path:
1233@@ -8161,6 +8179,15 @@
1234 logger_mg.info('More info in temporary files:\n %s/index.html' % (decay_dir))
1235 with misc.MuteLogger(['madgraph','ALOHA','cmdprint','madevent'], [40,40,40,40]):
1236 self.exec_cmd('output %s -f' % decay_dir,child=False)
1237+
1238+ #modify some parameter of the default run_card
1239+ run_card = banner_module.RunCard(pjoin(decay_dir,'Cards','run_card.dat'))
1240+ if run_card['ickkw']:
1241+ run_card['ickkw'] = 0
1242+ run_card['xqcut'] = 0
1243+ run_card.remove_all_cut()
1244+ run_card.write(pjoin(decay_dir,'Cards','run_card.dat'))
1245+
1246 # Need to write the correct param_card in the correct place !!!
1247 if os.path.exists(opts['output']):
1248 files.cp(opts['output'], pjoin(decay_dir, 'Cards', 'param_card.dat'))
1249@@ -8223,7 +8250,7 @@
1250
1251 if self._curr_model['name'] == 'mssm' or self._curr_model['name'].startswith('mssm-'):
1252 check_param_card.convert_to_slha1(opts['output'])
1253- return
1254+ return decay_info
1255
1256
1257
1258
1259=== modified file 'madgraph/interface/master_interface.py'
1260--- madgraph/interface/master_interface.py 2018-04-02 14:02:36 +0000
1261+++ madgraph/interface/master_interface.py 2019-06-27 13:48:48 +0000
1262@@ -47,7 +47,7 @@
1263 import madgraph.iolibs.files as files
1264 import madgraph.various.misc as misc
1265
1266-from madgraph import MG4DIR, MG5DIR, MadGraph5Error
1267+from madgraph import MG4DIR, MG5DIR, MadGraph5Error, InvalidCmd
1268
1269 logger = logging.getLogger('cmdprint') # -> stdout
1270
1271@@ -198,6 +198,10 @@
1272
1273 def do_add(self, line, *args, **opts):
1274
1275+ allow_switch = True
1276+ if self._curr_proc_defs:
1277+ allow_switch = False
1278+
1279 argss = cmd.Cmd.split_arg(line)
1280 if len(argss)>=1 and argss[0] in ['process','timing','profile']:
1281 proc_line = ' '.join(argss[1:])
1282@@ -207,17 +211,17 @@
1283 'The NLO mode %s is not valid. Please choose one among: %s' \
1284 % (nlo_mode, ' '.join(self._valid_nlo_modes)))
1285 elif nlo_mode in ['all', 'real', 'LOonly']:
1286- self.change_principal_cmd('aMC@NLO')
1287+ self.change_principal_cmd('aMC@NLO', allow_switch)
1288 elif nlo_mode in ['virt', 'sqrvirt']:
1289- self.change_principal_cmd('MadLoop')
1290+ self.change_principal_cmd('MadLoop', allow_switch)
1291 elif nlo_mode == 'noborn':
1292- self.change_principal_cmd('MadLoop')
1293+ self.change_principal_cmd('MadLoop', allow_switch)
1294 self.cmd.validate_model(self, loop_type=nlo_mode,
1295 coupling_type=orders)
1296- self.change_principal_cmd('MadGraph')
1297+ self.change_principal_cmd('MadGraph', allow_switch)
1298 return self.cmd.create_loop_induced(self, line, *args, **opts)
1299 else:
1300- self.change_principal_cmd('MadGraph')
1301+ self.change_principal_cmd('MadGraph', allow_switch)
1302 try:
1303 return self.cmd.do_add(self, line, *args, **opts)
1304 except fks_base.NoBornException:
1305@@ -225,7 +229,7 @@
1306 logger.info(" No Born diagrams found. Now switching to the loop-induced mode. ", '$MG:BOLD')
1307 logger.info(" Please cite ref. 'arXiv:1507.00020' when using results from this mode. ", '$MG:BOLD')
1308 logger.info("------------------------------------------------------------------------", '$MG:BOLD')
1309- self.change_principal_cmd('MadGraph')
1310+ self.change_principal_cmd('MadGraph',allow_switch)
1311 return self.cmd.create_loop_induced(self, line, *args, **opts)
1312
1313
1314@@ -608,9 +612,15 @@
1315 %args[0]+" Valid interfaces are %s"\
1316 %','.join(interface_quick_name.keys()))
1317
1318- def change_principal_cmd(self, name):
1319+ def change_principal_cmd(self, name, allow_switch=True):
1320+
1321
1322 old_cmd=self.current_interface
1323+ if old_cmd == name:
1324+ return
1325+ elif not allow_switch:
1326+ raise InvalidCmd, "Command not compatible with previous command: Can not combine LO/NLO feature."
1327+
1328 if name in self.interface_names.keys():
1329 self.prompt= self.interface_names[name][0]+'>'
1330 self.cmd= self.interface_names[name][1]
1331
1332=== modified file 'madgraph/interface/reweight_interface.py'
1333--- madgraph/interface/reweight_interface.py 2018-09-19 12:07:16 +0000
1334+++ madgraph/interface/reweight_interface.py 2019-06-27 13:48:48 +0000
1335@@ -108,7 +108,7 @@
1336 self.has_nlo = False
1337 self.rwgt_dir = None
1338 self.exitted = False # Flag to know if do_quit was already called.
1339-
1340+ self.keep_ordering = False
1341 if event_path:
1342 logger.info("Extracting the banner ...")
1343 self.do_import(event_path, allow_madspin=allow_madspin)
1344@@ -354,6 +354,8 @@
1345 if self.has_standalone_dir:
1346 self.terminate_fortran_executables()
1347 self.has_standalone_dir = False
1348+ elif args[0] == "keep_ordering":
1349+ self.keep_ordering = banner.ConfigFile.format_variable(args[1], bool, "keep_ordering")
1350 elif args[0] == "process":
1351 nb_f2py_module += 1
1352 if self.has_standalone_dir:
1353@@ -747,7 +749,6 @@
1354 if 'initrwgt' in self.banner and self.output_type == 'default':
1355 if 'name=\'mg_reweighting\'' in self.banner['initrwgt']:
1356 blockpat = re.compile(r'''<weightgroup name=\'mg_reweighting\'\s*weight_name_strategy=\'includeIdInWeightName\'>(?P<text>.*?)</weightgroup>''', re.I+re.M+re.S)
1357- misc.sprint(blockpat, self.banner['initrwgt'])
1358 before, content, after = blockpat.split(self.banner['initrwgt'])
1359 header_rwgt_other = before + after
1360 pattern = re.compile('<weight id=\'(?:rwgt_(?P<id>\d+)|(?P<id2>[_\w]+))(?P<rwgttype>\s*|_\w+)\'>(?P<info>.*?)</weight>', re.S+re.I+re.M)
1361@@ -1144,6 +1145,9 @@
1362 nb_retry, sleep = 5, 20
1363
1364 tag, order = event.get_tag_and_order()
1365+ if self.keep_ordering:
1366+ old_tag = tuple(tag)
1367+ tag = (tag[0], tuple(order[1]))
1368 if isinstance(hypp_id, str) and hypp_id.startswith('V'):
1369 tag = (tag,'V')
1370 hypp_id = int(hypp_id[1:])
1371@@ -1404,6 +1408,7 @@
1372 else:
1373 proc = proc.replace('[', '[ virt=')
1374 commandline += "add process %s ;" % proc
1375+ commandline = re.sub('@\s*\d+', '', commandline)
1376 # deactivate golem since it creates troubles
1377 old_options = dict(mgcmd.options)
1378 if mgcmd.options['golem'] or mgcmd.options['pjfry']:
1379@@ -1776,7 +1781,8 @@
1380 outgoing = pdg[2:]
1381 order = (list(incoming), list(outgoing))
1382 incoming.sort()
1383- outgoing.sort()
1384+ if not self.keep_ordering:
1385+ outgoing.sort()
1386 tag = (tuple(incoming), tuple(outgoing))
1387 if 'virt' in onedir:
1388 tag = (tag, 'V')
1389@@ -1797,10 +1803,12 @@
1390 misc.sprint(order, pdir,)
1391 raise Exception
1392 else:
1393+ misc.sprint(all_prefix[all_pdgs.index(pdg)])
1394+ misc.sprint(all_prefix[all_pdgs.index(oldpdg)])
1395 misc.sprint(tag, onedir)
1396 misc.sprint(data[tag][:-1])
1397 misc.sprint(order, pdir,)
1398- raise Exception
1399+ raise Exception, "two different matrix-element have the same initial/final state. Leading to an ambiguity. If your events are ALWAYS written in the correct-order (look at the numbering in the Feynman Diagram). Then you can add inside your reweight_card the line 'change keep_ordering True'."
1400
1401 data[tag] = order, pdir, hel
1402
1403
1404=== modified file 'madgraph/iolibs/export_v4.py'
1405--- madgraph/iolibs/export_v4.py 2018-12-22 20:33:20 +0000
1406+++ madgraph/iolibs/export_v4.py 2019-06-27 13:48:48 +0000
1407@@ -3840,7 +3840,12 @@
1408 # indicate that the output type is not grouped
1409 if not isinstance(self, ProcessExporterFortranMEGroup):
1410 self.proc_characteristic['grouped_matrix'] = False
1411+
1412 self.proc_characteristic['complex_mass_scheme'] = mg5options['complex_mass_scheme']
1413+
1414+ # set limitation linked to the model
1415+
1416+
1417 # indicate the PDG of all initial particle
1418 try:
1419 pdgs1 = [p.get_initial_pdg(1) for me in matrix_elements for m in me.get('matrix_elements') for p in m.get('processes') if p.get_initial_pdg(1)]
1420@@ -3971,6 +3976,22 @@
1421 # Set lowercase/uppercase Fortran code
1422 writers.FortranWriter.downcase = False
1423
1424+ # check if MLM/.../ is supported for this matrix-element and update associate flag
1425+ if self.model and 'MLM' in self.model["limitations"]:
1426+ if 'MLM' not in self.proc_characteristic["limitations"]:
1427+ used_couplings = matrix_element.get_used_couplings(output="set")
1428+ for vertex in self.model.get('interactions'):
1429+ particles = [p for p in vertex.get('particles')]
1430+ if 21 in [p.get('pdg_code') for p in particles]:
1431+ colors = [par.get('color') for par in particles]
1432+ if 1 in colors:
1433+ continue
1434+ elif 'QCD' not in vertex.get('orders'):
1435+ for bad_coup in vertex.get('couplings').values():
1436+ if bad_coup in used_couplings:
1437+ self.proc_characteristic["limitations"].append('MLM')
1438+ break
1439+
1440 # The proc prefix is not used for MadEvent output so it can safely be set
1441 # to an empty string.
1442 replace_dict = {'proc_prefix':''}
1443@@ -4103,7 +4124,7 @@
1444 replace_dict['ampsplitorders']='\n'.join(amp_so)
1445 replace_dict['sqsplitorders']='\n'.join(sqamp_so)
1446
1447-
1448+
1449 # Extract JAMP lines
1450 # If no split_orders then artificiall add one entry called 'ALL_ORDERS'
1451 jamp_lines = self.get_JAMP_lines_split_order(\
1452@@ -5120,6 +5141,16 @@
1453
1454 filename = 'symfact_orig.dat'
1455 self.write_symfact_file(open(filename, 'w'), symmetry)
1456+
1457+ # check consistency
1458+ for i, sym_fact in enumerate(symmetry):
1459+ if sym_fact > 0:
1460+ continue
1461+ if nqcd_list[i] != nqcd_list[abs(sym_fact)-1]:
1462+ misc.sprint(i, sym_fact, nqcd_list[i], nqcd_list[abs(sym_fact)])
1463+ raise Exception, "identical diagram with different QCD powwer"
1464+
1465+
1466
1467 filename = 'symperms.inc'
1468 self.write_symperms_file(writers.FortranWriter(filename),
1469
1470=== modified file 'madgraph/iolibs/template_files/madevent_makefile_source'
1471--- madgraph/iolibs/template_files/madevent_makefile_source 2017-08-14 08:21:48 +0000
1472+++ madgraph/iolibs/template_files/madevent_makefile_source 2019-06-27 13:48:48 +0000
1473@@ -26,8 +26,7 @@
1474
1475 # Binaries
1476
1477-BINARIES = $(BINDIR)gen_ximprove $(BINDIR)combine_events \
1478- $(BINDIR)gensudgrid $(BINDIR)combine_runs
1479+BINARIES = $(BINDIR)gen_ximprove $(BINDIR)gensudgrid $(BINDIR)combine_runs
1480
1481 # Compile commands
1482
1483@@ -54,8 +53,8 @@
1484
1485 $(BINDIR)gen_ximprove: gen_ximprove.o ranmar.o rw_routines.o open_file.o
1486 $(FC) $(LDFLAGS) -o $@ $^
1487-$(BINDIR)combine_events: $(COMBINE) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libpdf.$(libext) run_card.inc $(LIBDIR)libbias.$(libext)
1488- $(FC) -o $@ $(COMBINE) -L$(LIBDIR) -lmodel -lpdf $(llhapdf) $(LDFLAGS) -lbias
1489+#$(BINDIR)combine_events: $(COMBINE) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libpdf.$(libext) run_card.inc $(LIBDIR)libbias.$(libext)
1490+# $(FC) -o $@ $(COMBINE) -L$(LIBDIR) -lmodel -lpdf $(llhapdf) $(LDFLAGS) -lbias
1491 $(BINDIR)gensudgrid: $(GENSUDGRID) $(LIBDIR)libpdf.$(libext) $(LIBDIR)libcernlib.$(libext)
1492 $(FC) -o $@ $(GENSUDGRID) -L$(LIBDIR) -lmodel -lpdf -lcernlib $(llhapdf) $(LDFLAGS)
1493
1494@@ -66,7 +65,7 @@
1495 invarients.o: invarients.f genps.inc
1496 setrun.o: setrun.f nexternal.inc leshouche.inc genps.inc
1497 gen_ximprove.o: gen_ximprove.f run_config.inc run_card.inc
1498-combine_events.o: combine_events.f run_config.inc run_card.inc
1499+#combine_events.o: combine_events.f run_config.inc run_card.inc
1500 combine_runs.o: combine_runs.f run_config.inc run_card.inc
1501 select_events.o: select_events.f run_config.inc
1502 setrun.o: setrun.f nexternal.inc leshouche.inc run_card.inc run_config.inc
1503
1504=== modified file 'madgraph/iolibs/template_files/matrix_madevent_v4.inc'
1505--- madgraph/iolibs/template_files/matrix_madevent_v4.inc 2018-10-26 08:20:43 +0000
1506+++ madgraph/iolibs/template_files/matrix_madevent_v4.inc 2019-06-27 13:48:48 +0000
1507@@ -132,7 +132,7 @@
1508 JHEL = 1
1509 IF(NTRY.LE.MAXTRIES)THEN
1510 DO I=1,NCOMB
1511- IF (.NOT.GOODHEL(I) .AND. (TS(I).GT.ANS*LIMHEL/NCOMB)) THEN
1512+ IF (.NOT.GOODHEL(I) .AND. (DABS(TS(I)).GT.ANS*LIMHEL/NCOMB)) THEN
1513 GOODHEL(I)=.TRUE.
1514 NGOOD = NGOOD +1
1515 IGOOD(NGOOD) = I
1516
1517=== modified file 'madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_cc.inc'
1518--- madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_cc.inc 2015-09-14 15:08:12 +0000
1519+++ madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_cc.inc 2019-06-27 13:48:48 +0000
1520@@ -7,48 +7,50 @@
1521 #include "Parameters_%(model_name)s.h"
1522 #include "%(include_prefix)sPythiaStdlib.h"
1523
1524-namespace Pythia8 {
1525-
1526- // Initialize static instance
1527- Parameters_%(model_name)s* Parameters_%(model_name)s::instance = 0;
1528-
1529- // Function to get static instance - only one instance per program
1530- Parameters_%(model_name)s* Parameters_%(model_name)s::getInstance(){
1531- if (instance == 0)
1532- instance = new Parameters_%(model_name)s();
1533-
1534- return instance;
1535- }
1536-
1537- void Parameters_%(model_name)s::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){
1538- %(set_independent_parameters)s
1539- }
1540- void Parameters_%(model_name)s::setIndependentCouplings(){
1541- %(set_independent_couplings)s
1542- }
1543- void Parameters_%(model_name)s::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){
1544- %(set_dependent_parameters)s
1545- }
1546- void Parameters_%(model_name)s::setDependentCouplings(){
1547- %(set_dependent_couplings)s
1548- }
1549-
1550- // Routines for printing out parameters
1551- void Parameters_%(model_name)s::printIndependentParameters(){
1552- cout << "%(model_name)s model parameters independent of event kinematics:" << endl;
1553- %(print_independent_parameters)s
1554- }
1555- void Parameters_%(model_name)s::printIndependentCouplings(){
1556- cout << "%(model_name)s model couplings independent of event kinematics:" << endl;
1557- %(print_independent_couplings)s
1558- }
1559- void Parameters_%(model_name)s::printDependentParameters(){
1560- cout << "%(model_name)s model parameters dependent on event kinematics:" << endl;
1561- %(print_dependent_parameters)s
1562- }
1563- void Parameters_%(model_name)s::printDependentCouplings(){
1564- cout << "%(model_name)s model couplings dependent on event kinematics:" << endl;
1565- %(print_dependent_couplings)s
1566- }
1567-
1568-} // end namespace Pythia8
1569+using namespace Pythia8;
1570+
1571+// Initialize static instance
1572+Parameters_%(model_name)s* Parameters_%(model_name)s::instance = 0;
1573+
1574+// Function to get static instance - only one instance per program
1575+Parameters_%(model_name)s* Parameters_%(model_name)s::getInstance(){
1576+if (instance == 0)
1577+ instance = new Parameters_%(model_name)s();
1578+
1579+return instance;
1580+}
1581+
1582+void Parameters_%(model_name)s::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){
1583+%(set_independent_parameters)s
1584+}
1585+void Parameters_%(model_name)s::setIndependentCouplings(){
1586+%(set_independent_couplings)s
1587+}
1588+
1589+void Parameters_%(model_name)s::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){
1590+%(set_dependent_parameters)s
1591+}
1592+
1593+
1594+void Parameters_%(model_name)s::setDependentCouplings(){
1595+%(set_dependent_couplings)s
1596+}
1597+
1598+// Routines for printing out parameters
1599+void Parameters_%(model_name)s::printIndependentParameters(){
1600+cout << "%(model_name)s model parameters independent of event kinematics:" << endl;
1601+%(print_independent_parameters)s
1602+}
1603+void Parameters_%(model_name)s::printIndependentCouplings(){
1604+cout << "%(model_name)s model couplings independent of event kinematics:" << endl;
1605+%(print_independent_couplings)s
1606+}
1607+void Parameters_%(model_name)s::printDependentParameters(){
1608+cout << "%(model_name)s model parameters dependent on event kinematics:" << endl;
1609+%(print_dependent_parameters)s
1610+}
1611+void Parameters_%(model_name)s::printDependentCouplings(){
1612+cout << "%(model_name)s model couplings dependent on event kinematics:" << endl;
1613+%(print_dependent_couplings)s
1614+}
1615+
1616
1617=== modified file 'madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_h.inc'
1618--- madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_h.inc 2015-09-14 15:08:12 +0000
1619+++ madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_h.inc 2019-06-27 13:48:48 +0000
1620@@ -14,7 +14,7 @@
1621
1622 using namespace std;
1623
1624-namespace Pythia8 {
1625+using namespace Pythia8;
1626
1627 class Parameters_%(model_name)s
1628 {
1629@@ -33,6 +33,10 @@
1630 void setIndependentCouplings();
1631 // Set parameters that are changed event by event
1632 void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS);
1633+// TMP: hardcoded bogus implementation with no arguments since this
1634+// is being called from within the matrix elements.
1635+void setDependentParameters() {};
1636+
1637 // Set couplings that are changed event by event
1638 void setDependentCouplings();
1639
1640@@ -45,10 +49,8 @@
1641 // Print couplings that are changed event by event
1642 void printDependentCouplings();
1643
1644-
1645 private:
1646 static Parameters_%(model_name)s* instance;
1647 };
1648
1649-} // end namespace Pythia8
1650 #endif // Pythia8_parameters_%(model_name)s_H
1651
1652=== modified file 'madgraph/loop/loop_exporters.py'
1653--- madgraph/loop/loop_exporters.py 2018-06-03 12:13:47 +0000
1654+++ madgraph/loop/loop_exporters.py 2019-06-27 13:48:48 +0000
1655@@ -3053,7 +3053,7 @@
1656 Not needed for StandAlone so we need to call the correct one
1657 """
1658
1659- return export_v4.ProcessExporterFortranMEGroup.write_procdef_mg5(
1660+ return export_v4.ProcessExporterFortran.write_procdef_mg5(
1661 self, file_pos, modelname, process_str)
1662
1663 def get_source_libraries_list(self):
1664
1665=== modified file 'madgraph/various/banner.py'
1666--- madgraph/various/banner.py 2018-12-18 20:16:08 +0000
1667+++ madgraph/various/banner.py 2019-06-27 13:48:48 +0000
1668@@ -686,13 +686,19 @@
1669 try:
1670 _tag = results_object[run].tags[-1]
1671 except Exception,error:
1672- return Banner()
1673+ if os.path.exists( pjoin(results_object.path,'Events','%s_banner.txt' % (run))):
1674+ tag = None
1675+ else:
1676+ return Banner()
1677 else:
1678 _tag = tag
1679-
1680+
1681 path = results_object.path
1682- banner_path = pjoin(path,'Events',run,'%s_%s_banner.txt' % (run, tag))
1683-
1684+ if tag:
1685+ banner_path = pjoin(path,'Events',run,'%s_%s_banner.txt' % (run, tag))
1686+ else:
1687+ banner_path = pjoin(results_object.path,'Events','%s_banner.txt' % (run))
1688+
1689 if not os.path.exists(banner_path):
1690 if level != "parton" and tag != _tag:
1691 return recover_banner(results_object, level, _run, results_object[_run].tags[0])
1692@@ -712,6 +718,7 @@
1693
1694 # security if the banner was remove (or program canceled before created it)
1695 return Banner()
1696+
1697 banner = Banner(banner_path)
1698
1699
1700@@ -1207,8 +1214,8 @@
1701 if value in allowed:
1702 valid=True
1703 elif isinstance(value, str):
1704- value = value.lower()
1705- allowed = [v.lower() for v in allowed]
1706+ value = value.lower().strip()
1707+ allowed = [str(v).lower() for v in allowed]
1708 if value in allowed:
1709 i = allowed.index(value)
1710 value = self.allowed_value[lower_name][i]
1711@@ -1343,25 +1350,7 @@
1712 elif value.endswith(('k', 'M')) and value[:-1].isdigit():
1713 convert = {'k':1000, 'M':1000000}
1714 value =int(value[:-1]) * convert[value[-1]]
1715- else:
1716- try:
1717- value = float(value.replace('d','e'))
1718- except ValueError:
1719- raise InvalidCmd, "%s can not be mapped to an integer" % value
1720- try:
1721- new_value = int(value)
1722- except ValueError:
1723- raise InvalidCmd, "%s can not be mapped to an integer" % value
1724- else:
1725- if value == new_value:
1726- value = new_value
1727- else:
1728- raise InvalidCmd, "incorect input: %s need an integer for %s" % (value,name)
1729- elif targettype == float:
1730- value = value.replace('d','e') # pass from Fortran formatting
1731- try:
1732- value = float(value)
1733- except ValueError:
1734+ elif '/' in value or '*' in value:
1735 try:
1736 split = re.split('(\*|/)',value)
1737 v = float(split[0])
1738@@ -1372,9 +1361,48 @@
1739 v /= float(split[2*i+2])
1740 except:
1741 v=0
1742- raise InvalidCmd, "%s can not be mapped to a float" % value
1743+ raise InvalidCmd, "%s can not be mapped to an integer" % value
1744 finally:
1745- value = v
1746+ value = int(v)
1747+ if value != v:
1748+ raise InvalidCmd, "%s can not be mapped to an integer" % v
1749+ else:
1750+ try:
1751+ value = float(value.replace('d','e'))
1752+ except ValueError:
1753+ raise InvalidCmd, "%s can not be mapped to an integer" % value
1754+ try:
1755+ new_value = int(value)
1756+ except ValueError:
1757+ raise InvalidCmd, "%s can not be mapped to an integer" % value
1758+ else:
1759+ if value == new_value:
1760+ value = new_value
1761+ else:
1762+ raise InvalidCmd, "incorect input: %s need an integer for %s" % (value,name)
1763+
1764+ elif targettype == float:
1765+ if value.endswith(('k', 'M')) and value[:-1].isdigit():
1766+ convert = {'k':1000, 'M':1000000}
1767+ value = 1.*int(value[:-1]) * convert[value[-1]]
1768+ else:
1769+ value = value.replace('d','e') # pass from Fortran formatting
1770+ try:
1771+ value = float(value)
1772+ except ValueError:
1773+ try:
1774+ split = re.split('(\*|/)',value)
1775+ v = float(split[0])
1776+ for i in range((len(split)//2)):
1777+ if split[2*i+1] == '*':
1778+ v *= float(split[2*i+2])
1779+ else:
1780+ v /= float(split[2*i+2])
1781+ except:
1782+ v=0
1783+ raise InvalidCmd, "%s can not be mapped to a float" % value
1784+ finally:
1785+ value = v
1786 else:
1787 raise InvalidCmd, "type %s is not handle by the card" % targettype
1788
1789@@ -1434,7 +1462,8 @@
1790 self.add_param('colored_pdgs', [1,2,3,4,5])
1791 self.add_param('complex_mass_scheme', False)
1792 self.add_param('pdg_initial1', [0])
1793- self.add_param('pdg_initial2', [0])
1794+ self.add_param('pdg_initial2', [0])
1795+ self.add_param('limitations', [], typelist=str)
1796
1797 def read(self, finput):
1798 """Read the input file, this can be a path to a file,
1799@@ -2744,8 +2773,26 @@
1800 #
1801 """,
1802 template_off= '# Syscalc is deprecated but to see the associate options type\'update syscalc\''),
1803- ]
1804-
1805+
1806+# ECUT block (hidden it by default but for e+ e- collider)
1807+ runblock(name='ecut', fields=('ej','eb','ea','el','ejmax','ebmax','eamax','elmax','e_min_pdg','e_max_pdg'),
1808+ template_on=\
1809+"""#*********************************************************************
1810+# Minimum and maximum E's (in the center of mass frame) *
1811+#*********************************************************************
1812+ %(ej)s = ej ! minimum E for the jets
1813+ %(eb)s = eb ! minimum E for the b
1814+ %(ea)s = ea ! minimum E for the photons
1815+ %(el)s = el ! minimum E for the charged leptons
1816+ %(ejmax)s = ejmax ! maximum E for the jets
1817+ %(ebmax)s = ebmax ! maximum E for the b
1818+ %(eamax)s = eamax ! maximum E for the photons
1819+ %(elmax)s = elmax ! maximum E for the charged leptons
1820+ %(e_min_pdg)s = e_min_pdg ! E cut for other particles (use pdg code). Applied on particle and anti-particle
1821+ %(e_max_pdg)s = e_max_pdg ! E cut for other particles (syntax e.g. {6: 100, 25: 50})
1822+""",
1823+ template_off= '#\n# For display option for energy cut in the partonic center of mass frame type \'update ecut\'\n#'),
1824+ ]
1825
1826
1827 def default_setup(self):
1828@@ -2807,6 +2854,7 @@
1829 self.add_param("asrwgtflavor", 5, comment = 'highest quark flavor for a_s reweighting in MLM')
1830 self.add_param("clusinfo", True)
1831 self.add_param("lhe_version", 3.0)
1832+ self.add_param("boost_event", "False", hidden=True, include=False, comment="allow to boost the full event. The boost put at rest the sume of 4-momenta of the particle selected by the filter defined here. example going to the higgs rest frame: lambda p: p.pid==25")
1833 self.add_param("event_norm", "average", allowed=['sum','average', 'unity'],
1834 include=False, sys_default='sum')
1835 #cut
1836@@ -2828,14 +2876,14 @@
1837 self.add_param("ptlmax", -1.0, cut=True)
1838 self.add_param("missetmax", -1.0, cut=True)
1839 # E cut
1840- self.add_param("ej", 0.0, cut=True)
1841- self.add_param("eb", 0.0, cut=True)
1842- self.add_param("ea", 0.0, cut=True)
1843- self.add_param("el", 0.0, cut=True)
1844- self.add_param("ejmax", -1.0, cut=True)
1845- self.add_param("ebmax", -1.0, cut=True)
1846- self.add_param("eamax", -1.0, cut=True)
1847- self.add_param("elmax", -1.0, cut=True)
1848+ self.add_param("ej", 0.0, cut=True, hidden=True)
1849+ self.add_param("eb", 0.0, cut=True, hidden=True)
1850+ self.add_param("ea", 0.0, cut=True, hidden=True)
1851+ self.add_param("el", 0.0, cut=True, hidden=True)
1852+ self.add_param("ejmax", -1.0, cut=True, hidden=True)
1853+ self.add_param("ebmax", -1.0, cut=True, hidden=True)
1854+ self.add_param("eamax", -1.0, cut=True, hidden=True)
1855+ self.add_param("elmax", -1.0, cut=True, hidden=True)
1856 # Eta cut
1857 self.add_param("etaj", 5.0, cut=True)
1858 self.add_param("etab", -1.0, cut=True)
1859@@ -2958,8 +3006,8 @@
1860 # Special syntax are related to those. (can not be edit directly)
1861 self.add_param('pt_min_pdg',{'__type__':0.}, include=False)
1862 self.add_param('pt_max_pdg',{'__type__':0.}, include=False)
1863- self.add_param('E_min_pdg',{'__type__':0.}, include=False)
1864- self.add_param('E_max_pdg',{'__type__':0.}, include=False)
1865+ self.add_param('E_min_pdg',{'__type__':0.}, include=False, hidden=True)
1866+ self.add_param('E_max_pdg',{'__type__':0.}, include=False, hidden=True)
1867 self.add_param('eta_min_pdg',{'__type__':0.}, include=False)
1868 self.add_param('eta_max_pdg',{'__type__':0.}, include=False)
1869 self.add_param('mxx_min_pdg',{'__type__':0.}, include=False)
1870@@ -2975,6 +3023,7 @@
1871 self.add_param('mxxmin4pdg',[-1.], system=True)
1872 self.add_param('mxxpart_antipart', [False], system=True)
1873
1874+
1875
1876 def check_validity(self):
1877 """ """
1878@@ -3155,10 +3204,13 @@
1879 self['ebeam1'] = 500
1880 self['ebeam2'] = 500
1881 self['use_syst'] = False
1882+ self.display_block.append('beam_pol')
1883+ self.display_block.append('ecut')
1884 else:
1885 self['lpp1'] = 0
1886 self['lpp2'] = 0
1887- self['use_syst'] = False
1888+ self['use_syst'] = False
1889+ self.display_block.append('beam_pol')
1890
1891 # Check if need matching
1892 min_particle = 99
1893@@ -3211,9 +3263,19 @@
1894 else:
1895 continue
1896 break
1897+
1898+
1899 if no_systematics:
1900 self['use_syst'] = False
1901 self['systematics_program'] = 'none'
1902+
1903+ if 'MLM' in proc_characteristic['limitations']:
1904+ if self['dynamical_scale_choice'] == -1:
1905+ self['dynamical_scale_choice'] = 3
1906+ if self['ickkw'] == 1:
1907+ logger.critical("MLM matching/merging not compatible with the model! You need to use another method to remove the double counting!")
1908+ self['ickkw'] = 0
1909+
1910
1911 def write(self, output_file, template=None, python_template=False,
1912 **opt):
1913
1914=== modified file 'madgraph/various/diagram_symmetry.py'
1915--- madgraph/various/diagram_symmetry.py 2016-06-27 19:14:20 +0000
1916+++ madgraph/various/diagram_symmetry.py 2019-06-27 13:48:48 +0000
1917@@ -348,13 +348,18 @@
1918 interaction color, mass, width."""
1919
1920 inter = model.get_interaction(vertex.get('id'))
1921-
1922+
1923 if last_vertex:
1924 return (0,)
1925 else:
1926 part = model.get_particle(vertex.get('legs')[-1].get('id'))
1927+ try:
1928+ QCD = inter.get('orders')['QCD']
1929+ except Exception, error:
1930+ QCD = 0
1931+
1932 return ((part.get('color'),
1933- part.get('mass'), part.get('width')),)
1934+ part.get('mass'), part.get('width'), QCD),)
1935
1936 def find_symmetry_subproc_group(subproc_group):
1937 """Find symmetric configs by directly comparing the configurations
1938
1939=== modified file 'madgraph/various/histograms.py'
1940--- madgraph/various/histograms.py 2018-01-31 19:07:21 +0000
1941+++ madgraph/various/histograms.py 2019-06-27 13:48:48 +0000
1942@@ -2108,7 +2108,8 @@
1943 ratio_correlations=True, arg_string='',
1944 jet_samples_to_keep=None,
1945 auto_open=True,
1946- lhapdfconfig='lhapdf-config'):
1947+ lhapdfconfig='lhapdf-config',
1948+ assigned_colours=None):
1949 """ Ouput this histogram to a file, stream or string if path is kept to
1950 None. The supported format are for now. Chose whether to print the header
1951 or not."""
1952@@ -2160,6 +2161,24 @@
1953
1954 self[:] = matching_histo_lists
1955
1956+ # the histogram colours:
1957+ coli=['col1','col2','col3','col4','col5','col6','col7','col8']
1958+ colours={coli[0] : "#009e73",
1959+ coli[1] : "#0072b2",
1960+ coli[2] : "#d55e00",
1961+ coli[3] : "#f0e442",
1962+ coli[4] : "#56b4e9",
1963+ coli[5] : "#cc79a7",
1964+ coli[6] : "#e69f00",
1965+ coli[7] : "black"}
1966+ if assigned_colours:
1967+ for index, item in enumerate(assigned_colours):
1968+ if (item != None): colours[coli[index]]=item
1969+
1970+ replace_dict=colours
1971+ replace_dict['arg_string']=arg_string
1972+ replace_dict['output_base_name']=output_base_name
1973+
1974 # Write the gnuplot header
1975 gnuplot_output_list_v4 = [
1976 """
1977@@ -2173,7 +2192,7 @@
1978 # For more information, visit madgraph.phys.ucl.ac.be and amcatnlo.web.cern.ch
1979 #
1980 ################################################################################
1981-# %s
1982+# %(arg_string)s
1983 reset
1984
1985 set lmargin 10
1986@@ -2183,60 +2202,60 @@
1987 #set terminal pdf enhanced font "Helvetica 12" lw 1.0 dashed size 29.7cm, 21cm
1988 set key font ",9"
1989 set key samplen "2"
1990-set output "%s.ps"
1991+set output "%(output_base_name)s.ps"
1992
1993 # This is the "PODO" color palette of gnuplot v.5, but with the order
1994 # changed: palette of colors selected to be easily distinguishable by
1995 # color-blind individuals with either protanopia or deuteranopia. Bang
1996 # Wong [2011] Nature Methods 8, 441.
1997
1998-set style line 1 lt 1 lc rgb "#009e73" lw 2.5
1999-set style line 11 lt 2 lc rgb "#009e73" lw 2.5
2000-set style line 21 lt 4 lc rgb "#009e73" lw 2.5
2001-set style line 31 lt 6 lc rgb "#009e73" lw 2.5
2002-set style line 41 lt 8 lc rgb "#009e73" lw 2.5
2003-
2004-set style line 2 lt 1 lc rgb "#0072b2" lw 2.5
2005-set style line 12 lt 2 lc rgb "#0072b2" lw 2.5
2006-set style line 22 lt 4 lc rgb "#0072b2" lw 2.5
2007-set style line 32 lt 6 lc rgb "#0072b2" lw 2.5
2008-set style line 42 lt 8 lc rgb "#0072b2" lw 2.5
2009-
2010-set style line 3 lt 1 lc rgb "#d55e00" lw 2.5
2011-set style line 13 lt 2 lc rgb "#d55e00" lw 2.5
2012-set style line 23 lt 4 lc rgb "#d55e00" lw 2.5
2013-set style line 33 lt 6 lc rgb "#d55e00" lw 2.5
2014-set style line 43 lt 8 lc rgb "#d55e00" lw 2.5
2015-
2016-set style line 4 lt 1 lc rgb "#f0e442" lw 2.5
2017-set style line 14 lt 2 lc rgb "#f0e442" lw 2.5
2018-set style line 24 lt 4 lc rgb "#f0e442" lw 2.5
2019-set style line 34 lt 6 lc rgb "#f0e442" lw 2.5
2020-set style line 44 lt 8 lc rgb "#f0e442" lw 2.5
2021-
2022-set style line 5 lt 1 lc rgb "#56b4e9" lw 2.5
2023-set style line 15 lt 2 lc rgb "#56b4e9" lw 2.5
2024-set style line 25 lt 4 lc rgb "#56b4e9" lw 2.5
2025-set style line 35 lt 6 lc rgb "#56b4e9" lw 2.5
2026-set style line 45 lt 8 lc rgb "#56b4e9" lw 2.5
2027-
2028-set style line 6 lt 1 lc rgb "#cc79a7" lw 2.5
2029-set style line 16 lt 2 lc rgb "#cc79a7" lw 2.5
2030-set style line 26 lt 4 lc rgb "#cc79a7" lw 2.5
2031-set style line 36 lt 6 lc rgb "#cc79a7" lw 2.5
2032-set style line 46 lt 8 lc rgb "#cc79a7" lw 2.5
2033-
2034-set style line 7 lt 1 lc rgb "#e69f00" lw 2.5
2035-set style line 17 lt 2 lc rgb "#e69f00" lw 2.5
2036-set style line 27 lt 4 lc rgb "#e69f00" lw 2.5
2037-set style line 37 lt 6 lc rgb "#e69f00" lw 2.5
2038-set style line 47 lt 8 lc rgb "#e69f00" lw 2.5
2039-
2040-set style line 8 lt 1 lc rgb "black" lw 2.5
2041-set style line 18 lt 2 lc rgb "black" lw 2.5
2042-set style line 28 lt 4 lc rgb "black" lw 2.5
2043-set style line 38 lt 6 lc rgb "black" lw 2.5
2044-set style line 48 lt 7 lc rgb "black" lw 2.5
2045+set style line 1 lt 1 lc rgb "%(col1)s" lw 2.5
2046+set style line 11 lt 2 lc rgb "%(col1)s" lw 2.5
2047+set style line 21 lt 4 lc rgb "%(col1)s" lw 2.5
2048+set style line 31 lt 6 lc rgb "%(col1)s" lw 2.5
2049+set style line 41 lt 8 lc rgb "%(col1)s" lw 2.5
2050+
2051+set style line 2 lt 1 lc rgb "%(col2)s" lw 2.5
2052+set style line 12 lt 2 lc rgb "%(col2)s" lw 2.5
2053+set style line 22 lt 4 lc rgb "%(col2)s" lw 2.5
2054+set style line 32 lt 6 lc rgb "%(col2)s" lw 2.5
2055+set style line 42 lt 8 lc rgb "%(col2)s" lw 2.5
2056+
2057+set style line 3 lt 1 lc rgb "%(col3)s" lw 2.5
2058+set style line 13 lt 2 lc rgb "%(col3)s" lw 2.5
2059+set style line 23 lt 4 lc rgb "%(col3)s" lw 2.5
2060+set style line 33 lt 6 lc rgb "%(col3)s" lw 2.5
2061+set style line 43 lt 8 lc rgb "%(col3)s" lw 2.5
2062+
2063+set style line 4 lt 1 lc rgb "%(col4)s" lw 2.5
2064+set style line 14 lt 2 lc rgb "%(col4)s" lw 2.5
2065+set style line 24 lt 4 lc rgb "%(col4)s" lw 2.5
2066+set style line 34 lt 6 lc rgb "%(col4)s" lw 2.5
2067+set style line 44 lt 8 lc rgb "%(col4)s" lw 2.5
2068+
2069+set style line 5 lt 1 lc rgb "%(col5)s" lw 2.5
2070+set style line 15 lt 2 lc rgb "%(col5)s" lw 2.5
2071+set style line 25 lt 4 lc rgb "%(col5)s" lw 2.5
2072+set style line 35 lt 6 lc rgb "%(col5)s" lw 2.5
2073+set style line 45 lt 8 lc rgb "%(col5)s" lw 2.5
2074+
2075+set style line 6 lt 1 lc rgb "%(col6)s" lw 2.5
2076+set style line 16 lt 2 lc rgb "%(col6)s" lw 2.5
2077+set style line 26 lt 4 lc rgb "%(col6)s" lw 2.5
2078+set style line 36 lt 6 lc rgb "%(col6)s" lw 2.5
2079+set style line 46 lt 8 lc rgb "%(col6)s" lw 2.5
2080+
2081+set style line 7 lt 1 lc rgb "%(col7)s" lw 2.5
2082+set style line 17 lt 2 lc rgb "%(col7)s" lw 2.5
2083+set style line 27 lt 4 lc rgb "%(col7)s" lw 2.5
2084+set style line 37 lt 6 lc rgb "%(col7)s" lw 2.5
2085+set style line 47 lt 8 lc rgb "%(col7)s" lw 2.5
2086+
2087+set style line 8 lt 1 lc rgb "%(col8)s" lw 2.5
2088+set style line 18 lt 2 lc rgb "%(col8)s" lw 2.5
2089+set style line 28 lt 4 lc rgb "%(col8)s" lw 2.5
2090+set style line 38 lt 6 lc rgb "%(col8)s" lw 2.5
2091+set style line 48 lt 7 lc rgb "%(col8)s" lw 2.5
2092
2093
2094 set style line 999 lt 1 lc rgb "gray" lw 2.5
2095@@ -2246,7 +2265,7 @@
2096 set style data histeps
2097 set key invert
2098
2099-"""%(arg_string,output_base_name)
2100+"""%(replace_dict)
2101 ]
2102
2103 gnuplot_output_list_v5 = [
2104@@ -2261,7 +2280,7 @@
2105 # For more information, visit madgraph.phys.ucl.ac.be and amcatnlo.web.cern.ch
2106 #
2107 ################################################################################
2108-# %s
2109+# %(arg_string)s
2110 reset
2111
2112 set lmargin 10
2113@@ -2271,69 +2290,68 @@
2114 #set terminal pdf enhanced font "Helvetica 12" lw 1.0 dashed size 29.7cm, 21cm
2115 set key font ",9"
2116 set key samplen "2"
2117-set output "%s.ps"
2118+set output "%(output_base_name)s.ps"
2119
2120 # This is the "PODO" color palette of gnuplot v.5, but with the order
2121 # changed: palette of colors selected to be easily distinguishable by
2122 # color-blind individuals with either protanopia or deuteranopia. Bang
2123 # Wong [2011] Nature Methods 8, 441.
2124
2125-set style line 1 lt 1 lc rgb "#009e73" lw 1.3
2126-set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3)
2127-set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
2128-set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
2129-set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
2130-set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
2131-
2132-set style line 2 lt 1 lc rgb "#0072b2" lw 1.3
2133-set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
2134-set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
2135-set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
2136-set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
2137-set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
2138-
2139-
2140-set style line 3 lt 1 lc rgb "#d55e00" lw 1.3
2141-set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3)
2142-set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
2143-set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
2144-set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
2145-set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
2146-
2147-set style line 4 lt 1 lc rgb "#f0e442" lw 1.3
2148-set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
2149-set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
2150-set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
2151-set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
2152-set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
2153-
2154-set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3
2155-set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
2156-set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
2157-set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
2158-set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
2159-set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
2160-
2161-set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3
2162-set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
2163-set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
2164-set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
2165-set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
2166-set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
2167-
2168-set style line 7 lt 1 lc rgb "#e69f00" lw 1.3
2169-set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
2170-set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
2171-set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
2172-set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
2173-set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
2174-
2175-set style line 8 lt 1 lc rgb "black" lw 1.3
2176-set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
2177-set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
2178-set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
2179-set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
2180-set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
2181+set style line 1 lt 1 lc rgb "%(col1)s" lw 1.3
2182+set style line 101 lt 1 lc rgb "%(col1)s" lw 1.3 dt (6,3)
2183+set style line 11 lt 2 lc rgb "%(col1)s" lw 1.3 dt (6,3)
2184+set style line 21 lt 4 lc rgb "%(col1)s" lw 1.3 dt (3,2)
2185+set style line 31 lt 6 lc rgb "%(col1)s" lw 1.3 dt (2,1)
2186+set style line 41 lt 8 lc rgb "%(col1)s" lw 1.3 dt (4,3)
2187+
2188+set style line 2 lt 1 lc rgb "%(col2)s" lw 1.3
2189+set style line 102 lt 1 lc rgb "%(col2)s" lw 1.3 dt (6,3)
2190+set style line 12 lt 2 lc rgb "%(col2)s" lw 1.3 dt (6,3)
2191+set style line 22 lt 4 lc rgb "%(col2)s" lw 1.3 dt (3,2)
2192+set style line 32 lt 6 lc rgb "%(col2)s" lw 1.3 dt (2,1)
2193+set style line 42 lt 8 lc rgb "%(col2)s" lw 1.3 dt (4,3)
2194+
2195+set style line 3 lt 1 lc rgb "%(col3)s" lw 1.3
2196+set style line 103 lt 1 lc rgb "%(col3)s" lw 1.3 dt (6,3)
2197+set style line 13 lt 2 lc rgb "%(col3)s" lw 1.3 dt (6,3)
2198+set style line 23 lt 4 lc rgb "%(col3)s" lw 1.3 dt (3,2)
2199+set style line 33 lt 6 lc rgb "%(col3)s" lw 1.3 dt (2,1)
2200+set style line 43 lt 8 lc rgb "%(col3)s" lw 1.3 dt (4,3)
2201+
2202+set style line 4 lt 1 lc rgb "%(col4)s" lw 1.3
2203+set style line 104 lt 1 lc rgb "%(col4)s" lw 1.3 dt (6,3)
2204+set style line 14 lt 2 lc rgb "%(col4)s" lw 1.3 dt (6,3)
2205+set style line 24 lt 4 lc rgb "%(col4)s" lw 1.3 dt (3,2)
2206+set style line 34 lt 6 lc rgb "%(col4)s" lw 1.3 dt (2,1)
2207+set style line 44 lt 8 lc rgb "%(col4)s" lw 1.3 dt (4,3)
2208+
2209+set style line 5 lt 1 lc rgb "%(col5)s" lw 1.3
2210+set style line 105 lt 1 lc rgb "%(col5)s" lw 1.3 dt (6,3)
2211+set style line 15 lt 2 lc rgb "%(col5)s" lw 1.3 dt (6,3)
2212+set style line 25 lt 4 lc rgb "%(col5)s" lw 1.3 dt (3,2)
2213+set style line 35 lt 6 lc rgb "%(col5)s" lw 1.3 dt (2,1)
2214+set style line 45 lt 8 lc rgb "%(col5)s" lw 1.3 dt (4,3)
2215+
2216+set style line 6 lt 1 lc rgb "%(col6)s" lw 1.3
2217+set style line 106 lt 1 lc rgb "%(col6)s" lw 1.3 dt (6,3)
2218+set style line 16 lt 2 lc rgb "%(col6)s" lw 1.3 dt (6,3)
2219+set style line 26 lt 4 lc rgb "%(col6)s" lw 1.3 dt (3,2)
2220+set style line 36 lt 6 lc rgb "%(col6)s" lw 1.3 dt (2,1)
2221+set style line 46 lt 8 lc rgb "%(col6)s" lw 1.3 dt (4,3)
2222+
2223+set style line 7 lt 1 lc rgb "%(col7)s" lw 1.3
2224+set style line 107 lt 1 lc rgb "%(col7)s" lw 1.3 dt (6,3)
2225+set style line 17 lt 2 lc rgb "%(col7)s" lw 1.3 dt (6,3)
2226+set style line 27 lt 4 lc rgb "%(col7)s" lw 1.3 dt (3,2)
2227+set style line 37 lt 6 lc rgb "%(col7)s" lw 1.3 dt (2,1)
2228+set style line 47 lt 8 lc rgb "%(col7)s" lw 1.3 dt (4,3)
2229+
2230+set style line 8 lt 1 lc rgb "%(col8)s" lw 1.3
2231+set style line 108 lt 1 lc rgb "%(col8)s" lw 1.3 dt (6,3)
2232+set style line 18 lt 2 lc rgb "%(col8)s" lw 1.3 dt (6,3)
2233+set style line 28 lt 4 lc rgb "%(col8)s" lw 1.3 dt (3,2)
2234+set style line 38 lt 6 lc rgb "%(col8)s" lw 1.3 dt (2,1)
2235+set style line 48 lt 8 lc rgb "%(col8)s" lw 1.3 dt (4,3)
2236
2237
2238 set style line 999 lt 1 lc rgb "gray" lw 1.3
2239@@ -2343,7 +2361,7 @@
2240 set style data histeps
2241 set key invert
2242
2243-"""%(arg_string,output_base_name)
2244+"""%(replace_dict)
2245 ]
2246
2247 # determine the gnuplot version
2248@@ -3382,6 +3400,7 @@
2249 '--show_full' to show the complete output of what was read.
2250 '--show_short' to show a summary of what was read.
2251 '--simple_ratios' to turn off correlations and error propagation in the ratio.
2252+ '--colours=<colour1>,<colour2>,...' to assign a non-default colour to GnuPlot histograms (max 8 colours)
2253 '--sum' To sum all identical histograms together
2254 '--average' To average over all identical histograms
2255 '--rebin=<n>' Rebin the plots by merging n-consecutive bins together.
2256@@ -3420,7 +3439,7 @@
2257 '--no_scale','--no_pdf','--no_stat','--no_merging','--no_alpsfact',
2258 '--only_scale','--only_pdf','--only_stat','--only_merging','--only_alpsfact',
2259 '--variations','--band','--central_only', '--lhapdf-config','--titles',
2260- '--keep_all_weights']
2261+ '--keep_all_weights','--colours']
2262 n_ratios = -1
2263 uncertainties = ['scale','pdf','statistical','merging_scale','alpsfact']
2264 # The list of type of uncertainties for which to use bands. None is a 'smart' default
2265@@ -3466,6 +3485,12 @@
2266 assigned_types = [(type if type!='None' else None) for type in \
2267 arg[15:].split(',')]
2268
2269+ assigned_colours = []
2270+ for arg in sys.argv[1:]:
2271+ if arg.startswith('--colours='):
2272+ assigned_colours = [(colour if colour!='None' else None) for colour in \
2273+ arg[10:].split(',')]
2274+
2275 jet_samples_to_keep = None
2276
2277 lhapdfconfig = ['lhapdf-config']
2278@@ -3623,7 +3648,8 @@
2279 jet_samples_to_keep=jet_samples_to_keep,
2280 use_band=use_band,
2281 auto_open=auto_open,
2282- lhapdfconfig=lhapdfconfig)
2283+ lhapdfconfig=lhapdfconfig,
2284+ assigned_colours=assigned_colours)
2285 # Tell the user that everything went for the best
2286 log("%d histograms have been output in " % len(histo_list)+\
2287 "the gnuplot format at '%s.[HwU|gnuplot]'." % OutName)
2288
2289=== modified file 'madgraph/various/lhe_parser.py'
2290--- madgraph/various/lhe_parser.py 2018-10-23 20:08:08 +0000
2291+++ madgraph/various/lhe_parser.py 2019-06-27 13:48:48 +0000
2292@@ -976,13 +976,13 @@
2293 self.seek(0)
2294 else:
2295 # check special case without PDF for one (or both) beam
2296- if init_information["idbmup1"] == 0:
2297+ if init_information["idbmup1"] in [0,9]:
2298 event = self.next()
2299 init_information["idbmup1"]= event[0].pdg
2300 if init_information["idbmup2"] == 0:
2301 init_information["idbmup2"]= event[1].pdg
2302 self.seek(0)
2303- if init_information["idbmup2"] == 0:
2304+ if init_information["idbmup2"] in [0,9]:
2305 event = self.next()
2306 init_information["idbmup2"] = event[1].pdg
2307 self.seek(0)
2308@@ -1572,7 +1572,7 @@
2309 if old_scales:
2310 self.matched_scale_data.append(old_scales[initial_pos+jet_position])
2311 # compute and assign the new four_momenta
2312- new_momentum = this_4mom.boost(FourMomentum(new_particle))
2313+ new_momentum = FourMomentum(new_particle).boost(this_4mom)
2314 new_particle.set_momentum(new_momentum)
2315 # compute the new mother
2316 for tag in ['mother1', 'mother2']:
2317@@ -1726,6 +1726,25 @@
2318
2319 return new_event
2320
2321+ def boost(self, filter=None):
2322+ """modify the current event to boost it according to the current filter"""
2323+ if filter is None:
2324+ filter = lambda p: p.status==-1
2325+
2326+ pboost = FourMomentum()
2327+ for p in self:
2328+ if filter(p):
2329+ pboost += p
2330+
2331+ # change sign of three-component due to helas convention
2332+ pboost.px *=-1
2333+ pboost.py *=-1
2334+ pboost.pz *=-1
2335+ for p in self:
2336+ b= FourMomentum(p).boost(pboost)
2337+ p.E, p.px, p.py, p.pz = b.E, b.px, b.py, b.pz
2338+
2339+ return self
2340
2341 def check(self):
2342 """check various property of the events"""
2343@@ -2493,18 +2512,20 @@
2344 def boost(self, mom):
2345 """mom 4-momenta is suppose to be given in the rest frame of this 4-momenta.
2346 the output is the 4-momenta in the frame of this 4-momenta
2347- function copied from HELAS routine."""
2348+ function copied from HELAS routine.
2349+ if the current momenta is (E,\vec{p}), in order to go to the rest frame
2350+ of the current particle, mom should be (E, -\vec{p})
2351+ """
2352
2353-
2354- pt = self.px**2 + self.py**2 + self.pz**2
2355- if pt:
2356+ pnorm = mom.px**2 + mom.py**2 + mom.pz**2
2357+ if pnorm:
2358 s3product = self.px * mom.px + self.py * mom.py + self.pz * mom.pz
2359- mass = self.mass
2360- lf = (mom.E + (self.E - mass) * s3product / pt ) / mass
2361+ mass = mom.mass
2362+ lf = (self.E + (mom.E - mass) * s3product / pnorm ) / mass
2363 return FourMomentum(E=(self.E*mom.E+s3product)/mass,
2364- px=mom.px + self.px * lf,
2365- py=mom.py + self.py * lf,
2366- pz=mom.pz + self.pz * lf)
2367+ px=self.px + mom.px * lf,
2368+ py=self.py + mom.py * lf,
2369+ pz=self.pz + mom.pz * lf)
2370 else:
2371 return FourMomentum(mom)
2372
2373
2374=== modified file 'madgraph/various/misc.py'
2375--- madgraph/various/misc.py 2018-06-01 13:06:03 +0000
2376+++ madgraph/various/misc.py 2019-06-27 13:48:48 +0000
2377@@ -121,11 +121,16 @@
2378
2379 if info_str:
2380 info_dict = parse_info_str(StringIO.StringIO(info_str))
2381+ return info_dict
2382
2383+ if PACKAGE_INFO:
2384+ return PACKAGE_INFO
2385+
2386 elif MADEVENT:
2387 info_dict ={}
2388 info_dict['version'] = open(pjoin(internal.__path__[0],'..','..','MGMEVersion.txt')).read().strip()
2389- info_dict['date'] = '20xx-xx-xx'
2390+ info_dict['date'] = '20xx-xx-xx'
2391+ PACKAGE_INFO = info_dict
2392 else:
2393 if PACKAGE_INFO:
2394 return PACKAGE_INFO
2395@@ -867,10 +872,10 @@
2396 return f(arg, *args, **opt)
2397 except OSError, error:
2398 logger.debug('try to recover from %s' % error)
2399- if isinstance(arg, list):
2400+ if isinstance(arg, (list,tuple)):
2401 prog = arg[0]
2402 else:
2403- prog = arg[0]
2404+ prog = arg
2405
2406 # Permission denied
2407 if error.errno == 13:
2408@@ -1704,10 +1709,49 @@
2409 "May the mass times acceleration be with you.",
2410 "NOTE: This product may actually be nine-dimensional. If this is the case, functionality is not affected by the extra five dimensions.",
2411 "IMPORTANT: This product is composed of 100%% matter: It is the responsibility of the User to make sure that it does not come in contact with antimatter.",
2412+ "",
2413 'The fish are out of jokes. See you next year for more!'],
2414- 'loading': ['Hi %(user)s, You are Loading Madgraph. Please be patient, we are doing the work.'],
2415- 'quit': ['Thanks %(user)s for using MadGraph5_aMC@NLO, even on April 1st!']
2416+# 'loading': ['Hi %(user)s, You are Loading Madgraph. Please be patient, we are doing the work.'],
2417+# 'quit': ['Thanks %(user)s for using MadGraph5_aMC@NLO, even on April 1st!']
2418 }
2419+
2420+ default_banner_1 = "************************************************************\n" + \
2421+ "* *\n" + \
2422+ "* W E L C O M E to *\n" + \
2423+ "* M A D G R A P H 5 _ a M C @ N L O *\n" + \
2424+ "* *\n" + \
2425+ "* *\n"
2426+
2427+
2428+ default_banner_2 = "* *\n" + \
2429+ "%s" + \
2430+ "* *\n" + \
2431+ "* The MadGraph5_aMC@NLO Development Team - Find us at *\n" + \
2432+ "* https://server06.fynu.ucl.ac.be/projects/madgraph *\n" + \
2433+ "* and *\n" + \
2434+ "* http://amcatnlo.web.cern.ch/amcatnlo/ *\n" + \
2435+ "* *\n" + \
2436+ "* Type 'help' for in-line help. *\n" + \
2437+ "* Type 'tutorial' to learn how MG5 works *\n" + \
2438+ "* Type 'tutorial aMCatNLO' to learn how aMC@NLO works *\n" + \
2439+ "* Type 'tutorial MadLoop' to learn how MadLoop works *\n" + \
2440+ "* *\n" + \
2441+ "************************************************************"
2442+
2443+ May4_banner = "* _____ *\n" + \
2444+ "* ,-~\" \"~-. *\n" + \
2445+ "* * ,^ ___ ^. * *\n" + \
2446+ "* * / .^ ^. \ * *\n" + \
2447+ "* * Y l o ! Y * *\n" + \
2448+ "* * l_ `.___.' _,[ * *\n" + \
2449+ "* * |^~\"--------------~\"\"^| * *\n" + \
2450+ "* * ! May the 4th ! * *\n" + \
2451+ "* * \ / * *\n" + \
2452+ "* * ^. .^ * *\n" + \
2453+ "* * \"-.._____.,-\" * *\n"
2454+
2455+ special_banner = {(4,5): May4_banner}
2456+
2457
2458 def __init__(self, msgtype):
2459
2460@@ -1726,6 +1770,9 @@
2461 msg = choices[random.randint(0,len(choices)-2)]
2462 EasterEgg.message_aprilfirst[msgtype].remove(msg)
2463
2464+ elif msgtype=='loading' and date in self.special_banner:
2465+ self.change_banner(date)
2466+ return
2467 else:
2468 return
2469 if MADEVENT:
2470@@ -1749,6 +1796,13 @@
2471 except:
2472 pass
2473
2474+ def change_banner(self, date):
2475+ if MADEVENT:
2476+ return
2477+ import madgraph.interface.madgraph_interface as madgraph_interface
2478+ madgraph_interface.CmdExtended.intro_banner= self.default_banner_1 + self.special_banner[date] + self.default_banner_2
2479+
2480+
2481 def call_apple(self, msg):
2482
2483 #1. control if the volume is on or not
2484@@ -1790,17 +1844,6 @@
2485 os.system(fishCmd)
2486
2487
2488-if __debug__:
2489- try:
2490- import os
2491- import pwd
2492- username =pwd.getpwuid( os.getuid() )[ 0 ]
2493- if 'hirschi' in username or 'vryonidou' in username and __debug__:
2494- EasterEgg('loading')
2495- except:
2496- pass
2497-
2498-
2499 def get_older_version(v1, v2):
2500 """ return v2 if v1>v2
2501 return v1 if v1<v2
2502
2503=== modified file 'madgraph/various/shower_card.py'
2504--- madgraph/various/shower_card.py 2016-02-18 16:59:22 +0000
2505+++ madgraph/various/shower_card.py 2019-06-27 13:48:48 +0000
2506@@ -18,7 +18,17 @@
2507 import re
2508 import os
2509 import logging
2510-
2511+try:
2512+ import madgraph
2513+except ImportError:
2514+ import internal.misc as misc
2515+ import internal.banner as banner
2516+ from internal import InvalidCmd
2517+else:
2518+ import madgraph.various.misc as misc
2519+ import madgraph.various.banner as banner
2520+ from madgraph import InvalidCmd
2521+
2522 logger = logging.getLogger('madgraph.shower_card')
2523
2524 pjoin = os.path.join
2525@@ -92,20 +102,20 @@
2526 lines = content.split('\n')
2527 list_dm = []
2528 for l in lines:
2529- if '#' in l:
2530- l = l.split('#',1)[0]
2531- if '=' not in l:
2532- continue
2533- args = l.split('=',1) # here the 1 is important in case of string passed
2534- key = args[0].strip().lower()
2535- value = args[1].strip()
2536- self.set_param(key, value)
2537- if str(key).upper().startswith('DM'):
2538- list_dm.append(int(key.split('_',1)[1]))
2539- #special case for DM_*
2540- for i in range(1,100):
2541- if not i in list_dm:
2542- self['dm_'+str(i)] = ''
2543+ if '#' in l:
2544+ l = l.split('#',1)[0]
2545+ if '=' not in l:
2546+ continue
2547+ args = l.split('=',1) # here the 1 is important in case of string passed
2548+ key = args[0].strip().lower()
2549+ value = args[1].strip()
2550+ self.set_param(key, value)
2551+ if str(key).upper().startswith('DM'):
2552+ list_dm.append(int(key.split('_',1)[1]))
2553+ #special case for DM_*
2554+ for i in range(1,100):
2555+ if not i in list_dm:
2556+ self['dm_'+str(i)] = ''
2557
2558 self.text=content
2559
2560@@ -116,14 +126,12 @@
2561 if not testing write_to is an input path, if testing the text is
2562 returned by the function
2563 """
2564+
2565 if key in self.logical_vars:
2566- if str(value).lower() in self.true:
2567- self[key] = True
2568- elif str(value).lower() in self.false:
2569- self[key] = False
2570- else:
2571- raise ShowerCardError('%s is not a valid value for %s' % \
2572- (value, key))
2573+ try:
2574+ self[key] = banner.ConfigFile.format_variable(value, bool, key)
2575+ except InvalidCmd, error:
2576+ raise ShowerCardError(str(error))
2577 elif key in self.string_vars:
2578 if value.lower() == 'none':
2579 self[key] = ''
2580@@ -131,16 +139,14 @@
2581 self[key] = value
2582 elif key in self.int_vars:
2583 try:
2584- self[key] = int(value)
2585- except ValueError:
2586- raise ShowerCardError('%s is not a valid value for %s. An integer number is expected' % \
2587- (value, key))
2588+ self[key] = banner.ConfigFile.format_variable(value, int, key)
2589+ except InvalidCmd, error:
2590+ raise ShowerCardError(str(error))
2591 elif key in self.float_vars:
2592 try:
2593- self[key] = float(value)
2594- except ValueError:
2595- raise ShowerCardError('%s is not a valid value for %s. A floating point number is expected' % \
2596- (value, key))
2597+ self[key] = banner.ConfigFile.format_variable(value, float, key)
2598+ except InvalidCmd, error:
2599+ raise ShowerCardError(str(error))
2600 else:
2601 raise ShowerCardError('Unknown entry: %s = %s' % (key, value))
2602 self.keylist.append(key)
2603@@ -160,7 +166,8 @@
2604 if key not in self.logical_vars:
2605 newlines.append('%s = %s #%s' % (key, value, comment))
2606 else:
2607- if key:
2608+
2609+ if self[key]:
2610 newlines.append('%s = %s #%s' % (key, 'T', comment))
2611 else:
2612 newlines.append('%s = %s #%s' % (key, 'F', comment))
2613
2614=== modified file 'models/check_param_card.py'
2615--- models/check_param_card.py 2018-10-19 08:27:34 +0000
2616+++ models/check_param_card.py 2019-06-27 13:48:48 +0000
2617@@ -93,6 +93,9 @@
2618 data, self.comment = text.split('#',1)
2619 else:
2620 data, self.comment = text, ""
2621+
2622+ if ']]>' in data:
2623+ data = data.split(']]>',1)[0]
2624
2625
2626 data = data.split()
2627
2628=== modified file 'models/import_ufo.py'
2629--- models/import_ufo.py 2019-01-30 19:32:17 +0000
2630+++ models/import_ufo.py 2019-06-27 13:48:48 +0000
2631@@ -422,7 +422,7 @@
2632 model.set('version_tag', os.path.realpath(path) +'##'+ str(misc.get_pkg_info()))
2633
2634 # save in a pickle files to fasten future usage
2635- if ReadWrite:
2636+ if ReadWrite and model['allow_pickle']:
2637 save_load_object.save_to_file(os.path.join(model_path, pickle_name),
2638 model, log=False)
2639
2640@@ -444,6 +444,8 @@
2641
2642 self.particles = base_objects.ParticleList()
2643 self.interactions = base_objects.InteractionList()
2644+ self.non_qcd_gluon_emission = 0 # vertex where a gluon is emitted withou QCD interaction
2645+ # only trigger if all particles are of QCD type (not h>gg)
2646 self.wavefunction_CT_couplings = []
2647
2648 # Check here if we can extract the couplings perturbed in this model
2649@@ -545,6 +547,14 @@
2650 for interaction_info in self.ufomodel.all_vertices:
2651 self.add_interaction(interaction_info, color_info)
2652
2653+ if self.non_qcd_gluon_emission:
2654+ logger.critical("Model with non QCD emission of gluon (found %i of those).\n This type of model is not fully supported within MG5aMC.\n"+\
2655+ " Restriction on LO dynamical scale and MLM matching/merging can occur for some processes.\n"+\
2656+ " Use such features with care.", self.non_qcd_gluon_emission)
2657+
2658+ self.model['allow_pickle'] = False
2659+ self.model['limitations'].append('MLM')
2660+
2661 if self.perturbation_couplings:
2662 try:
2663 self.ufomodel.add_NLO()
2664@@ -1294,6 +1304,7 @@
2665 helas.name, helas.structure, error)
2666 raise InvalidModel, text
2667
2668+
2669
2670
2671 # Now consider the name only
2672@@ -1319,10 +1330,18 @@
2673 coupling_sign = ''
2674 for coupling in couplings:
2675 order = tuple(coupling.order.items())
2676- if '1' in order:
2677+
2678+ if '1' in coupling.order:
2679 raise InvalidModel, '''Some couplings have \'1\' order.
2680 This is not allowed in MG.
2681 Please defines an additional coupling to your model'''
2682+ # check that gluon emission from quark are QCD tagged
2683+ if 21 in [particle.pdg_code for particle in interaction_info.particles] and\
2684+ 'QCD' not in coupling.order:
2685+ col = [par.get('color') for par in particles]
2686+ if 1 not in col:
2687+ self.non_qcd_gluon_emission +=1
2688+
2689 if order in order_to_int:
2690 order_to_int[order].get('couplings')[key] = '%s%s' % \
2691 (coupling_sign,coupling.name)
2692@@ -1340,7 +1359,8 @@
2693 order_to_int[order] = interaction
2694 # add to the interactions
2695 self.interactions.append(interaction)
2696-
2697+
2698+
2699 # check if this interaction conserve the charge defined
2700 # if type=='base':
2701 for charge in list(self.conservecharge): #duplicate to allow modification
2702@@ -1353,7 +1373,7 @@
2703 if abs(total) > 1e-12:
2704 logger.info('The model has interaction violating the charge: %s' % charge)
2705 self.conservecharge.discard(charge)
2706-
2707+
2708
2709
2710 def get_sign_flow(self, flow, nb_fermion):
2711@@ -1940,6 +1960,7 @@
2712 logger.debug('coupling with small value %s: %s treated as zero' %
2713 (name, value))
2714 zero_coupling.append(name)
2715+ continue
2716 elif not strict_zero and abs(value) < 1e-10:
2717 return self.detect_identical_couplings(strict_zero=True)
2718
2719@@ -2234,8 +2255,10 @@
2720 else:
2721 arg = 'width'
2722 change_name = [p.name for (p,f) in parameters[1:]]
2723+ factor_for_name = [f for (p,f) in parameters[1:]]
2724 [p.set(arg, new_name) for p in self['particle_dict'].values()
2725- if p[arg] in change_name]
2726+ if p[arg] in change_name and
2727+ factor_for_name[change_name.index(p[arg])]==1]
2728
2729 def remove_interactions(self, zero_couplings):
2730 """ remove the interactions and particle counterterms
2731
2732=== modified file 'models/write_param_card.py'
2733--- models/write_param_card.py 2018-12-05 10:22:23 +0000
2734+++ models/write_param_card.py 2019-06-27 13:48:48 +0000
2735@@ -242,6 +242,7 @@
2736
2737 if lhablock == 'MASS':
2738 data = self.dep_mass
2739+ #misc.sprint(data)
2740 prefix = " "
2741 elif lhablock == 'DECAY':
2742 data = self.dep_width
2743@@ -266,7 +267,7 @@
2744 if self.model['parameter_dict'][param.name].imag:
2745 raise ParamCardWriterError, 'All Mass/Width Parameter should be real (not the case for %s)'%param.name
2746 value = complex(self.model['parameter_dict'][param.name]).real
2747- text += """%s %s %f # %s : %s \n""" %(prefix, part["pdg_code"],
2748+ text += """%s %s %e # %s : %s \n""" %(prefix, part["pdg_code"],
2749 value, part["name"], param.expr.replace('mdl_',''))
2750
2751 # Add duplicate parameter
2752@@ -281,9 +282,9 @@
2753 if self.model['parameter_dict'][param.name].imag:
2754 raise ParamCardWriterError, 'All Mass/Width Parameter should be real'
2755 value = complex(self.model['parameter_dict'][param.name]).real
2756- text += """%s %s %f # %s : %s \n""" %(prefix, part["pdg_code"],
2757+ text += """%s %s %e # %s : %s \n""" %(prefix, part["pdg_code"],
2758 value, part["name"], part[name].replace('mdl_',''))
2759-
2760+
2761 if not text:
2762 return
2763
2764
2765=== modified file 'tests/acceptance_tests/test_cmd.py'
2766--- tests/acceptance_tests/test_cmd.py 2018-03-09 15:38:21 +0000
2767+++ tests/acceptance_tests/test_cmd.py 2019-06-27 13:48:48 +0000
2768@@ -1089,12 +1089,12 @@
2769 'lib', 'libpdf.a')))
2770 # Check that combine_events, gen_ximprove, combine_runs
2771 # compile
2772- status = subprocess.call(['make', '../bin/internal/combine_events'],
2773- stdout=devnull,
2774- cwd=os.path.join(self.out_dir, 'Source'))
2775- self.assertEqual(status, 0)
2776- self.assertTrue(os.path.exists(os.path.join(self.out_dir,
2777- 'bin','internal', 'combine_events')))
2778+ #status = subprocess.call(['make', '../bin/internal/combine_events'],
2779+ # stdout=devnull,
2780+ # cwd=os.path.join(self.out_dir, 'Source'))
2781+ #self.assertEqual(status, 0)
2782+ #self.assertTrue(os.path.exists(os.path.join(self.out_dir,
2783+ # 'bin','internal', 'combine_events')))
2784 status = subprocess.call(['make', '../bin/internal/gen_ximprove'],
2785 stdout=devnull,
2786 cwd=os.path.join(self.out_dir, 'Source'))
2787
2788=== modified file 'tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_nogroup/matrix.f'
2789--- tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_nogroup/matrix.f 2018-11-08 22:24:49 +0000
2790+++ tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_nogroup/matrix.f 2019-06-27 13:48:48 +0000
2791@@ -152,8 +152,8 @@
2792 JHEL = 1
2793 IF(NTRY.LE.MAXTRIES)THEN
2794 DO I=1,NCOMB
2795- IF (.NOT.GOODHEL(I) .AND. (TS(I).GT.ANS*LIMHEL/NCOMB))
2796- $ THEN
2797+ IF (.NOT.GOODHEL(I) .AND. (DABS(TS(I)).GT.ANS*LIMHEL
2798+ $ /NCOMB)) THEN
2799 GOODHEL(I)=.TRUE.
2800 NGOOD = NGOOD +1
2801 IGOOD(NGOOD) = I
2802
2803=== modified file 'tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/CKKWL_djrs_output.gnuplot'
2804--- tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/CKKWL_djrs_output.gnuplot 2016-08-23 02:41:28 +0000
2805+++ tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/CKKWL_djrs_output.gnuplot 2019-06-27 13:48:48 +0000
2806@@ -26,62 +26,61 @@
2807 # color-blind individuals with either protanopia or deuteranopia. Bang
2808 # Wong [2011] Nature Methods 8, 441.
2809
2810-set style line 1 lt 1 lc rgb "#009e73" lw 1.3
2811+set style line 1 lt 1 lc rgb "#009e73" lw 1.3
2812 set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3)
2813-set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
2814-set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
2815-set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
2816-set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
2817-
2818-set style line 2 lt 1 lc rgb "#0072b2" lw 1.3
2819-set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
2820-set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
2821-set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
2822-set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
2823-set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
2824-
2825-
2826-set style line 3 lt 1 lc rgb "#d55e00" lw 1.3
2827+set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
2828+set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
2829+set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
2830+set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
2831+
2832+set style line 2 lt 1 lc rgb "#0072b2" lw 1.3
2833+set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
2834+set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
2835+set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
2836+set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
2837+set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
2838+
2839+set style line 3 lt 1 lc rgb "#d55e00" lw 1.3
2840 set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3)
2841-set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
2842-set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
2843-set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
2844-set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
2845-
2846-set style line 4 lt 1 lc rgb "#f0e442" lw 1.3
2847-set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
2848-set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
2849-set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
2850-set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
2851-set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
2852-
2853-set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3
2854-set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
2855-set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
2856-set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
2857-set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
2858-set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
2859-
2860-set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3
2861-set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
2862-set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
2863-set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
2864-set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
2865-set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
2866-
2867-set style line 7 lt 1 lc rgb "#e69f00" lw 1.3
2868-set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
2869-set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
2870-set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
2871-set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
2872-set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
2873-
2874-set style line 8 lt 1 lc rgb "black" lw 1.3
2875-set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
2876-set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
2877-set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
2878-set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
2879-set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
2880+set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
2881+set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
2882+set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
2883+set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
2884+
2885+set style line 4 lt 1 lc rgb "#f0e442" lw 1.3
2886+set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
2887+set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
2888+set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
2889+set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
2890+set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
2891+
2892+set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3
2893+set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
2894+set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
2895+set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
2896+set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
2897+set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
2898+
2899+set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3
2900+set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
2901+set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
2902+set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
2903+set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
2904+set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
2905+
2906+set style line 7 lt 1 lc rgb "#e69f00" lw 1.3
2907+set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
2908+set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
2909+set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
2910+set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
2911+set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
2912+
2913+set style line 8 lt 1 lc rgb "black" lw 1.3
2914+set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
2915+set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
2916+set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
2917+set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
2918+set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
2919
2920
2921 set style line 999 lt 1 lc rgb "gray" lw 1.3
2922
2923=== modified file 'tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/MLM_djrs_output.gnuplot'
2924--- tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/MLM_djrs_output.gnuplot 2016-08-23 02:41:28 +0000
2925+++ tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/MLM_djrs_output.gnuplot 2019-06-27 13:48:48 +0000
2926@@ -26,62 +26,61 @@
2927 # color-blind individuals with either protanopia or deuteranopia. Bang
2928 # Wong [2011] Nature Methods 8, 441.
2929
2930-set style line 1 lt 1 lc rgb "#009e73" lw 1.3
2931+set style line 1 lt 1 lc rgb "#009e73" lw 1.3
2932 set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3)
2933-set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
2934-set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
2935-set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
2936-set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
2937-
2938-set style line 2 lt 1 lc rgb "#0072b2" lw 1.3
2939-set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
2940-set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
2941-set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
2942-set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
2943-set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
2944-
2945-
2946-set style line 3 lt 1 lc rgb "#d55e00" lw 1.3
2947+set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
2948+set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
2949+set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
2950+set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
2951+
2952+set style line 2 lt 1 lc rgb "#0072b2" lw 1.3
2953+set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
2954+set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
2955+set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
2956+set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
2957+set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
2958+
2959+set style line 3 lt 1 lc rgb "#d55e00" lw 1.3
2960 set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3)
2961-set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
2962-set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
2963-set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
2964-set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
2965-
2966-set style line 4 lt 1 lc rgb "#f0e442" lw 1.3
2967-set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
2968-set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
2969-set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
2970-set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
2971-set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
2972-
2973-set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3
2974-set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
2975-set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
2976-set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
2977-set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
2978-set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
2979-
2980-set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3
2981-set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
2982-set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
2983-set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
2984-set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
2985-set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
2986-
2987-set style line 7 lt 1 lc rgb "#e69f00" lw 1.3
2988-set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
2989-set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
2990-set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
2991-set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
2992-set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
2993-
2994-set style line 8 lt 1 lc rgb "black" lw 1.3
2995-set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
2996-set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
2997-set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
2998-set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
2999-set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
3000+set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
3001+set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
3002+set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
3003+set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
3004+
3005+set style line 4 lt 1 lc rgb "#f0e442" lw 1.3
3006+set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
3007+set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
3008+set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
3009+set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
3010+set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
3011+
3012+set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3
3013+set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
3014+set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
3015+set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
3016+set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
3017+set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
3018+
3019+set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3
3020+set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
3021+set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
3022+set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
3023+set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
3024+set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
3025+
3026+set style line 7 lt 1 lc rgb "#e69f00" lw 1.3
3027+set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
3028+set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
3029+set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
3030+set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
3031+set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
3032+
3033+set style line 8 lt 1 lc rgb "black" lw 1.3
3034+set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
3035+set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
3036+set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
3037+set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
3038+set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
3039
3040
3041 set style line 999 lt 1 lc rgb "gray" lw 1.3
3042
3043=== modified file 'tests/input_files/IOTestsComparison/IOTest_Histogram/gnuplot_histo_output/HistoOut.gnuplot'
3044--- tests/input_files/IOTestsComparison/IOTest_Histogram/gnuplot_histo_output/HistoOut.gnuplot 2016-06-09 00:59:23 +0000
3045+++ tests/input_files/IOTestsComparison/IOTest_Histogram/gnuplot_histo_output/HistoOut.gnuplot 2019-06-27 13:48:48 +0000
3046@@ -26,62 +26,61 @@
3047 # color-blind individuals with either protanopia or deuteranopia. Bang
3048 # Wong [2011] Nature Methods 8, 441.
3049
3050-set style line 1 lt 1 lc rgb "#009e73" lw 1.3
3051+set style line 1 lt 1 lc rgb "#009e73" lw 1.3
3052 set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3)
3053-set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
3054-set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
3055-set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
3056-set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
3057-
3058-set style line 2 lt 1 lc rgb "#0072b2" lw 1.3
3059-set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
3060-set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
3061-set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
3062-set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
3063-set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
3064-
3065-
3066-set style line 3 lt 1 lc rgb "#d55e00" lw 1.3
3067+set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3)
3068+set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2)
3069+set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1)
3070+set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3)
3071+
3072+set style line 2 lt 1 lc rgb "#0072b2" lw 1.3
3073+set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3)
3074+set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3)
3075+set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2)
3076+set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1)
3077+set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3)
3078+
3079+set style line 3 lt 1 lc rgb "#d55e00" lw 1.3
3080 set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3)
3081-set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
3082-set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
3083-set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
3084-set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
3085-
3086-set style line 4 lt 1 lc rgb "#f0e442" lw 1.3
3087-set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
3088-set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
3089-set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
3090-set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
3091-set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
3092-
3093-set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3
3094-set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
3095-set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
3096-set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
3097-set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
3098-set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
3099-
3100-set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3
3101-set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
3102-set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
3103-set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
3104-set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
3105-set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
3106-
3107-set style line 7 lt 1 lc rgb "#e69f00" lw 1.3
3108-set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
3109-set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
3110-set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
3111-set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
3112-set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
3113-
3114-set style line 8 lt 1 lc rgb "black" lw 1.3
3115-set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
3116-set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
3117-set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
3118-set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
3119-set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
3120+set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3)
3121+set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2)
3122+set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1)
3123+set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3)
3124+
3125+set style line 4 lt 1 lc rgb "#f0e442" lw 1.3
3126+set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3)
3127+set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3)
3128+set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2)
3129+set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1)
3130+set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3)
3131+
3132+set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3
3133+set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3)
3134+set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3)
3135+set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2)
3136+set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1)
3137+set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3)
3138+
3139+set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3
3140+set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3)
3141+set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3)
3142+set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2)
3143+set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1)
3144+set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3)
3145+
3146+set style line 7 lt 1 lc rgb "#e69f00" lw 1.3
3147+set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3)
3148+set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3)
3149+set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2)
3150+set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1)
3151+set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3)
3152+
3153+set style line 8 lt 1 lc rgb "black" lw 1.3
3154+set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3)
3155+set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3)
3156+set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2)
3157+set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1)
3158+set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3)
3159
3160
3161 set style line 999 lt 1 lc rgb "gray" lw 1.3
3162
3163=== modified file 'tests/time_db'
3164--- tests/time_db 2018-11-09 20:46:26 +0000
3165+++ tests/time_db 2019-06-27 13:48:48 +0000
3166@@ -1,5 +1,5 @@
3167 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasDiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000161170959473
3168-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_madweight_card>]> 0.015398979187
3169+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464
3170 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_add>]> 0.0435810089111
3171 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_remove_line>]> 8.89301300049e-05
3172 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_get_length>]> 0.000235080718994
3173@@ -45,16 +45,17 @@
3174 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_gg_ng>]> 1.61963582039
3175 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sm>]> 6.53617286682
3176 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_put_parameters_to_zero>]> 0.0871658325195
3177-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000128984451294
3178 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_InvalidCmd>]> 0.300333976746
3179 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order3>]> 0.0537929534912
3180 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_python>]> 0.000648021697998
3181 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_generate>]> 0.143531084061
3182+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_float_handling>]> 0.000519990921021
3183 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOTestMadLoopSquaredOrdersExport testMethod=testIO_ProcOutputIOTests>]> 5.7862739563
3184 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_part_antipart_after_output>]> 0.00266885757446
3185 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_four_fermion_vertex_normal_fermion_flow>]> 0.0366899967194
3186 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_epem_elpelmepem>]> 0.0915629863739
3187 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFVC>]> 0.0635468959808
3188+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_identify_particle>]> 0.0015971660614
3189 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_group_channels2amplitudes>]> 0.346367835999
3190 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_wmdxu>]> 27.2295429707
3191 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_file_writers.FortranWriterTest testMethod=test_write_fortran_error>]> 0.000140190124512
3192@@ -65,7 +66,6 @@
3193 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_decay_chain_pp_jj>]> 0.284907102585
3194 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_particle>]> 0.000303030014038
3195 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.00014591217041
3196-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_complex_mass_scheme>]> 0.095272064209
3197 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_matrix_element_fks_EW>]> 4.6968460083e-05
3198 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_e_e_collision>]> 36.1715919971
3199 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_f_d_product>]> 0.00230002403259
3200@@ -136,6 +136,7 @@
3201 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_emep_emep>]> 0.00920605659485
3202 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_decay_chains>]> 0.378351926804
3203 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_color_flow_string>]> 0.00816702842712
3204+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_particle_list>]> 0.000241994857788
3205 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_part_spin32propagator>]> 0.0205278396606
3206 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.TestMadWeight testMethod=test_mw_wproduction>]> 11.4712297916
3207 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_decayBW_file_EW>]> 0.00243401527405
3208@@ -166,14 +167,12 @@
3209 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_replace_indices>]> 0.000101089477539
3210 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestImportUFO testMethod=test_simple_import>]> 0.130714893341
3211 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_jet_veto_xsec>]> 49.1917068958
3212-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_Plorentz>]> 0.0777571201324
3213 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.ProcCardV4ReaderTest testMethod=test_check_init>]> 0.0175278186798
3214 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_uu_to_tt_sch>]> 0.152179956436
3215 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWrapped>]> 0.00549483299255
3216 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization5>]> 0.000308036804199
3217 <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_get_final_state_particle>]> 0.134166002274
3218 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gd_ggd>]> 0.405319929123
3219-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=test_obj_are_not_modified>]> 0.000224113464355
3220 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_decay_chain_and_fermion_flow>]> 0.0173728466034
3221 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_decay_chain>]> 0.0154418945312
3222 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_vertex_at_level>]> 0.00156879425049
3223@@ -186,7 +185,6 @@
3224 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator5>]> 0.16034078598
3225 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massivecase>]> 0.000519037246704
3226 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_lh_order>]> 0.000610113143921
3227-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testEpsilonProperty>]> 0.054888010025
3228 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gd_gd>]> 2.84897994995
3229 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_representation>]> 0.389190196991
3230 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_generate_events_shower_scripts>]> 85.5048270226
3231@@ -198,10 +196,10 @@
3232 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_ttx_wpwm_QED>]> 0.00127792358398
3233 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_color_string_canonical>]> 0.000113010406494
3234 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestBlock testMethod=test_block_str>]> 6.41345977783e-05
3235+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_histograms.IOHistogramTest testMethod=testIO_DJR_histograms>]> 6.34016513824
3236 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_find_optimal_order>]> 0.190226793289
3237-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_setget_multi_leg_correct>]> 6.60419464111e-05
3238 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_creating_matched_plot>]> 59.4369688034
3239-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_fortran>]> 0.0229299068451
3240+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_full_sm_aloha>]> 1.30430817604
3241 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestBenchmarkModel testMethod=test_use_as_benchmark>]> 0.165615081787
3242 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess_add>]> 0.199738025665
3243 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_httx>]> 33.0537629128
3244@@ -221,10 +219,11 @@
3245 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pmass_file_EW>]> 0.000478029251099
3246 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_projector>]> 0.00798106193542
3247 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_fortranwriter_C>]> 0.0338780879974
3248+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_multiprocess>]> 0.708781957626
3249 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_ij_lines_EW>]> 0.0349681377411
3250-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_props_file_born>]> 0.00461411476135
3251+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_F77writer_complex_mass_scheme>]> 0.0230450630188
3252 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_initial_setups>]> 0.125522851944
3253-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_maxconfigs>]> 0.00495791435242
3254+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_fortran>]> 0.0229299068451
3255 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_max_WEIGHTED>]> 0.000354051589966
3256 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_orders>]> 0.0471241474152
3257 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_6_e90>]> 96.6206810474
3258@@ -236,10 +235,11 @@
3259 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_read_param_card>]> 2.07473993301
3260 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testGammaAlgebraDefinition>]> 1.02981591225
3261 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_write_orders>]> 0.00100803375244
3262-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestExtendedCmd testMethod=test_the_exit_from_child_cmd2>]> 0.000120162963867
3263+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_short_cross_gauge>]> 115.8441329
3264 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_identical_parameters>]> 0.0867898464203
3265-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024
3266+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_write>]> 7.00950622559e-05
3267 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testequality>]> 0.000180006027222
3268+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_process_overall_orders>]> 0.876585006714
3269 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_begin_end_wrong_input>]> 0.000144958496094
3270 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_full_write>]> 0.0754480361938
3271 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_sm_equivalence>]> 0.110821008682
3272@@ -248,7 +248,7 @@
3273 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization3>]> 0.000184774398804
3274 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_sort_fks_proc>]> 0.163259029388
3275 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures>]> 0.016254901886
3276-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_F77writer_complex_mass_scheme>]> 0.0230450630188
3277+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_props_file_born>]> 0.00461411476135
3278 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_pythia8_export_functions>]> 0.0397579669952
3279 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_leg_list>]> 0.000253915786743
3280 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_wavefunctions testMethod=test_short_IR>]> 0.0010769367218
3281@@ -258,9 +258,11 @@
3282 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order1>]> 0.0381689071655
3283 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_8fs>]> 0.104753017426
3284 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_colorize_uux_ggg>]> 0.0345070362091
3285+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_maxconfigs>]> 0.00495791435242
3286 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_matrix_element_v4_standalone>]> 0.0386159420013
3287 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter>]> 0.0264060497284
3288 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_complete_decay_chain_process>]> 0.748803853989
3289+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322
3290 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_split>]> 85.3567028046
3291 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_horizontal_mode>]> 0.00118708610535
3292 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm_nobmass>]> 0.0748410224915
3293@@ -278,9 +280,9 @@
3294 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.Testmadweight testMethod=test_tt_semi>]> 8.710709095
3295 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddmult>]> 0.000133991241455
3296 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_add_external_parameters>]> 0.000850200653076
3297-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct_MP>]> 0.0654561519623
3298 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_ddx_uux>]> 1.11160707474
3299 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gg_wpwmttx>]> 1.00893592834
3300+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_values_for_prop>]> 0.000379085540771
3301 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_param_card>]> 0.0154800415039
3302 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testmassisdiffaswidth>]> 0.000320911407471
3303 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_shell_string>]> 0.000377893447876
3304@@ -318,8 +320,9 @@
3305 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_expand_veto>]> 0.00188112258911
3306 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_dec_multiprocess_files>]> 0.481742143631
3307 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_amcatnlo_from_file>]> 71.3001720905
3308+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.TestIdentifyMETag testMethod=test_identify_me_tag_qq_qqg>]> 0.144216060638
3309 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization>]> 0.000678062438965
3310-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_process_overall_orders>]> 0.876585006714
3311+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_complex_mass_scheme>]> 0.095272064209
3312 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_identical_parameters>]> 0.0875990390778
3313 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_phi4_vertex>]> 0.000259876251221
3314 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_dictionaries>]> 0.000564098358154
3315@@ -336,17 +339,16 @@
3316 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_parity_for_epsilon>]> 0.000375032424927
3317 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pdf_wrapper_EW>]> 0.0362520217896
3318 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_fermion_flow_clash>]> 0.034786939621
3319-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_short_cross_gauge>]> 115.8441329
3320+<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestExtendedCmd testMethod=test_the_exit_from_child_cmd2>]> 0.000120162963867
3321 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_Cppwriter_C>]> 0.034628868103
3322 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_nlo_hw6_split>]> 93.4157910347
3323 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000109910964966
3324 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_leshouche_info_file_EW>]> 0.0766789913177
3325 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testConjugateOperator>]> 0.0886290073395
3326-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.000133991241455
3327-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_multiprocess>]> 0.708781957626
3328+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000128984451294
3329+<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_madweight_card>]> 0.015398979187
3330 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_decay_chain>]> 8.23388409615
3331 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uxu_zz_QCD>]> 0.00123119354248
3332-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_complex_equality>]> 0.453453063965
3333 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_FFVC>]> 0.0554978847504
3334 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_setget_channel>]> 0.227739095688
3335 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py6_analyse>]> 0.000179052352905
3336@@ -363,7 +365,6 @@
3337 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_getsetvertexlist_exceptions>]> 0.110853910446
3338 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_generate_events_nlo_py6pt_fsr>]> 40.1788899899
3339 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_make_valid>]> 0.00246596336365
3340-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00015115737915
3341 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFV2C1>]> 0.00976991653442
3342 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_standalone_cpp_output_consistency>]> 16.2466862202
3343 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_uuxa_QCD_QED>]> 0.00129103660583
3344@@ -373,7 +374,7 @@
3345 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.TestDiagramTag testMethod=test_diagram_tag_to_diagram_uux_nglue>]> 0.129276990891
3346 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_jet_veto_xsec>]> 61.7360379696
3347 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_epem_aaa>]> 0.317636966705
3348-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_generating_dict_to_0>]> 0.000486850738525
3349+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_change_number_format_python>]> 0.000586986541748
3350 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.HelasModelTest testMethod=test_set_wavefunctions>]> 0.00166797637939
3351 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T6_simplify>]> 0.00021505355835
3352 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=test_short_obj_are_not_modified>]> 0.000195980072021
3353@@ -383,9 +384,11 @@
3354 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_config_iadd>]> 9.70363616943e-05
3355 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasintersection>]> 0.00135803222656
3356 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hhh_EW>]> 179.770503998
3357+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_zzz>]> 28.6060318947
3358 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_load_feynman>]> 0.416143894196
3359 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_handling_list_of_values>]> 0.000817060470581
3360 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_check_eejjj_lo_lhapdf>]> 63.6095659733
3361+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000134944915771
3362 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_4_e500>]> 21.2130401134
3363 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestBenchmarkModel testMethod=test_model_name>]> 0.19921207428
3364 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000181913375854
3365@@ -406,7 +409,6 @@
3366 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_findchannels>]> 8.38987207413
3367 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummulvar>]> 0.000131845474243
3368 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_singletop_fastjet>]> 140.989368916
3369-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_find_symmetry_uu_tt_with_subprocess_group>]> 0.0958831310272
3370 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection_failure>]> 0.000155925750732
3371 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_mssm_subset_creation>]> 0.190835952759
3372 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_process>]> 1.05374503136
3373@@ -424,7 +426,7 @@
3374 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_VVS1>]> 0.028205871582
3375 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_restrict_from_a_param_card>]> 0.106390953064
3376 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.TestFKSOutput testMethod=test_w_nlo_gen>]> 0.38791513443
3377-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_multidiagram_decay_chains>]> 0.431716918945
3378+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_heft>]> 10.1859381199
3379 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_color_links>]> 0.00164699554443
3380 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testdealingwithpower3>]> 0.0140371322632
3381 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_hh_hh_QED>]> 0.00143194198608
3382@@ -468,6 +470,7 @@
3383 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=test_power>]> 0.000131845474243
3384 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarmult>]> 9.3936920166e-05
3385 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_aa_ttxa_QED>]> 0.00152993202209
3386+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_loop_induced>]> 50.1276230812
3387 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_VVS>]> 0.0257358551025
3388 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domainintersection>]> 0.000596046447754
3389 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_group_subprocs_and_get_diagram_maps>]> 0.33548283577
3390@@ -491,7 +494,7 @@
3391 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_timing_epem_ttx>]> 14.4036149979
3392 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.LoopDiagramDrawerTest testMethod=test_fuse_line>]> 0.00980591773987
3393 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_dxuhuuuxdx_guhuuux>]> 1.06607508659
3394-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_histograms.IOHistogramTest testMethod=testIO_DJR_histograms>]> 6.34016513824
3395+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.000133991241455
3396 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_den_factor_lines_EW>]> 2.82828497887
3397 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell1 testMethod=test_import_model>]> 0.106930971146
3398 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testgetrepresentation>]> 0.002366065979
3399@@ -507,6 +510,7 @@
3400 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_ij_lines>]> 0.0146369934082
3401 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testmultvarMult>]> 0.000117063522339
3402 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_oneloop_reweighting>]> 0.519333124161
3403+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_integer_handling>]> 0.00176501274109
3404 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_find_reals>]> 0.0384328365326
3405 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.security_issue.TestSecurity testMethod=test_security_scan>]> 0.276997804642
3406 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.010556936264
3407@@ -518,48 +522,47 @@
3408 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testbasicoperation>]> 0.000247955322266
3409 <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_get_proc_with_decay_NLO>]> 0.584362983704
3410 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm2>]> 23.508852005
3411-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_delta6_simplify>]> 8.51154327393e-05
3412 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_sign_flips_to_order>]> 8.08238983154e-05
3413 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_Fortranwriter_spin3half>]> 0.154531002045
3414 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_wa_refine>]> 11.0905270576
3415 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_cpp>]> 0.000547170639038
3416-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fksreal>]> 13.9149849415
3417+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00015115737915
3418 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_nfksconfigs_file>]> 0.0158369541168
3419 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_ref_dict_multiple_interactions>]> 0.000741004943848
3420 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=test_short_power>]> 0.000148057937622
3421 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_generate_helas_diagrams_uux_gepem_no_optimization>]> 0.0189230442047
3422 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_fks_real_process_get_leg_i_j>]> 0.0138988494873
3423 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_photons>]> 0.107678890228
3424+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_dxd_gz>]> 2.18089485168
3425 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummultmul>]> 0.000133991241455
3426 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hh_EW>]> 13.6150200367
3427 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_amcantlo_script>]> 46.4756779671
3428 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_enu_enu>]> 0.008131980896
3429 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_coeff_string>]> 0.028568983078
3430-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464
3431-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_mssm>]> 11.2124068737
3432+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct_MP>]> 0.0654561519623
3433 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_short_gauge_loop>]> 37.5182161331
3434 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_base_amplitude>]> 0.140361070633
3435 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_sum_object>]> 0.000658988952637
3436 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_standard>]> 3.79085540771e-05
3437 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_semi>]> 125.299013853
3438-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833
3439 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportMatchBox testMethod=test_write_match_go_process_cc_file>]> 0.0377099514008
3440 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_cpp>]> 0.0238170623779
3441 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_4g_decay_chain_process>]> 0.395421028137
3442 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_error_particle_save>]> 4.19616699219e-05
3443 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uu_susug>]> 0.0533299446106
3444+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604
3445 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_madspin_ON_and_onshell_atNLO>]> 0.381196022034
3446 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_define_order>]> 0.214026927948
3447 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_python_routine_are_exec>]> 0.00516891479492
3448-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_gg_ggg>]> 0.128249883652
3449+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection>]> 0.000416040420532
3450 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_histograms.IOTest_Histogram testMethod=testIO_gnuplot_histo_output>]> 0.224948883057
3451 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF3>]> 0.325031042099
3452 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_reweighting_comb>]> 7.06551980972
3453 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_get_max_level>]> 0.132587909698
3454-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_isexternal>]> 0.000101089477539
3455+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_fermion_flow>]> 0.00178098678589
3456 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hwpp>]> 0.000180959701538
3457 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj>]> 0.145397901535
3458-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_nogroup>]> 0.109572172165
3459+<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_ga_EW>]> 15.2475500107
3460 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.IOImportV4Test testMethod=test_read_particles>]> 0.000508069992065
3461 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest2 testMethod=test_change_to_complex_mass_scheme>]> 0.152688980103
3462 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_cms_aem_emvevex>]> 0.289308071136
3463@@ -582,9 +585,9 @@
3464 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_epem_ddx>]> 0.67814207077
3465 <__main__.TestSuiteModified tests=[<tests.unit_tests.madevent.test_combine_runs.TestCombineRuns testMethod=test_get_fortran_str>]> 0.000144004821777
3466 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_udx_htbx>]> 12.6998720169
3467-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_link_gghgg_gghg>]> 0.115737915039
3468+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_ppgogo_amcatnlo_nlo>]> 56.4734661579
3469 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWWW>]> 0.0192968845367
3470-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_reweighting>]> 15.5831661224
3471+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116
3472 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_for_loop>]> 0.000102043151855
3473 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator4>]> 0.025171995163
3474 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_FO_analyse_card.TestFOAnalyseCard testMethod=test_analyse_card_analyse>]> 0.000509977340698
3475@@ -609,7 +612,7 @@
3476 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_uuddg_uudd>]> 0.0242109298706
3477 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_representation>]> 0.00148892402649
3478 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF>]> 0.00619888305664
3479-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_gg_gogog_QCD>]> 258.932424068
3480+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_complex_equality>]> 0.453453063965
3481 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_gg_ggg>]> 0.137652873993
3482 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization4>]> 0.000862836837769
3483 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_expand_list>]> 0.00167798995972
3484@@ -617,7 +620,7 @@
3485 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testEinsteinsum>]> 0.00415802001953
3486 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_epem_EW>]> 7.10565686226
3487 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_histograms.TestHistograms testMethod=test_histograms_operations>]> 0.181525945663
3488-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00219416618347
3489+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419
3490 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sqso1>]> 0.000553131103516
3491 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testtensorialproductspin>]> 0.070338010788
3492 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_shower_scripts>]> 107.744693995
3493@@ -634,13 +637,13 @@
3494 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_setget_process_exceptions>]> 0.000452041625977
3495 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.ExportUFOModelPythia8Test testMethod=test_write_pythia8_parameter_files>]> 0.082643032074
3496 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasordinate>]> 0.00022292137146
3497-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_change_number_format_python>]> 0.000586986541748
3498+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_generating_dict_to_0>]> 0.000486850738525
3499 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvaradd>]> 9.3936920166e-05
3500 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator3>]> 0.0580358505249
3501 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_model_initialization>]> 0.000297069549561
3502 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_has_symmetries>]> 0.000720024108887
3503 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testlistindices>]> 0.00581979751587
3504-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322
3505+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_find_symmetry_uu_tt_with_subprocess_group>]> 0.0958831310272
3506 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_ufo_aloha>]> 1.4953649044
3507 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_py6_stdhep>]> 107.259223938
3508 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_decaytable_string>]> 0.357012033463
3509@@ -655,7 +658,6 @@
3510 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_power>]> 0.000319957733154
3511 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_set>]> 45.5628159046
3512 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0103709697723
3513-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116
3514 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_born_fks>]> 0.057590007782
3515 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups>]> 7.51800894737
3516 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_uux_ddx>]> 2.72820210457
3517@@ -679,7 +681,7 @@
3518 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_ML5EW_gg_ttxh_QCD>]> 0.000695943832397
3519 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hwpp_analyse>]> 0.000179052352905
3520 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSProcess_gggg>]> 0.369121789932
3521-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_Fortranwriter_spin3half>]> 0.141327142715
3522+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_gg_gogog_QCD>]> 258.932424068
3523 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_calculate_xsect_script>]> 54.8990449905
3524 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_add_std_diagram>]> 0.336571931839
3525 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_non_integer_external>]> 0.000808000564575
3526@@ -690,10 +692,10 @@
3527 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_hw6_set>]> 102.896171808
3528 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_helas_diagrams_gg_gogo_go_tt1x_t_wpb>]> 0.0463981628418
3529 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_find_vertexlist>]> 0.113565921783
3530-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_heft_multiparticle_pp_hnj>]> 0.326533079147
3531+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_ga_QCD_QED>]> 0.00132417678833
3532 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_save_load>]> 1.68547606468
3533 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testemptyisFalse>]> 6.60419464111e-05
3534-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604
3535+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_special_parameters>]> 0.0848360061646
3536 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_coeff_string>]> 0.0342230796814
3537 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_script>]> 30.6620099545
3538 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_13>]> 41.2373769283
3539@@ -701,13 +703,13 @@
3540 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_attx>]> 40.257420063
3541 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.HelasModelTest testMethod=test_setget_helas_model_error>]> 0.00156712532043
3542 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testsetrepresentation>]> 0.00262403488159
3543-<__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_export_v4.TestMadWeight testMethod=test_modification_to_cuts>]> 0.0898389816284
3544 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_no_cutting_line>]> 0.0152459144592
3545 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_group_decay_chains>]> 0.305987119675
3546 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_regular_expression_propa>]> 0.000612020492554
3547 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_sort_proc>]> 0.0744910240173
3548-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_full_sm_aloha>]> 1.30430817604
3549+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_mssm>]> 11.2124068737
3550 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_setget_interaction_exceptions>]> 0.000231027603149
3551+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_multistage_decay_chain_process>]> 0.127142906189
3552 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_launch_amcatnlo_name>]> 68.1794371605
3553 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_auto_handling>]> 0.000450134277344
3554 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_za_QED>]> 0.0014591217041
3555@@ -717,7 +719,6 @@
3556 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4IOTest testMethod=testIO_export_matrix_element_v4_madevent_group>]> 0.124577045441
3557 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_wpwmbbx>]> 61.837485075
3558 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_export_matrix_element_python_madevent_group>]> 0.0395710468292
3559-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.AlohaFortranWriterTest testMethod=test_header>]> 0.0467920303345
3560 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj_with_required_s_channel>]> 0.195080041885
3561 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFT2>]> 0.0807220935822
3562 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm_nomasses>]> 0.0792789459229
3563@@ -735,9 +736,9 @@
3564 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_fct>]> 0.220015048981
3565 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=test_split>]> 0.00737619400024
3566 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pdf_file_EW>]> 5.29289245605e-05
3567-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF3>]> 0.317361831665
3568-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_write>]> 7.00950622559e-05
3569-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups_modified_mssm_general>]> 8.70347595215
3570+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000127792358398
3571+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024
3572+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_delta6_simplify>]> 8.51154327393e-05
3573 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_def_position>]> 0.000124931335449
3574 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_sum_object>]> 0.000125885009766
3575 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_F77writer_feynman>]> 0.027764081955
3576@@ -745,26 +746,27 @@
3577 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_sborn_sf>]> 0.00146198272705
3578 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_subproc_group>]> 9.28846502304
3579 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_setget_process_definition_correct>]> 0.000485897064209
3580-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_ga_QCD_QED>]> 0.00132417678833
3581 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_madevent_directory>]> 16.0076999664
3582 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_get_name>]> 0.030855178833
3583 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator3>]> 0.0653259754181
3584 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_vertexlist>]> 1.92569303513
3585 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_values_for_prop>]> 8.10623168945e-05
3586 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_zccx>]> 41.9109280109
3587+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805
3588 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_loop_convert_diagram>]> 0.000792026519775
3589+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_heft_multiparticle_pp_hnj>]> 0.326533079147
3590 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_ug_ttxz>]> 0.11712884903
3591 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_equality>]> 0.000420093536377
3592 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddint>]> 9.20295715332e-05
3593 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0104720592499
3594 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_real_process_init>]> 0.16713809967
3595-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_zzz>]> 28.6060318947
3596+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_epem_ttxg_QED>]> 0.00109791755676
3597 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testequality>]> 0.000127077102661
3598 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdMatchBox testMethod=testIO_MatchBoxOutput>]> 3.16356706619
3599 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_get_fks_j_from_i_lines_EW>]> 7.70092010498e-05
3600 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_replace_make_opt_f_compiler>]> 0.0348589420319
3601 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_onshell_s_channel_uux_uuxng>]> 0.0812060832977
3602-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCallWriterTest testMethod=test_UFO_CPP_helas_call_writer>]> 0.0117120742798
3603+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF3>]> 0.317361831665
3604 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_singletop_fastjet>]> 152.502398014
3605 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_majorana_decay_chain_process>]> 0.136888980865
3606 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_madevent_ptj_bias>]> 75.3821110725
3607@@ -778,10 +780,10 @@
3608 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_multi_gluons>]> 0.251565933228
3609 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_equal_decay_chains>]> 0.134434938431
3610 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_name>]> 66.2333741188
3611+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p2>]> 750.973557949
3612 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_full_epem_ttx>]> 42.7599339485
3613 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_helper_lcm_functions>]> 0.000735998153687
3614 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarint>]> 6.48498535156e-05
3615-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_ML5EW_sm_vs_stored_ML5EW_sqso>]> 0.00940799713135
3616 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_representation>]> 0.000728130340576
3617 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_forbidden_s_channel_decay_chain>]> 0.0207369327545
3618 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_sqso_ddx_ddx_WEIGHTEDgt6>]> 20.8691658974
3619@@ -806,7 +808,7 @@
3620 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_mass_overmass>]> 0.00144410133362
3621 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_rambo_validity_check>]> 0.000271081924438
3622 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_get_final_ids_after_decay>]> 0.000993013381958
3623-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_particle_list>]> 0.000241994857788
3624+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_Fortranwriter_spin3half>]> 0.141327142715
3625 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultmult>]> 0.000176906585693
3626 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_ddxng>]> 0.179573059082
3627 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_mssm_22>]> 561.371481895
3628@@ -824,10 +826,10 @@
3629 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_get_rank>]> 0.103627204895
3630 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uux_gepem_no_optimization>]> 0.0196721553802
3631 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_VVS1>]> 0.0284140110016
3632-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_heft>]> 10.1859381199
3633+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_multidiagram_decay_chains>]> 0.431716918945
3634 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_cpp_go_process_cc_file>]> 0.0690608024597
3635 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_split_evt_gen_zeroev>]> 67.6156620979
3636-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testTraceofObject>]> 0.000325918197632
3637+<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_generate_reals_no_combine>]> 0.184464216232
3638 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_process_h_file>]> 0.0427629947662
3639 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_leshouche_sextet_diquarks>]> 2.94189381599
3640 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_FO_analyse_card.TestFOAnalyseCard testMethod=test_analyse_card_default>]> 0.000207901000977
3641@@ -850,7 +852,6 @@
3642 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_C>]> 0.0504019260406
3643 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_ttx_wpwm_EW>]> 20.03905797
3644 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel2 testMethod=test_read_param_card>]> 1.23990178108
3645-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_read_madgraph4_proc_card>]> 0.877720832825
3646 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_couplings>]> 0.000503063201904
3647 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWrappedWithReturnPath>]> 0.00258612632751
3648 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct>]> 0.000214099884033
3649@@ -878,7 +879,7 @@
3650 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_multiple_lorentz>]> 0.000393867492676
3651 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_values_for_prop>]> 0.110687971115
3652 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_get_fks_info_list>]> 0.993493080139
3653-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_fermion_flow>]> 0.00178098678589
3654+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_isexternal>]> 0.000101089477539
3655 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_launch_amcatnlo_name>]> 49.5285630226
3656 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_fortran>]> 0.000572919845581
3657 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_decay_width_nlo_model>]> 14.2313911915
3658@@ -894,7 +895,7 @@
3659 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_dxd_zgg>]> 39.1508870125
3660 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess>]> 0.970643043518
3661 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_modifparameter>]> 0.000886917114258
3662-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_multistage_decay_chain_process>]> 0.127142906189
3663+<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_link_gghgg_gghg>]> 0.115737915039
3664 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_get_s_and_t_channels.TestGetSandTchannels testMethod=test_get_s_and_t_ub_tdg>]> 0.11679315567
3665 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorTripletModel testMethod=test_ut_to_antitrip_g>]> 0.187545776367
3666 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_wpwm_hh_QED>]> 0.00102114677429
3667@@ -904,7 +905,7 @@
3668 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_projector>]> 0.00699806213379
3669 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWritting testMethod=test_write_block>]> 0.0758440494537
3670 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_output2>]> 43.6411170959
3671-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.TestIdentifyMETag testMethod=test_identify_me_tag_qq_qqg>]> 0.144216060638
3672+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testEpsilonProperty>]> 0.054888010025
3673 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorTripletModel testMethod=test_triplet_color_flow_output>]> 0.139855146408
3674 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestMadAnalysis5Card testMethod=test_MadAnalysis5Card>]> 0.000823974609375
3675 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_generate_reals_combine>]> 0.221959114075
3676@@ -926,6 +927,7 @@
3677 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_stdhep>]> 50.4594700336
3678 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_fuse_vertex>]> 0.000200033187866
3679 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_uux_t1t1x_QCD>]> 69.1381390095
3680+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madspin.TestMadSpin testMethod=test_hepmc_decay>]> 0.65887594223
3681 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_def_begin_end_point>]> 9.89437103271e-05
3682 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator>]> 0.128522157669
3683 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestMadSpinFCT_in_interface testMethod=test_get_final_part>]> 0.12849187851
3684@@ -934,7 +936,6 @@
3685 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_cross_gauge_p2>]> 26775.4375861
3686 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess_no_isr>]> 0.035425901413
3687 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_uux_QCD_QED>]> 0.00138115882874
3688-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_ppgogo_amcatnlo_nlo>]> 56.4734661579
3689 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_decayBW_file>]> 0.00429511070251
3690 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_stdhep>]> 10.500576973
3691 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8_analyse>]> 0.000602960586548
3692@@ -942,20 +943,19 @@
3693 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_butdg_butd>]> 0.0965809822083
3694 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_full_lept>]> 29.0376198292
3695 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_IdentifyHelasTag testMethod=test_helas_comparison>]> 0.225214958191
3696-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p2>]> 750.973557949
3697+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_define_not_dep_param>]> 0.0751221179962
3698 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_interaction>]> 0.000797033309937
3699 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_aloha_get_name>]> 0.0285120010376
3700 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_b_sf_fks>]> 2.02799201012
3701-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_wpwm_QCD>]> 0.00233387947083
3702 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_representation>]> 0.00421714782715
3703 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_info_file>]> 0.0922110080719
3704 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm>]> 0.0441629886627
3705-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_particles_type>]> 1.96593403816
3706+<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_help_category>]> 0.00062894821167
3707 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_uux_ga>]> 1.02916789055
3708 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_setget_wavefunction_exceptions>]> 0.000231027603149
3709-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_generate_events_nlo_py6_stdhep>]> 90.5052030087
3710+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_check_generate_optimize>]> 0.301462173462
3711 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_zttx>]> 42.488312006
3712-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_values_for_prop>]> 0.000379085540771
3713+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_read_madgraph4_proc_card>]> 0.877720832825
3714 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_zz_QCD>]> 0.0014021396637
3715 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF>]> 0.00574803352356
3716 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestLorentzInvariance testMethod=test_boost_momenta_gluino>]> 5.42973899841
3717@@ -963,39 +963,39 @@
3718 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_multiple_lorentz_subset>]> 0.0536549091339
3719 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_wrong_multiparticle>]> 0.00848388671875
3720 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWZA>]> 0.0144498348236
3721-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000127792358398
3722+<__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_export_v4.TestMadWeight testMethod=test_modification_to_cuts>]> 0.0898389816284
3723 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_den_factor_lines>]> 2.02332401276
3724 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_flipping>]> 0.0031681060791
3725-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator2>]> 0.152077913284
3726 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_generate_eventsnlo_py6pt_fsr>]> 16.2141349316
3727 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_leshouche_file_EW>]> 0.000738143920898
3728 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.000211000442505
3729 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_MP_mode>]> 0.0349721908569
3730 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin32propagator>]> 0.208134174347
3731-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_setget_matrix_element_exceptions>]> 0.00100207328796
3732+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups_modified_mssm_general>]> 8.70347595215
3733 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_configs_file_born_EW>]> 5.07831573486e-05
3734 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testmultvarAdd>]> 0.00016713142395
3735 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_calculate_xsect_script>]> 58.7567720413
3736-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_identify_particle>]> 0.0015971660614
3737+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_setget_multi_leg_correct>]> 6.60419464111e-05
3738 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_complicated_majorana_process>]> 0.110619068146
3739 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uxu_wpwm_QED>]> 0.000982999801636
3740 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower1>]> 0.000165939331055
3741 <__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_permutation.TestPermutation testMethod=test_permutation_from_id>]> 0.0379128456116
3742 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_identical_interactions>]> 0.0405609607697
3743-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_help_category>]> 0.00062894821167
3744+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_particles_type>]> 1.96593403816
3745 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestPythia8Card testMethod=test_PY8Card_with_subruns>]> 0.0171630382538
3746 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8>]> 0.000524997711182
3747 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_aa_QED>]> 0.00227403640747
3748 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_add_time_of_flight>]> 19.5163040161
3749 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_nfksconfigs_file_EW>]> 0.0351588726044
3750-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419
3751+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sqso>]> 4.5599489212
3752 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_output>]> 0.0474369525909
3753 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_get_anti_pdg_code>]> 0.000168085098267
3754 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_add_particle>]> 0.000631093978882
3755-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_check_generate_optimize>]> 0.301462173462
3756+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_generate_events_nlo_py6_stdhep>]> 90.5052030087
3757 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_file>]> 0.00247812271118
3758 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testsumaddmult>]> 0.000146865844727
3759 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hwpp_set>]> 29.2329268456
3760+<__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_extract_info>]> 0.00151705741882
3761 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_add_ab_particle>]> 0.127122163773
3762 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestImportUFONoSideEffect testMethod=test_ImportUFOcheckgoldstone>]> 0.0369899272919
3763 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madspin.TestMadSpin testMethod=test_lhe_none_decay>]> 7.61337804794
3764@@ -1029,6 +1029,7 @@
3765 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testrsumvarvar>]> 7.60555267334e-05
3766 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_complex_conjugate>]> 8.20159912109e-05
3767 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_VVS>]> 0.0273261070251
3768+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_4_fermion>]> 0.0415799617767
3769 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_special_group_decay_chain>]> 0.162132024765
3770 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_multi_process_ppz>]> 1.70217895508
3771 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_wavefunctions testMethod=test_short_OR>]> 0.00101685523987
3772@@ -1036,6 +1037,7 @@
3773 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_raise_invalid_path_py8>]> 74.8001401424
3774 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_wpwm_QED>]> 0.0013861656189
3775 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T_pair_simplify>]> 0.000263929367065
3776+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_output_files.IOExportMadLoopAcceptanceTest testMethod=testIO_ProcOutputIOTests>]> 28.318707943
3777 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_ppzz_in_RS>]> 5.40944194794
3778 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_lh_order_EW>]> 0.000322818756104
3779 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarint>]> 8.79764556885e-05
3780@@ -1045,7 +1047,6 @@
3781 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_gluons>]> 0.0548150539398
3782 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_complex_mass_SA>]> 1.51796483994
3783 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=test_short_sumofLorentzObj>]> 0.00596499443054
3784-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_get_python_matrix_methods>]> 0.0204730033875
3785 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_fks_EW>]> 4.79221343994e-05
3786 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_python_routine_are_exec>]> 0.00470900535583
3787 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin32propagator>]> 0.232930898666
3788@@ -1057,7 +1058,7 @@
3789 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_FFT2>]> 0.0686628818512
3790 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.TestFKSOutput testMethod=test_wj_loonly_gen>]> 8.72703194618
3791 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_model_reader.TestModelReader testMethod=test_set_parameters_and_couplings>]> 0.0923321247101
3792-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_4_fermion>]> 0.0415799617767
3793+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_to_immutable>]> 5.88893890381e-05
3794 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_setget_model_correct>]> 0.00034499168396
3795 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_ddx_wpwmg>]> 26.4144010544
3796 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_CT_vertices_generation_gg_gg>]> 1.53292918205
3797@@ -1095,15 +1096,15 @@
3798 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_parity_for_epsilon>]> 0.000339031219482
3799 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_coloramps_file>]> 0.00445699691772
3800 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_t_channel_vertex>]> 0.000336170196533
3801-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000134944915771
3802+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_setget_matrix_element_exceptions>]> 0.00100207328796
3803 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_four_fermion_vertex_strange_fermion_flow>]> 0.0298500061035
3804-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_to_immutable>]> 5.88893890381e-05
3805+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_reweighting>]> 15.5831661224
3806 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testIdentityMatrix>]> 0.0287408828735
3807 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_madspin_gridpack>]> 31.1755411625
3808 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_get_particles_type>]> 0.128159046173
3809 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestMadLoopParam testMethod=test_modifparameter>]> 0.000784873962402
3810 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator4>]> 0.0218019485474
3811-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_generate_reals_no_combine>]> 0.184464216232
3812+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_wpwm_QCD>]> 0.00233387947083
3813 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_group>]> 0.119250059128
3814 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_group_multidiagram_decay_chains>]> 0.331767082214
3815 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_nlo_hw6_stdhep>]> 106.459758997
3816@@ -1117,7 +1118,7 @@
3817 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_complex_mass_scheme>]> 0.02272605896
3818 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massless>]> 0.000313997268677
3819 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_insert_legs>]> 0.000980854034424
3820-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection>]> 0.000416040420532
3821+<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_gg_ggg>]> 0.128249883652
3822 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_uux_uuxuux>]> 0.00294399261475
3823 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_help_generate_ab_amplitude>]> 0.233986139297
3824 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticleList testMethod=test_convert>]> 0.000968933105469
3825@@ -1125,13 +1126,13 @@
3826 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_level_with_flipping_triangle>]> 0.00130605697632
3827 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_mssm_equivalence>]> 4.6789290905
3828 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower3>]> 0.0128040313721
3829-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_epem_ttxg_QED>]> 0.00109791755676
3830+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.AlohaFortranWriterTest testMethod=test_header>]> 0.0467920303345
3831 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_reorder_permutation>]> 5.41210174561e-05
3832 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_html_long_process_strings>]> 20.4391908646
3833 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000126123428345
3834 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00191402435303
3835 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_nodiag>]> 0.00244688987732
3836-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_define_not_dep_param>]> 0.0751221179962
3837+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=test_obj_are_not_modified>]> 0.000224113464355
3838 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_check_generate>]> 0.00097393989563
3839 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_aa_ttx_QED>]> 0.00158500671387
3840 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_symmetries_and_get_info>]> 0.212943077087
3841@@ -1140,15 +1141,15 @@
3842 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_legs_to_color_link_string>]> 0.00512909889221
3843 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_sort_fksleglist>]> 0.00221490859985
3844 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_wavefunctions testMethod=test_I>]> 0.000235080718994
3845-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805
3846+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833
3847 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_representation>]> 7.29560852051e-05
3848 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_real_me_wrapper_EW>]> 5.69820404053e-05
3849 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_files.TestFilesGestion testMethod=test_is_uptodate>]> 1.0137488842
3850 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization5>]> 0.00028395652771
3851 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_particles_uux_uuxng>]> 0.0401759147644
3852 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_initial_vertex_position>]> 0.000370979309082
3853-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madspin.TestMadSpin testMethod=test_hepmc_decay>]> 0.65887594223
3854-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_loop_induced>]> 50.1276230812
3855+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testTraceofObject>]> 0.000325918197632
3856+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fksreal>]> 13.9149849415
3857 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_duxhuduxux_guxhuuxux>]> 1.03614902496
3858 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hw6_analyse>]> 0.000184059143066
3859 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_get_helicity_states>]> 0.000174045562744
3860@@ -1157,21 +1158,22 @@
3861 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputIOTest testMethod=testIO_sqso_uux_uuxuuxx>]> 1.1301419735
3862 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestBlock testMethod=test_block_append_remove>]> 0.000144958496094
3863 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000118970870972
3864-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_special_parameters>]> 0.0848360061646
3865+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_Plorentz>]> 0.0777571201324
3866 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCard testMethod=test_mod_param>]> 0.000418901443481
3867 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_paralel_cross_sm>]> 865.433312893
3868 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_nice_string>]> 0.000377178192139
3869 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_qq_qqg_with_subprocess_group>]> 0.406945943832
3870 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_initMadLoopParam>]> 0.00100302696228
3871+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00219416618347
3872 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_fortranwriter_CFF>]> 0.0698010921478
3873 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_other>]> 4.31537628174e-05
3874 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_run_card>]> 0.0163931846619
3875 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_card_type_recognition>]> 0.0509171485901
3876 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_nhel_file_EW>]> 0.125450849533
3877-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_ga_EW>]> 15.2475500107
3878+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_nogroup>]> 0.109572172165
3879 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_dxd_zzg>]> 32.0563452244
3880 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_full_sm_decay_groups>]> 5.82679080963
3881-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_output_files.IOExportMadLoopAcceptanceTest testMethod=testIO_ProcOutputIOTests>]> 28.318707943
3882+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCallWriterTest testMethod=test_UFO_CPP_helas_call_writer>]> 0.0117120742798
3883 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_correct>]> 9.48905944824e-05
3884 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOTestMadLoopOutputFromInterface testMethod=testIO_TIR_output>]> 190.159698009
3885 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_required_s_channel_uux_uuxng>]> 0.146993160248
3886@@ -1187,7 +1189,7 @@
3887 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_udxwpg_udxwp>]> 0.0118889808655
3888 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestBanner testMethod=test_banner>]> 0.0151350498199
3889 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_values_for_prop>]> 0.000183820724487
3890-<__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_extract_info>]> 0.00151705741882
3891+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_ML5EW_sm_vs_stored_ML5EW_sqso>]> 0.00940799713135
3892 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_get_color_data_lines_from_color_matrix>]> 1.95838093758
3893 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_epem_ddx>]> 25.6196660995
3894 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_diagram_list_nice_string>]> 0.00311493873596
3895@@ -1196,7 +1198,7 @@
3896 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py6>]> 0.000173807144165
3897 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_expand_veto>]> 0.00168204307556
3898 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarvar>]> 6.89029693604e-05
3899-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sqso>]> 4.5599489212
3900+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_get_python_matrix_methods>]> 0.0204730033875
3901 <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestEvent testMethod=test_madspin_event>]> 0.00227999687195
3902 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_epem_sepsemepem>]> 0.074609041214
3903 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_hhttx>]> 141.341906071
3904@@ -1219,5 +1221,5 @@
3905 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_nexternal_file>]> 0.000472784042358
3906 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_ppzjj>]> 59.9299731255
3907 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_check_generate_events_nlo_py6pt_fsr>]> 34.7858700752
3908-<__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_dxd_gz>]> 2.18089485168
3909+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator2>]> 0.152077913284
3910 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_aloha_MP_mode>]> 0.0324759483337
3911\ No newline at end of file
3912
3913=== modified file 'tests/unit_tests/iolibs/test_export_cpp.py'
3914--- tests/unit_tests/iolibs/test_export_cpp.py 2017-02-16 14:49:57 +0000
3915+++ tests/unit_tests/iolibs/test_export_cpp.py 2019-06-27 13:48:48 +0000
3916@@ -1386,7 +1386,7 @@
3917
3918 using namespace std;
3919
3920-namespace Pythia8 {
3921+using namespace Pythia8;
3922
3923 class Parameters_sm
3924 {
3925@@ -1410,6 +1410,10 @@
3926 void setIndependentCouplings();
3927 // Set parameters that are changed event by event
3928 void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS);
3929+// TMP: hardcoded bogus implementation with no arguments since this
3930+// is being called from within the matrix elements.
3931+void setDependentParameters() {};
3932+
3933 // Set couplings that are changed event by event
3934 void setDependentCouplings();
3935
3936@@ -1422,12 +1426,10 @@
3937 // Print couplings that are changed event by event
3938 void printDependentCouplings();
3939
3940-
3941 private:
3942 static Parameters_sm* instance;
3943 };
3944
3945-} // end namespace Pythia8
3946 #endif // Pythia8_parameters_sm_H
3947 """% misc.get_pkg_info()
3948
3949@@ -1444,21 +1446,21 @@
3950 #include "Parameters_sm.h"
3951 #include "Pythia8/PythiaStdlib.h"
3952
3953-namespace Pythia8 {
3954-
3955- // Initialize static instance
3956- Parameters_sm* Parameters_sm::instance = 0;
3957-
3958- // Function to get static instance - only one instance per program
3959- Parameters_sm* Parameters_sm::getInstance(){
3960- if (instance == 0)
3961- instance = new Parameters_sm();
3962-
3963- return instance;
3964- }
3965-
3966- void Parameters_sm::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){
3967- mdl_WTau=pd->mWidth(15);
3968+using namespace Pythia8;
3969+
3970+// Initialize static instance
3971+Parameters_sm* Parameters_sm::instance = 0;
3972+
3973+// Function to get static instance - only one instance per program
3974+Parameters_sm* Parameters_sm::getInstance(){
3975+if (instance == 0)
3976+ instance = new Parameters_sm();
3977+
3978+return instance;
3979+}
3980+
3981+void Parameters_sm::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){
3982+mdl_WTau=pd->mWidth(15);
3983 mdl_WH=pd->mWidth(25);
3984 mdl_WT=pd->mWidth(6);
3985 mdl_WW=pd->mWidth(24);
3986@@ -1559,9 +1561,9 @@
3987 mdl_ee__exp__2 = ((mdl_ee)*(mdl_ee));
3988 mdl_sw__exp__2 = ((mdl_sw)*(mdl_sw));
3989 mdl_cw__exp__2 = ((mdl_cw)*(mdl_cw));
3990- }
3991- void Parameters_sm::setIndependentCouplings(){
3992- GC_1 = -(mdl_ee*mdl_complexi)/3.;
3993+}
3994+void Parameters_sm::setIndependentCouplings(){
3995+GC_1 = -(mdl_ee*mdl_complexi)/3.;
3996 GC_2 = (2.*mdl_ee*mdl_complexi)/3.;
3997 GC_3 = -(mdl_ee*mdl_complexi);
3998 GC_4 = mdl_ee*mdl_complexi;
3999@@ -1666,23 +1668,26 @@
4000 GC_106 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x1)/(mdl_sw*mdl_sqrt__2);
4001 GC_107 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x2)/(mdl_sw*mdl_sqrt__2);
4002 GC_108 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x3)/(mdl_sw*mdl_sqrt__2);
4003- }
4004- void Parameters_sm::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){
4005- aS = alpS;
4006+}
4007+
4008+void Parameters_sm::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){
4009+aS = alpS;
4010 mdl_sqrt__aS = sqrt(aS);
4011 G = 2.*mdl_sqrt__aS*sqrt(M_PI);
4012 mdl_G__exp__2 = ((G)*(G));
4013- }
4014- void Parameters_sm::setDependentCouplings(){
4015- GC_12 = mdl_complexi*mdl_G__exp__2;
4016+}
4017+
4018+
4019+void Parameters_sm::setDependentCouplings(){
4020+GC_12 = mdl_complexi*mdl_G__exp__2;
4021 GC_11 = mdl_complexi*G;
4022 GC_10 = -G;
4023- }
4024+}
4025
4026- // Routines for printing out parameters
4027- void Parameters_sm::printIndependentParameters(){
4028- cout << "sm model parameters independent of event kinematics:" << endl;
4029- cout << setw(20) << "mdl_WTau " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WTau << endl;
4030+// Routines for printing out parameters
4031+void Parameters_sm::printIndependentParameters(){
4032+cout << "sm model parameters independent of event kinematics:" << endl;
4033+cout << setw(20) << "mdl_WTau " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WTau << endl;
4034 cout << setw(20) << "mdl_WH " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WH << endl;
4035 cout << setw(20) << "mdl_WT " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WT << endl;
4036 cout << setw(20) << "mdl_WW " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WW << endl;
4037@@ -1775,10 +1780,10 @@
4038 cout << setw(20) << "mdl_ee__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_ee__exp__2 << endl;
4039 cout << setw(20) << "mdl_sw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_sw__exp__2 << endl;
4040 cout << setw(20) << "mdl_cw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_cw__exp__2 << endl;
4041- }
4042- void Parameters_sm::printIndependentCouplings(){
4043- cout << "sm model couplings independent of event kinematics:" << endl;
4044- cout << setw(20) << "GC_1 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_1 << endl;
4045+}
4046+void Parameters_sm::printIndependentCouplings(){
4047+cout << "sm model couplings independent of event kinematics:" << endl;
4048+cout << setw(20) << "GC_1 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_1 << endl;
4049 cout << setw(20) << "GC_2 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_2 << endl;
4050 cout << setw(20) << "GC_3 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_3 << endl;
4051 cout << setw(20) << "GC_4 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_4 << endl;
4052@@ -1883,22 +1888,21 @@
4053 cout << setw(20) << "GC_106 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_106 << endl;
4054 cout << setw(20) << "GC_107 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_107 << endl;
4055 cout << setw(20) << "GC_108 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_108 << endl;
4056- }
4057- void Parameters_sm::printDependentParameters(){
4058- cout << "sm model parameters dependent on event kinematics:" << endl;
4059- cout << setw(20) << "aS " << "= " << setiosflags(ios::scientific) << setw(10) << aS << endl;
4060+}
4061+void Parameters_sm::printDependentParameters(){
4062+cout << "sm model parameters dependent on event kinematics:" << endl;
4063+cout << setw(20) << "aS " << "= " << setiosflags(ios::scientific) << setw(10) << aS << endl;
4064 cout << setw(20) << "mdl_sqrt__aS " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_sqrt__aS << endl;
4065 cout << setw(20) << "G " << "= " << setiosflags(ios::scientific) << setw(10) << G << endl;
4066 cout << setw(20) << "mdl_G__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_G__exp__2 << endl;
4067- }
4068- void Parameters_sm::printDependentCouplings(){
4069- cout << "sm model couplings dependent on event kinematics:" << endl;
4070- cout << setw(20) << "GC_12 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_12 << endl;
4071+}
4072+void Parameters_sm::printDependentCouplings(){
4073+cout << "sm model couplings dependent on event kinematics:" << endl;
4074+cout << setw(20) << "GC_12 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_12 << endl;
4075 cout << setw(20) << "GC_11 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_11 << endl;
4076 cout << setw(20) << "GC_10 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_10 << endl;
4077- }
4078+}
4079
4080-} // end namespace Pythia8
4081 """ % misc.get_pkg_info()
4082
4083 file_h, file_cc = self.model_builder.generate_parameters_class_files()
4084
4085=== modified file 'tests/unit_tests/various/test_banner.py'
4086--- tests/unit_tests/various/test_banner.py 2018-04-30 11:11:08 +0000
4087+++ tests/unit_tests/various/test_banner.py 2019-06-27 13:48:48 +0000
4088@@ -203,6 +203,48 @@
4089 self.assertRaises(Exception, self.config.__setitem__, 'dict', {'test':'test'})
4090 self.assertRaises(Exception, self.config.__setitem__, 'dict', "22")
4091
4092+ def test_integer_handling(self):
4093+
4094+ self.config.add_param("int", 1)
4095+ self.config['int'] = '30*2'
4096+ self.assertEqual(self.config['int'] ,30*2)
4097+
4098+ self.config['int'] = 3.0
4099+ self.assertEqual(self.config['int'] ,3)
4100+
4101+ self.config['int'] = '3k'
4102+ self.assertEqual(self.config['int'] ,3000)
4103+
4104+ self.config['int'] = '3M'
4105+ self.assertEqual(self.config['int'] ,3000000)
4106+
4107+ self.config['int'] = '4d1'
4108+ self.assertEqual(self.config['int'] ,40)
4109+
4110+ self.config['int'] = '30/2'
4111+ self.assertEqual(self.config['int'] , 15)
4112+
4113+ def test_float_handling(self):
4114+
4115+ self.config.add_param("int", 1.0)
4116+ self.config['int'] = '30*2'
4117+ self.assertEqual(self.config['int'] ,30*2)
4118+
4119+ self.config['int'] = 3.0
4120+ self.assertEqual(self.config['int'] ,3)
4121+
4122+ self.config['int'] = '3k'
4123+ self.assertEqual(self.config['int'] ,3000)
4124+
4125+ self.config['int'] = '3M'
4126+ self.assertEqual(self.config['int'] ,3000000)
4127+
4128+ self.config['int'] = '4d1'
4129+ self.assertEqual(self.config['int'] ,40)
4130+
4131+ self.config['int'] = '30/4'
4132+ self.assertEqual(self.config['int'] , 15/2.)
4133+
4134 def test_auto_handling(self):
4135 """check that any parameter can be set on auto and recover"""
4136
4137
4138=== modified file 'tests/unit_tests/various/test_shower_card.py'
4139--- tests/unit_tests/various/test_shower_card.py 2015-10-01 16:00:08 +0000
4140+++ tests/unit_tests/various/test_shower_card.py 2019-06-27 13:48:48 +0000
4141@@ -17,7 +17,8 @@
4142 import tests.unit_tests as unittest
4143
4144 import madgraph.various.shower_card as shower_card
4145-
4146+import madgraph.various.misc as misc
4147+pjoin = os.path.join
4148
4149 class TestShowerCard(unittest.TestCase):
4150 """Check the class linked to a block of the param_card"""
4151@@ -519,3 +520,17 @@
4152 for a, b in zip(text.split('\n'), goal.split('\n')):
4153 self.assertEqual(a,b)
4154 self.assertEqual(text, goal)
4155+
4156+ def test_shower_card_edit(self):
4157+
4158+ self.card.testing = True
4159+ new_text = self.card.text
4160+ old_card = shower_card.ShowerCard(new_text, testing=True)
4161+ new_text = old_card.set_param('ue_enabled', '.false.', write_to=True)
4162+ new_card = shower_card.ShowerCard(new_text, testing=True)
4163+ self.assertFalse(new_card['ue_enabled'])
4164+
4165+ new_text = old_card.set_param('ue_enabled', '1', write_to=True)
4166+ new_card = shower_card.ShowerCard(new_text, testing=True)
4167+ self.assertTrue(new_card['ue_enabled'])
4168+
4169
4170=== modified file 'tests/unit_tests/various/test_write_param.py'
4171--- tests/unit_tests/various/test_write_param.py 2015-10-01 16:00:08 +0000
4172+++ tests/unit_tests/various/test_write_param.py 2019-06-27 13:48:48 +0000
4173@@ -259,20 +259,20 @@
4174 ## analytical expression. MG5 ignores those values
4175 ## but they are important for interfacing the output of MG5
4176 ## to external program such as Pythia.
4177- 1 0.000000 # d : 0.0
4178- 2 0.000000 # u : 0.0
4179- 3 0.000000 # s : 0.0
4180- 4 0.000000 # c : 0.0
4181- 5 0.000000 # b : 0.0
4182- 11 0.000000 # e- : 0.0
4183- 12 0.000000 # ve : 0.0
4184- 13 0.000000 # mu- : 0.0
4185- 14 0.000000 # vm : 0.0
4186- 16 0.000000 # vt : 0.0
4187- 21 0.000000 # g : 0.0
4188- 22 0.000000 # a : 0.0
4189- 24 80.419002 # w+ : cmath.sqrt(MZ__exp__2/2. + cmath.sqrt(MZ__exp__4/4. - (aEW*cmath.pi*MZ__exp__2)/(Gf*sqrt__2)))
4190- 25 91.188000 # h : MZ
4191+ 1 0.000000e+00 # d : 0.0
4192+ 2 0.000000e+00 # u : 0.0
4193+ 3 0.000000e+00 # s : 0.0
4194+ 4 0.000000e+00 # c : 0.0
4195+ 5 0.000000e+00 # b : 0.0
4196+ 11 0.000000e+00 # e- : 0.0
4197+ 12 0.000000e+00 # ve : 0.0
4198+ 13 0.000000e+00 # mu- : 0.0
4199+ 14 0.000000e+00 # vm : 0.0
4200+ 16 0.000000e+00 # vt : 0.0
4201+ 21 0.000000e+00 # g : 0.0
4202+ 22 0.000000e+00 # a : 0.0
4203+ 24 8.041900e+01 # w+ : cmath.sqrt(MZ__exp__2/2. + cmath.sqrt(MZ__exp__4/4. - (aEW*cmath.pi*MZ__exp__2)/(Gf*sqrt__2)))
4204+ 25 9.118800e+01 # h : MZ
4205
4206 ###################################
4207 ## INFORMATION FOR SMINPUTS
4208@@ -300,20 +300,20 @@
4209 ## analytical expression. MG5 ignores those values
4210 ## but they are important for interfacing the output of MG5
4211 ## to external program such as Pythia.
4212-DECAY 1 0.000000 # d : 0.0
4213-DECAY 2 0.000000 # u : 0.0
4214-DECAY 3 0.000000 # s : 0.0
4215-DECAY 4 0.000000 # c : 0.0
4216-DECAY 5 0.000000 # b : 0.0
4217-DECAY 6 0.000000 # t : 0.0
4218-DECAY 11 0.000000 # e- : 0.0
4219-DECAY 12 0.000000 # ve : 0.0
4220-DECAY 13 0.000000 # mu- : 0.0
4221-DECAY 14 0.000000 # vm : 0.0
4222-DECAY 15 0.000000 # ta- : 0.0
4223-DECAY 16 0.000000 # vt : 0.0
4224-DECAY 21 0.000000 # g : 0.0
4225-DECAY 22 0.000000 # a : 0.0
4226+DECAY 1 0.000000e+00 # d : 0.0
4227+DECAY 2 0.000000e+00 # u : 0.0
4228+DECAY 3 0.000000e+00 # s : 0.0
4229+DECAY 4 0.000000e+00 # c : 0.0
4230+DECAY 5 0.000000e+00 # b : 0.0
4231+DECAY 6 0.000000e+00 # t : 0.0
4232+DECAY 11 0.000000e+00 # e- : 0.0
4233+DECAY 12 0.000000e+00 # ve : 0.0
4234+DECAY 13 0.000000e+00 # mu- : 0.0
4235+DECAY 14 0.000000e+00 # vm : 0.0
4236+DECAY 15 0.000000e+00 # ta- : 0.0
4237+DECAY 16 0.000000e+00 # vt : 0.0
4238+DECAY 21 0.000000e+00 # g : 0.0
4239+DECAY 22 0.000000e+00 # a : 0.0
4240 """.split('\n')
4241
4242 self.assertEqual(self.content.getvalue().split('\n'), goal)

Subscribers

People subscribed via source and target branches

to all changes: