Merge lp:~mg5core1/mg5amcnlo/2.6.6 into lp:mg5amcnlo/lts
- 2.6.6
- Merge into series2.0
Proposed by
Olivier Mattelaer
Status: | Merged |
---|---|
Merged at revision: | 282 |
Proposed branch: | lp:~mg5core1/mg5amcnlo/2.6.6 |
Merge into: | lp:mg5amcnlo/lts |
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Olivier Mattelaer | Approve | ||
Review via email: mp+369323@code.launchpad.net |
Commit message
Time to release this branch
Description of the change
To post a comment you must log in.
lp:~mg5core1/mg5amcnlo/2.6.6
updated
- 332. By olivier-mattelaer
-
fix an issue with small width treatment at NLO + full forbid of genrate LO + add NLO (or the opposite)
- 333. By olivier-mattelaer
-
fixing some tests and add security on some feature (MLM limitation)
- 334. By olivier-mattelaer
-
fix issue with pythia8 mode
- 335. By olivier-mattelaer
-
update gnuplot
- 336. By olivier-mattelaer
-
fixing small issue from the review + adding info in UpdatesNotes
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 | 26 | #********************************************************************* | 26 | #********************************************************************* |
6 | 27 | # Number of events and rnd seed * | 27 | # Number of events and rnd seed * |
7 | 28 | # Warning: Do not generate more than 1M events in a single run * | 28 | # Warning: Do not generate more than 1M events in a single run * |
8 | 29 | # If you want to run Pythia, avoid more than 50k events in a run. * | ||
9 | 30 | #********************************************************************* | 29 | #********************************************************************* |
10 | 31 | %(nevents)s = nevents ! Number of unweighted events requested | 30 | %(nevents)s = nevents ! Number of unweighted events requested |
11 | 32 | %(iseed)s = iseed ! rnd seed (0=assigned automatically=default)) | 31 | %(iseed)s = iseed ! rnd seed (0=assigned automatically=default)) |
12 | @@ -121,19 +120,7 @@ | |||
13 | 121 | %(missetmax)s = missetmax ! maximum missing Et (sum of neutrino's momenta) | 120 | %(missetmax)s = missetmax ! maximum missing Et (sum of neutrino's momenta) |
14 | 122 | %(pt_min_pdg)s = pt_min_pdg ! pt cut for other particles (use pdg code). Applied on particle and anti-particle | 121 | %(pt_min_pdg)s = pt_min_pdg ! pt cut for other particles (use pdg code). Applied on particle and anti-particle |
15 | 123 | %(pt_max_pdg)s = pt_max_pdg ! pt cut for other particles (syntax e.g. {6: 100, 25: 50}) | 122 | %(pt_max_pdg)s = pt_max_pdg ! pt cut for other particles (syntax e.g. {6: 100, 25: 50}) |
29 | 124 | #********************************************************************* | 123 | $ecut |
17 | 125 | # Minimum and maximum E's (in the center of mass frame) * | ||
18 | 126 | #********************************************************************* | ||
19 | 127 | %(ej)s = ej ! minimum E for the jets | ||
20 | 128 | %(eb)s = eb ! minimum E for the b | ||
21 | 129 | %(ea)s = ea ! minimum E for the photons | ||
22 | 130 | %(el)s = el ! minimum E for the charged leptons | ||
23 | 131 | %(ejmax)s = ejmax ! maximum E for the jets | ||
24 | 132 | %(ebmax)s = ebmax ! maximum E for the b | ||
25 | 133 | %(eamax)s = eamax ! maximum E for the photons | ||
26 | 134 | %(elmax)s = elmax ! maximum E for the charged leptons | ||
27 | 135 | %(e_min_pdg)s = e_min_pdg ! E cut for other particles (use pdg code). Applied on particle and anti-particle | ||
28 | 136 | %(e_max_pdg)s = e_max_pdg ! E cut for other particles (syntax e.g. {6: 100, 25: 50}) | ||
30 | 137 | #********************************************************************* | 124 | #********************************************************************* |
31 | 138 | # Maximum and minimum absolute rapidity (for max, -1 means no cut) * | 125 | # Maximum and minimum absolute rapidity (for max, -1 means no cut) * |
32 | 139 | #********************************************************************* | 126 | #********************************************************************* |
33 | 140 | 127 | ||
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 | 19 | # 'VALID' is the keyword that *must* be returned if everything is in order. | 19 | # 'VALID' is the keyword that *must* be returned if everything is in order. |
39 | 20 | # | 20 | # |
40 | 21 | requirements: | 21 | requirements: |
41 | 22 | ifeq ($(shell $(call CHECK_MG5AMC_VERSION,2.4.2)),True) | ||
42 | 23 | @echo "VALID" | 22 | @echo "VALID" |
47 | 24 | else | 23 | |
44 | 25 | @echo "Error:: MG5aMC is not recent enough (found "$(MG5AMC_VERSION)")" | ||
45 | 26 | @echo "FAIL" | ||
46 | 27 | endif | ||
48 | 28 | 24 | ||
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 | 58 | endif | 58 | endif |
54 | 59 | 59 | ||
55 | 60 | ipart=ipdg | 60 | ipart=ipdg |
60 | 61 | if(iabs(ipart).eq.21) ipart=0 | 61 | if(iabs(ipart).eq.21) then |
61 | 62 | if(iabs(ipart).eq.22) ipart=7 | 62 | ipart=0 |
62 | 63 | iporg=ipart | 63 | else if(iabs(ipart).eq.22) then |
63 | 64 | 64 | ipart=7 | |
64 | 65 | else if(iabs(ipart).eq.7) then | ||
65 | 66 | ipart=7 | ||
66 | 65 | c This will be called for any PDG code, but we only support up to 7 | 67 | c This will be called for any PDG code, but we only support up to 7 |
68 | 66 | if(iabs(ipart).gt.7)then | 68 | else if(iabs(ipart).gt.7)then |
69 | 67 | write(*,*) 'PDF not supported for pdg ',ipdg | 69 | write(*,*) 'PDF not supported for pdg ',ipdg |
70 | 68 | write(*,*) 'For lepton colliders, please set the lpp* '// | 70 | write(*,*) 'For lepton colliders, please set the lpp* '// |
71 | 69 | $ 'variables to 0 in the run_card' | 71 | $ 'variables to 0 in the run_card' |
72 | @@ -72,6 +74,7 @@ | |||
73 | 72 | stop 1 | 74 | stop 1 |
74 | 73 | endif | 75 | endif |
75 | 74 | 76 | ||
76 | 77 | iporg=ipart | ||
77 | 75 | ireuse = 0 | 78 | ireuse = 0 |
78 | 76 | do i=1,2 | 79 | do i=1,2 |
79 | 77 | c Check if result can be reused since any of last two calls | 80 | c Check if result can be reused since any of last two calls |
80 | 78 | 81 | ||
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 | 57 | ipart=ipdg | 57 | ipart=ipdg |
86 | 58 | if(ipart.eq.21) ipart=0 | 58 | if(ipart.eq.21) ipart=0 |
87 | 59 | if(iabs(ipart).eq.22) ipart=7 | 59 | if(iabs(ipart).eq.22) ipart=7 |
88 | 60 | if(iabs(ipart).eq.7) ipart=7 | ||
89 | 60 | iporg=ipart | 61 | iporg=ipart |
90 | 61 | 62 | ||
91 | 62 | c This will be called for any PDG code, but we only support up to 7 | 63 | c This will be called for any PDG code, but we only support up to 7 |
92 | 63 | 64 | ||
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 | 54 | endif | 54 | endif |
98 | 55 | 55 | ||
99 | 56 | ipart=ipdg | 56 | ipart=ipdg |
104 | 57 | if(iabs(ipart).eq.21) ipart=0 | 57 | if(iabs(ipart).eq.21) then |
105 | 58 | if(iabs(ipart).eq.22) ipart=7 | 58 | ipart=0 |
106 | 59 | iporg=ipart | 59 | else if(iabs(ipart).eq.22) then |
107 | 60 | 60 | ipart=7 | |
108 | 61 | else if (iabs(ipart).eq.7) then | ||
109 | 62 | ipart=7 | ||
110 | 61 | c This will be called for any PDG code, but we only support up to 7 | 63 | c This will be called for any PDG code, but we only support up to 7 |
112 | 62 | if(iabs(ipart).gt.7)then | 64 | else if(iabs(ipart).gt.7)then |
113 | 63 | write(*,*) 'PDF not supported for pdg ',ipdg | 65 | write(*,*) 'PDF not supported for pdg ',ipdg |
114 | 64 | write(*,*) 'For lepton colliders, please set the lpp* '// | 66 | write(*,*) 'For lepton colliders, please set the lpp* '// |
115 | 65 | $ 'variables to 0 in the run_card' | 67 | $ 'variables to 0 in the run_card' |
116 | @@ -68,6 +70,7 @@ | |||
117 | 68 | stop 1 | 70 | stop 1 |
118 | 69 | endif | 71 | endif |
119 | 70 | 72 | ||
120 | 73 | iporg=ipart | ||
121 | 71 | c Determine the iset used in lhapdf | 74 | c Determine the iset used in lhapdf |
122 | 72 | call getnset(iset) | 75 | call getnset(iset) |
123 | 73 | if (iset.ne.1) then | 76 | if (iset.ne.1) then |
124 | 74 | 77 | ||
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 | 86 | shat = x(1)*x(2)*ebeam(1)*ebeam(2) | 86 | shat = x(1)*x(2)*ebeam(1)*ebeam(2) |
130 | 87 | return | 87 | return |
131 | 88 | end | 88 | end |
132 | 89 | |||
133 | 90 | |||
134 | 91 | logical function dummy_boostframe() | ||
135 | 92 | implicit none | ||
136 | 93 | c | ||
137 | 94 | c | ||
138 | 95 | dummy_boostframe = .false. | ||
139 | 96 | return | ||
140 | 97 | end | ||
141 | 98 | |||
142 | 89 | 99 | ||
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 | 185 | c External function | 185 | c External function |
148 | 186 | double precision SumDot | 186 | double precision SumDot |
149 | 187 | external SumDot | 187 | external SumDot |
151 | 188 | 188 | logical dummy_boostframe | |
152 | 189 | external dummy_boostframe | ||
153 | 189 | c | 190 | c |
154 | 190 | c data | 191 | c data |
155 | 191 | c | 192 | c |
156 | @@ -304,8 +305,12 @@ | |||
157 | 304 | c First Generate Momentum for initial state particles | 305 | c First Generate Momentum for initial state particles |
158 | 305 | c | 306 | c |
159 | 306 | if (lpp(1).eq.9.or.lpp(2).eq.9)then | 307 | if (lpp(1).eq.9.or.lpp(2).eq.9)then |
162 | 307 | p(:,1) = pi1(:) | 308 | if (dummy_boostframe())then |
163 | 308 | p(:,2) = pi2(:) | 309 | call mom2cx(m(-nbranch),m(1),m(2),1d0,0d0,p(0,1),p(0,2)) |
164 | 310 | else | ||
165 | 311 | p(:,1) = pi1(:) | ||
166 | 312 | p(:,2) = pi2(:) | ||
167 | 313 | endif | ||
168 | 309 | else if(nincoming.eq.2) then | 314 | else if(nincoming.eq.2) then |
169 | 310 | call mom2cx(m(-nbranch),m(1),m(2),1d0,0d0,p(0,1),p(0,2)) | 315 | call mom2cx(m(-nbranch),m(1),m(2),1d0,0d0,p(0,1),p(0,2)) |
170 | 311 | else | 316 | else |
171 | @@ -840,7 +845,7 @@ | |||
172 | 840 | m12 = m(itree(2,ibranch))**2 | 845 | m12 = m(itree(2,ibranch))**2 |
173 | 841 | mn2 = m(ibranch-1)**2 | 846 | mn2 = m(ibranch-1)**2 |
174 | 842 | c write(*,*) 'Enertering yminmax',sqrt(s1),sqrt(m12),sqrt(mn2) | 847 | c write(*,*) 'Enertering yminmax',sqrt(s1),sqrt(m12),sqrt(mn2) |
176 | 843 | call yminmax(s1,t,m12,ma2,mb2,mn2,tmin,tmax) | 848 | call yminmax(s1,0d0,m12,ma2,mb2,mn2,tmin,tmax) |
177 | 844 | c | 849 | c |
178 | 845 | c Call for 0<x<1 | 850 | c Call for 0<x<1 |
179 | 846 | c | 851 | c |
180 | @@ -1114,6 +1119,7 @@ | |||
181 | 1114 | C This is the G function from Particle Kinematics by | 1119 | C This is the G function from Particle Kinematics by |
182 | 1115 | C E. Byckling and K. Kajantie, Chapter 4 p. 91 eqs 5.28 | 1120 | C E. Byckling and K. Kajantie, Chapter 4 p. 91 eqs 5.28 |
183 | 1116 | C It is used to determine physical limits for Y based on inputs | 1121 | C It is used to determine physical limits for Y based on inputs |
184 | 1122 | C Y is not used in this formula (called with dummy value) | ||
185 | 1117 | C************************************************************************** | 1123 | C************************************************************************** |
186 | 1118 | implicit none | 1124 | implicit none |
187 | 1119 | c | 1125 | c |
188 | 1120 | 1126 | ||
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 | 501 | c Use 1/10000 of sqrt(s) as minimum, to always get integration | 501 | c Use 1/10000 of sqrt(s) as minimum, to always get integration |
194 | 502 | xo = xo*xo/stot | 502 | xo = xo*xo/stot |
195 | 503 | if (xo.eq.0d0)then | 503 | if (xo.eq.0d0)then |
197 | 504 | xo=1d0/stot | 504 | xo=1/10000d0 |
198 | 505 | write(*,*) 'Warning: No cutoff for shat integral found' | 505 | write(*,*) 'Warning: No cutoff for shat integral found' |
199 | 506 | write(*,*) ' Minimum set to ', xo | 506 | write(*,*) ' Minimum set to ', xo |
200 | 507 | endif | 507 | endif |
201 | 508 | 508 | ||
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 | 399 | c exotic q > gluon q' | 399 | c exotic q > gluon q' |
207 | 400 | ipart(1,imo)=ipart(1,ida1) | 400 | ipart(1,imo)=ipart(1,ida1) |
208 | 401 | ipart(2,imo)=0 | 401 | ipart(2,imo)=0 |
210 | 402 | else if (get_color(idmo).eq.1.or.get_color(idmo).eq.2) then | 402 | 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 | 403 | c Color singlet | 403 | c Color singlet |
212 | 404 | ipart(1,imo)=ipart(1,ida1) | 404 | ipart(1,imo)=ipart(1,ida1) |
213 | 405 | ipart(2,imo)=ipart(1,ida2) | 405 | ipart(2,imo)=ipart(1,ida2) |
214 | 406 | 406 | ||
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 | 664 | endif | 664 | endif |
220 | 665 | enddo | 665 | enddo |
221 | 666 | 666 | ||
223 | 667 | c ensure symmetry of s_min(i,j) | 667 | c ensure symmetry of s_min(i,j) + mass effect |
224 | 668 | do i=nincoming+1,nexternal-1 | 668 | do i=nincoming+1,nexternal-1 |
225 | 669 | do j=nincoming+1,nexternal-1 | 669 | do j=nincoming+1,nexternal-1 |
226 | 670 | if(j.lt.i)then | 670 | if(j.lt.i)then |
228 | 671 | s_min(i,j) = max(s_min(j,i),s_min(i,j)) | 671 | s_min(i,j) = max(s_min(j,i), s_min(i,j), (pmass(i)+pmass(j))**2) |
229 | 672 | endif | 672 | endif |
230 | 673 | enddo | 673 | enddo |
231 | 674 | enddo | 674 | enddo |
232 | 675 | |||
233 | 676 | c ensure that smin is bigger than mass threshold | ||
234 | 677 | smin_p = 0d0 | ||
235 | 678 | do i=nincoming+1, nexternal | ||
236 | 679 | smin_p = smin_p + pmass(i) | ||
237 | 680 | enddo | ||
238 | 681 | smin = max(smin, smin_p**2) | ||
239 | 675 | write(*,*) "Define smin to", smin | 682 | write(*,*) "Define smin to", smin |
240 | 676 | 683 | ||
241 | 677 | c Check that results are consistent among all the grouped subprocesses | 684 | c Check that results are consistent among all the grouped subprocesses |
242 | 678 | 685 | ||
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 | 66 | endif | 66 | endif |
248 | 67 | 67 | ||
249 | 68 | ipart=ipdg | 68 | ipart=ipdg |
254 | 69 | if(iabs(ipart).eq.21) ipart=0 | 69 | if(iabs(ipart).eq.21) then |
255 | 70 | if(iabs(ipart).eq.22) ipart=7 | 70 | ipart=0 |
256 | 71 | iporg=ipart | 71 | else if(iabs(ipart).eq.22) then |
257 | 72 | 72 | ipart=7 | |
258 | 73 | else if(iabs(ipart).eq.7) then | ||
259 | 74 | ipart=7 | ||
260 | 75 | else if(iabs(ipart).gt.7)then | ||
261 | 73 | c This will be called for any PDG code, but we only support up to 7 | 76 | c This will be called for any PDG code, but we only support up to 7 |
262 | 74 | if(iabs(ipart).gt.7)then | ||
263 | 75 | write(*,*) 'PDF not supported for pdg ',ipdg | 77 | write(*,*) 'PDF not supported for pdg ',ipdg |
264 | 76 | write(*,*) 'For lepton colliders, please set the lpp* '// | 78 | write(*,*) 'For lepton colliders, please set the lpp* '// |
265 | 77 | $ 'variables to 0 in the run_card' | 79 | $ 'variables to 0 in the run_card' |
266 | @@ -80,6 +82,7 @@ | |||
267 | 80 | stop 1 | 82 | stop 1 |
268 | 81 | endif | 83 | endif |
269 | 82 | 84 | ||
270 | 85 | iporg=ipart | ||
271 | 83 | ireuse = 0 | 86 | ireuse = 0 |
272 | 84 | ii=i_replace | 87 | ii=i_replace |
273 | 85 | do i=1,20 | 88 | do i=1,20 |
274 | 86 | 89 | ||
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 | 64 | endif | 64 | endif |
280 | 65 | 65 | ||
281 | 66 | ipart=ipdg | 66 | ipart=ipdg |
286 | 67 | if(iabs(ipart).eq.21) ipart=0 | 67 | if(iabs(ipart).eq.21) then |
287 | 68 | if(iabs(ipart).eq.22) ipart=7 | 68 | ipart=0 |
288 | 69 | iporg=ipart | 69 | else if(iabs(ipart).eq.22) then |
289 | 70 | 70 | ipart=7 | |
290 | 71 | else if(iabs(ipart).eq.7) then | ||
291 | 72 | ipart=7 | ||
292 | 73 | else if(iabs(ipart).gt.7)then | ||
293 | 71 | c This will be called for any PDG code, but we only support up to 7 | 74 | c This will be called for any PDG code, but we only support up to 7 |
294 | 72 | if(iabs(ipart).gt.7)then | ||
295 | 73 | write(*,*) 'PDF not supported for pdg ',ipdg | 75 | write(*,*) 'PDF not supported for pdg ',ipdg |
296 | 74 | write(*,*) 'For lepton colliders, please set the lpp* '// | 76 | write(*,*) 'For lepton colliders, please set the lpp* '// |
297 | 75 | $ 'variables to 0 in the run_card' | 77 | $ 'variables to 0 in the run_card' |
298 | @@ -82,6 +84,7 @@ | |||
299 | 82 | c Determine the member of the set (function of lhapdf) | 84 | c Determine the member of the set (function of lhapdf) |
300 | 83 | call getnmem(iset,imem) | 85 | call getnmem(iset,imem) |
301 | 84 | 86 | ||
302 | 87 | iporg=ipart | ||
303 | 85 | ireuse = 0 | 88 | ireuse = 0 |
304 | 86 | ii=i_replace | 89 | ii=i_replace |
305 | 87 | do i=1,20 | 90 | do i=1,20 |
306 | 88 | 91 | ||
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 | 65 | endif | 65 | endif |
312 | 66 | 66 | ||
313 | 67 | ipart=ipdg | 67 | ipart=ipdg |
318 | 68 | if(iabs(ipart).eq.21) ipart=0 | 68 | if(iabs(ipart).eq.21) then |
319 | 69 | if(iabs(ipart).eq.22) ipart=7 | 69 | ipart=0 |
320 | 70 | iporg=ipart | 70 | else if(iabs(ipart).eq.22) then |
321 | 71 | 71 | ipart=7 | |
322 | 72 | else if(iabs(ipart).eq.7) then | ||
323 | 73 | ipart=7 | ||
324 | 74 | else if(iabs(ipart).gt.7)then | ||
325 | 72 | c This will be called for any PDG code, but we only support up to 7 | 75 | c This will be called for any PDG code, but we only support up to 7 |
326 | 73 | if(iabs(ipart).gt.7)then | ||
327 | 74 | write(*,*) 'PDF not supported for pdg ',ipdg | 76 | write(*,*) 'PDF not supported for pdg ',ipdg |
328 | 75 | write(*,*) 'For lepton colliders, please set the lpp* '// | 77 | write(*,*) 'For lepton colliders, please set the lpp* '// |
329 | 76 | $ 'variables to 0 in the run_card' | 78 | $ 'variables to 0 in the run_card' |
330 | @@ -82,6 +84,7 @@ | |||
331 | 82 | c Determine the member of the set (function of lhapdf) | 84 | c Determine the member of the set (function of lhapdf) |
332 | 83 | call getnmem(iset,imem) | 85 | call getnmem(iset,imem) |
333 | 84 | 86 | ||
334 | 87 | iporg=ipart | ||
335 | 85 | ireuse = 0 | 88 | ireuse = 0 |
336 | 86 | ii=i_replace | 89 | ii=i_replace |
337 | 87 | do i=1,20 | 90 | do i=1,20 |
338 | 88 | 91 | ||
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 | 2896 | & pjet,njet,jet) | 2896 | & pjet,njet,jet) |
344 | 2897 | do i=1,NN | 2897 | do i=1,NN |
345 | 2898 | di(i)=sqrt(amcatnlo_fastjetdmergemax(i-1)) | 2898 | di(i)=sqrt(amcatnlo_fastjetdmergemax(i-1)) |
350 | 2899 | if (i.gt.1.and.di(i).gt.di(i-1))then | 2899 | if (i.gt.1)then |
351 | 2900 | write(*,*)'Error in set_shower_scale_noshape' | 2900 | if(di(i).gt.di(i-1))then |
352 | 2901 | write(*,*)NN,i,di(i),di(i-1) | 2901 | write(*,*)'Error in set_shower_scale_noshape' |
353 | 2902 | stop | 2902 | write(*,*)NN,i,di(i),di(i-1) |
354 | 2903 | stop | ||
355 | 2904 | endif | ||
356 | 2903 | endif | 2905 | endif |
357 | 2904 | enddo | 2906 | enddo |
358 | 2905 | if(iSH.eq.1)shower_S_scale(iFKS)=di(NN) | 2907 | if(iSH.eq.1)shower_S_scale(iFKS)=di(NN) |
359 | 2906 | 2908 | ||
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 | 1512 | xp(3,2)=-xp(0,2) | 1512 | xp(3,2)=-xp(0,2) |
365 | 1513 | c | 1513 | c |
366 | 1514 | xp(0,i_fks)=E_i_fks*(chy_lbst-shy_lbst*yijdir) | 1514 | xp(0,i_fks)=E_i_fks*(chy_lbst-shy_lbst*yijdir) |
367 | 1515 | p_i_fks(0)=p_i_fks(0)*(chy_lbst-shy_lbst*yijdir) | ||
368 | 1515 | xpifksred(1)=sinth_i_fks*cosphi_i_fks | 1516 | xpifksred(1)=sinth_i_fks*cosphi_i_fks |
369 | 1516 | xpifksred(2)=sinth_i_fks*sinphi_i_fks | 1517 | xpifksred(2)=sinth_i_fks*sinphi_i_fks |
370 | 1517 | xpifksred(3)=chy_lbst*yijdir-shy_lbst | 1518 | xpifksred(3)=chy_lbst*yijdir-shy_lbst |
371 | 1518 | 1519 | ||
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 | 602 | endif | 602 | endif |
377 | 603 | write(ifile,'(a)') | 603 | write(ifile,'(a)') |
378 | 604 | # ' </init>' | 604 | # ' </init>' |
380 | 605 | 501 format(2(1x,i6),2(1x,e14.8),2(1x,i2),2(1x,i6),1x,i2,1x,i3) | 605 | 501 format(2(1x,i6),2(1x,e14.8),2(1x,i2),2(1x,i8),1x,i2,1x,i3) |
381 | 606 | 502 format(3(1x,e14.8),1x,i6) | 606 | 502 format(3(1x,e14.8),1x,i6) |
382 | 607 | c | 607 | c |
383 | 608 | return | 608 | return |
384 | 609 | 609 | ||
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 | 149 | write(lunlhe,502)XSECUP(1),XERRUP(1),XMAXUP(1),LPRUP(1) | 149 | write(lunlhe,502)XSECUP(1),XERRUP(1),XMAXUP(1),LPRUP(1) |
390 | 150 | write(lunlhe,'(a)')' </init>' | 150 | write(lunlhe,'(a)')' </init>' |
391 | 151 | 250 format(1x,i8) | 151 | 250 format(1x,i8) |
393 | 152 | 501 format(2(1x,i6),2(1x,d14.8),2(1x,i2),2(1x,i6),1x,i2,1x,i3) | 152 | 501 format(2(1x,i6),2(1x,d14.8),2(1x,i2),2(1x,i8),1x,i2,1x,i3) |
394 | 153 | 502 format(3(1x,d14.8),1x,i6) | 153 | 502 format(3(1x,d14.8),1x,i6) |
395 | 154 | 154 | ||
396 | 155 | return | 155 | return |
397 | 156 | 156 | ||
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 | 119 | endif | 119 | endif |
403 | 120 | matrix$(MENUM)py.so: ../$(OLP)_static f2py_wrapper.f | 120 | matrix$(MENUM)py.so: ../$(OLP)_static f2py_wrapper.f |
404 | 121 | touch __init__.py | 121 | touch __init__.py |
406 | 122 | $(F2PY) $(MADLOOP_LIB) -m matrix$(MENUM)py -c f2py_wrapper.f --fcompiler=$(FC) -L../../lib/ -ldhelas -lmodel $(LINK_LOOP_LIBS) $(STDLIB) | 122 | $(F2PY) $(MADLOOP_LIB) -m matrix$(MENUM)py -c f2py_wrapper.f --f77exec=$(FC) -L../../lib/ -ldhelas -lmodel $(LINK_LOOP_LIBS) $(STDLIB) |
407 | 123 | 123 | ||
408 | 124 | allmatrix$(MENUM)py.so: $(OLP)_static all_matrix.f $(LIBS) $(WRAPPER) | 124 | allmatrix$(MENUM)py.so: $(OLP)_static all_matrix.f $(LIBS) $(WRAPPER) |
409 | 125 | touch __init__.py | 125 | touch __init__.py |
411 | 126 | $(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) | 126 | $(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 | 127 | 127 | ||
413 | 128 | clean: | 128 | clean: |
414 | 129 | @rm -f *.o *.so *.$(libext) *.$(dylibext) | 129 | @rm -f *.o *.so *.$(libext) *.$(dylibext) |
415 | 130 | 130 | ||
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 | 1 | Update notes for MadGraph5_aMC@NLO (in reverse time order) | 1 | Update notes for MadGraph5_aMC@NLO (in reverse time order) |
421 | 2 | 2 | ||
422 | 3 | 2.6.6(27/07/19) | ||
423 | 4 | OM: Bug in the edition of the shower_card. The set command of logical parameter was never setting the | ||
424 | 5 | parameter to False. (Thanks to Richard Ruiz) | ||
425 | 6 | RF: Fixed a bug in the creation of the energy-stripped i_FKS momentum. Tested for several processes, | ||
426 | 7 | and seems to have been completely harmless. | ||
427 | 8 | OM: Forbidding the use of CKKW/default scale for some UFO model allowing gluon emission from quark with | ||
428 | 9 | no dependence in aS | ||
429 | 10 | OM: Add an option "keep_ordering" for reweighting feature to allow to sometimes use decay chain even if | ||
430 | 11 | you have ambiguity between final state particles. | ||
431 | 12 | OM: Fixed an issue with interference which sometimes happens when some polarization contribution were negative but not all of them. | ||
432 | 13 | VH: Change in the pythia8 output mode (thanks to Peter Skands) | ||
433 | 14 | 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 | 15 | OM: Energy cut (at LO) are now hidden by default for LHC type of run but visible for lepton collider ones. | ||
435 | 16 | OM: Same for beam polarization | ||
436 | 17 | |||
437 | 18 | |||
438 | 3 | 2.6.5 (03/02/19) | 19 | 2.6.5 (03/02/19) |
439 | 4 | OM: Fix some speed issue with the generated gridpack --speed issue introduced in 2.6.1-- | 20 | OM: Fix some speed issue with the generated gridpack --speed issue introduced in 2.6.1-- |
440 | 5 | OM: Fix a bug in the computation of systematics when running with Python 2.6. | 21 | OM: Fix a bug in the computation of systematics when running with Python 2.6. |
441 | @@ -12,6 +28,7 @@ | |||
442 | 12 | OM: Fix issue for BSM model with additional colored particle where the default dynamical scale choice | 28 | OM: Fix issue for BSM model with additional colored particle where the default dynamical scale choice |
443 | 13 | was crashing | 29 | was crashing |
444 | 14 | 30 | ||
445 | 31 | |||
446 | 15 | 2.6.4 (09/11/18) | 32 | 2.6.4 (09/11/18) |
447 | 16 | OM: add specific treatement for small width (at LO only and not for loop-induced) | 33 | OM: add specific treatement for small width (at LO only and not for loop-induced) |
448 | 17 | if the width is smaller than 1e-6 times the mass, a fake width (at that value) is used for the | 34 | if the width is smaller than 1e-6 times the mass, a fake width (at that value) is used for the |
449 | 18 | 35 | ||
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 @@ | |||
455 | 1 | version = 2.6.5 | 1 | version = 2.6.6.1 |
456 | 2 | date = 2018-02-03 | 2 | date = 2018-02-03 |
457 | 3 | 3 | ||
458 | 4 | 4 | ||
459 | 5 | 5 | ||
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 | 127 | if __debug__ and time.time() - start > 0.5: | 127 | if __debug__ and time.time() - start > 0.5: |
465 | 128 | print( 'WARNING: loading of madgraph too slow!!!', time.time() - start) | 128 | print( 'WARNING: loading of madgraph too slow!!!', time.time() - start) |
466 | 129 | 129 | ||
467 | 130 | try: | ||
468 | 131 | import madgraph.various.misc as misc | ||
469 | 132 | misc.EasterEgg('loading') | ||
470 | 133 | except: | ||
471 | 134 | pass | ||
472 | 135 | |||
473 | 136 | |||
474 | 130 | if options.plugin: | 137 | if options.plugin: |
475 | 131 | if not os.path.exists(os.path.join(root_path, 'PLUGIN', options.plugin)): | 138 | if not os.path.exists(os.path.join(root_path, 'PLUGIN', options.plugin)): |
476 | 132 | print( "ERROR: %s is not present in the PLUGIN directory. Please install it first") | 139 | print( "ERROR: %s is not present in the PLUGIN directory. Please install it first") |
477 | 133 | 140 | ||
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 | 1044 | self['version_tag'] = None # position of the directory (for security) | 1044 | self['version_tag'] = None # position of the directory (for security) |
483 | 1045 | self['gauge'] = [0, 1] | 1045 | self['gauge'] = [0, 1] |
484 | 1046 | self['case_sensitive'] = True | 1046 | self['case_sensitive'] = True |
485 | 1047 | self['allow_pickle'] = True | ||
486 | 1048 | self['limitations'] = [] # MLM means that the model can sometimes have issue with MLM/default scale. | ||
487 | 1047 | # attribute which might be define if needed | 1049 | # attribute which might be define if needed |
488 | 1048 | #self['name2pdg'] = {'name': pdg} | 1050 | #self['name2pdg'] = {'name': pdg} |
489 | 1049 | 1051 | ||
490 | 1050 | 1052 | ||
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 | 1334 | def __init__(self, argument = None, collect_mirror_procs = False, | 1334 | def __init__(self, argument = None, collect_mirror_procs = False, |
496 | 1335 | ignore_six_quark_processes = False, loop_filter=None, diagram_filter=False): | 1335 | ignore_six_quark_processes = False, loop_filter=None, diagram_filter=False): |
497 | 1336 | """Allow initialization with Process and with ProcessDefinition""" | 1336 | """Allow initialization with Process and with ProcessDefinition""" |
499 | 1337 | 1337 | ||
500 | 1338 | if isinstance(argument, base_objects.Process): | 1338 | if isinstance(argument, base_objects.Process): |
501 | 1339 | super(DecayChainAmplitude, self).__init__() | 1339 | super(DecayChainAmplitude, self).__init__() |
502 | 1340 | from madgraph.loop.loop_diagram_generation import LoopMultiProcess | 1340 | from madgraph.loop.loop_diagram_generation import LoopMultiProcess |
503 | @@ -1373,7 +1373,8 @@ | |||
504 | 1373 | " incoming particle" | 1373 | " incoming particle" |
505 | 1374 | self['decay_chains'].append(\ | 1374 | self['decay_chains'].append(\ |
506 | 1375 | DecayChainAmplitude(process, collect_mirror_procs, | 1375 | DecayChainAmplitude(process, collect_mirror_procs, |
508 | 1376 | ignore_six_quark_processes)) | 1376 | ignore_six_quark_processes, |
509 | 1377 | diagram_filter=diagram_filter)) | ||
510 | 1377 | 1378 | ||
511 | 1378 | # Flag decaying legs in the core diagrams by onshell = True | 1379 | # Flag decaying legs in the core diagrams by onshell = True |
512 | 1379 | decay_ids = sum([[a.get('process').get('legs')[0].get('id') \ | 1380 | decay_ids = sum([[a.get('process').get('legs')[0].get('id') \ |
513 | @@ -1782,7 +1783,7 @@ | |||
514 | 1782 | if not process.get('required_s_channels') and \ | 1783 | if not process.get('required_s_channels') and \ |
515 | 1783 | not process.get('forbidden_onsh_s_channels') and \ | 1784 | not process.get('forbidden_onsh_s_channels') and \ |
516 | 1784 | not process.get('forbidden_s_channels') and \ | 1785 | not process.get('forbidden_s_channels') and \ |
518 | 1785 | not process.get('is_decay_chain'): | 1786 | not process.get('is_decay_chain') and not diagram_filter: |
519 | 1786 | try: | 1787 | try: |
520 | 1787 | crossed_index = success_procs.index(sorted_legs) | 1788 | crossed_index = success_procs.index(sorted_legs) |
521 | 1788 | # The relabeling of legs for loop amplitudes is cumbersome | 1789 | # The relabeling of legs for loop amplitudes is cumbersome |
522 | 1789 | 1790 | ||
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 | 1663 | # Set variable for storing text | 1663 | # Set variable for storing text |
528 | 1664 | self.text = '' | 1664 | self.text = '' |
529 | 1665 | # Do we have to write a file? -> store in self.file | 1665 | # Do we have to write a file? -> store in self.file |
531 | 1666 | if file: | 1666 | if filename: |
532 | 1667 | self.file = True # Note that this variable will be overwritten. THis | 1667 | self.file = True # Note that this variable will be overwritten. THis |
533 | 1668 | #will be the object file. [initialize] | 1668 | #will be the object file. [initialize] |
534 | 1669 | else: | 1669 | else: |
535 | 1670 | 1670 | ||
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 | 458 | 'loop_orders':vertex.get('loop_orders')} | 458 | 'loop_orders':vertex.get('loop_orders')} |
541 | 459 | else: | 459 | else: |
542 | 460 | # Not that it is going to be used here, but it might be eventually | 460 | # Not that it is going to be used here, but it might be eventually |
544 | 461 | inter = model.get_interaction(vertex.get('id')) | 461 | #inter = model.get_interaction(vertex.get('id')) |
545 | 462 | loop_info = {} | 462 | loop_info = {} |
546 | 463 | 463 | ||
547 | 464 | if last_vertex: | 464 | if last_vertex: |
548 | @@ -4888,7 +4888,7 @@ | |||
549 | 4888 | 4888 | ||
550 | 4889 | return output | 4889 | return output |
551 | 4890 | 4890 | ||
553 | 4891 | def get_used_couplings(self): | 4891 | def get_used_couplings(self, output=str): |
554 | 4892 | """Return a list with all couplings used by this | 4892 | """Return a list with all couplings used by this |
555 | 4893 | HelasMatrixElement.""" | 4893 | HelasMatrixElement.""" |
556 | 4894 | 4894 | ||
557 | @@ -4896,7 +4896,10 @@ | |||
558 | 4896 | self.get_all_wavefunctions() + self.get_all_amplitudes() \ | 4896 | self.get_all_wavefunctions() + self.get_all_amplitudes() \ |
559 | 4897 | if wa.get('interaction_id') not in [0,-1]] | 4897 | if wa.get('interaction_id') not in [0,-1]] |
560 | 4898 | #some coupling have a minus one associated -> need to remove those | 4898 | #some coupling have a minus one associated -> need to remove those |
562 | 4899 | return [ [t] if not t.startswith('-') else [t[1:]] for t2 in tmp for t in t2] | 4899 | if output == str: |
563 | 4900 | return [ [t] if not t.startswith('-') else [t[1:]] for t2 in tmp for t in t2] | ||
564 | 4901 | elif output=="set": | ||
565 | 4902 | return set(sum([ [t] if not t.startswith('-') else [t[1:]] for t2 in tmp for t in t2],[])) | ||
566 | 4900 | 4903 | ||
567 | 4901 | 4904 | ||
568 | 4902 | def get_mirror_processes(self): | 4905 | def get_mirror_processes(self): |
569 | 4903 | 4906 | ||
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 | 454 | for i, ii in model.get('interaction_dict').items(): | 454 | for i, ii in model.get('interaction_dict').items(): |
575 | 455 | # i want interections of pert_order: 1 (from LO to NLO), | 455 | # i want interections of pert_order: 1 (from LO to NLO), |
576 | 456 | # without any other orders | 456 | # without any other orders |
577 | 457 | # and of "base" type | ||
578 | 458 | if ii.get('type') != 'base': continue | ||
579 | 459 | |||
580 | 457 | if ii.get('orders') == {pert_order:1} and len(ii['particles']) == 3 : | 460 | if ii.get('orders') == {pert_order:1} and len(ii['particles']) == 3 : |
581 | 458 | masslist = [p.get('mass').lower() for p in ii['particles']] | 461 | masslist = [p.get('mass').lower() for p in ii['particles']] |
586 | 459 | # check that there is at least a massless particle, and that the | 462 | |
587 | 460 | # remaining ones have the same mass | 463 | # require that at least one particle be soft and of even spin for the interaction to be IR singular |
588 | 461 | # (otherwise the real emission final state will not be degenerate | 464 | found_soft_even_spin_particle = False |
589 | 462 | # with the born one | 465 | for p in ii['particles']: |
590 | 466 | if p.get('mass').lower()=='zero': | ||
591 | 467 | if p.get('spin')%2==1: | ||
592 | 468 | found_soft_even_spin_particle = True | ||
593 | 469 | break | ||
594 | 470 | if not found_soft_even_spin_particle: | ||
595 | 471 | continue | ||
596 | 472 | |||
597 | 473 | # check that there is at least a massless particle, and that the | ||
598 | 474 | # remaining ones have the same mass | ||
599 | 475 | # (otherwise the real emission final state will not be degenerate | ||
600 | 476 | # with the born one | ||
601 | 463 | try: | 477 | try: |
602 | 464 | masslist.remove('zero') | 478 | masslist.remove('zero') |
603 | 465 | except ValueError: | 479 | except ValueError: |
604 | 466 | 480 | ||
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 | 847 | def __eq__(self, other): | 847 | def __eq__(self, other): |
610 | 848 | """Equality operator: | 848 | """Equality operator: |
611 | 849 | compare two FKSHelasRealProcesses by comparing their dictionaries""" | 849 | compare two FKSHelasRealProcesses by comparing their dictionaries""" |
612 | 850 | |||
613 | 851 | if self.__dict__ == other.__dict__: | ||
614 | 852 | return True | ||
615 | 853 | else: | ||
616 | 854 | # failed = [] | ||
617 | 855 | # for key in self.__dict__: | ||
618 | 856 | # if self.__dict__[key] != other.__dict__[key]: | ||
619 | 857 | # failed.append(key) | ||
620 | 858 | # import madgraph.various.misc as misc | ||
621 | 859 | |||
622 | 860 | return False | ||
623 | 861 | |||
624 | 862 | |||
625 | 850 | return self.__dict__ == other.__dict__ | 863 | return self.__dict__ == other.__dict__ |
626 | 851 | 864 | ||
627 | 852 | def __ne__(self, other): | 865 | def __ne__(self, other): |
628 | 853 | 866 | ||
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 | 2267 | """Require MG5 directory: Compute automatically the widths of a set | 2267 | """Require MG5 directory: Compute automatically the widths of a set |
634 | 2268 | of particles""" | 2268 | of particles""" |
635 | 2269 | 2269 | ||
636 | 2270 | |||
637 | 2271 | |||
638 | 2272 | args = self.split_arg(line) | 2270 | args = self.split_arg(line) |
639 | 2273 | opts = self.check_compute_widths(args) | 2271 | opts = self.check_compute_widths(args) |
640 | 2274 | 2272 | ||
641 | @@ -2287,9 +2285,14 @@ | |||
642 | 2287 | (' '.join([str(i) for i in opts['particles']]), | 2285 | (' '.join([str(i) for i in opts['particles']]), |
643 | 2288 | ' '.join('--%s=%s' % (key,value) for (key,value) in opts.items() | 2286 | ' '.join('--%s=%s' % (key,value) for (key,value) in opts.items() |
644 | 2289 | if key not in ['model', 'force', 'particles'] and value)) | 2287 | if key not in ['model', 'force', 'particles'] and value)) |
646 | 2290 | cmd.exec_cmd(line, model=opts['model']) | 2288 | out = cmd.exec_cmd(line, model=opts['model']) |
647 | 2289 | |||
648 | 2290 | |||
649 | 2291 | self.child = None | 2291 | self.child = None |
650 | 2292 | del cmd | 2292 | del cmd |
651 | 2293 | return out | ||
652 | 2294 | |||
653 | 2295 | |||
654 | 2293 | 2296 | ||
655 | 2294 | ############################################################################ | 2297 | ############################################################################ |
656 | 2295 | def do_print_results(self, line): | 2298 | def do_print_results(self, line): |
657 | @@ -3316,7 +3319,11 @@ | |||
658 | 3316 | logger.warning('Missing mass in the lhef file (%s) . Please fix this (use the "update missing" command if needed)', param.lhacode[0]) | 3319 | logger.warning('Missing mass in the lhef file (%s) . Please fix this (use the "update missing" command if needed)', param.lhacode[0]) |
659 | 3317 | continue | 3320 | continue |
660 | 3318 | if mass and abs(width/mass) < 1e-12: | 3321 | if mass and abs(width/mass) < 1e-12: |
662 | 3319 | 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) | 3322 | if hasattr(interface, 'run_card') and isinstance(interface.run_card, banner_mod.RunCardLO): |
663 | 3323 | if interface.run_card['small_width_treatment'] < 1e-12: | ||
664 | 3324 | 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 | 3325 | else: | ||
666 | 3326 | 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 | 3320 | if CommonRunCmd.sleep_for_error: | 3327 | if CommonRunCmd.sleep_for_error: |
668 | 3321 | time.sleep(5) | 3328 | time.sleep(5) |
669 | 3322 | CommonRunCmd.sleep_for_error = False | 3329 | CommonRunCmd.sleep_for_error = False |
670 | @@ -3677,7 +3684,7 @@ | |||
671 | 3677 | madspin_cmd.mg5cmd.options.update(self.options) | 3684 | madspin_cmd.mg5cmd.options.update(self.options) |
672 | 3678 | for key, value in self.options.items(): | 3685 | for key, value in self.options.items(): |
673 | 3679 | if isinstance(value, str): | 3686 | if isinstance(value, str): |
675 | 3680 | madspin_cmd.mg5cmd.exec_cmd( 'set %s %s' %(key,value), errorhandling=False, printcmd=False, precmd=False, postcmd=True) | 3687 | madspin_cmd.mg5cmd.exec_cmd( 'set %s %s --no_save' %(key,value), errorhandling=False, printcmd=False, precmd=False, postcmd=True) |
676 | 3681 | madspin_cmd.cluster = self.cluster | 3688 | madspin_cmd.cluster = self.cluster |
677 | 3682 | 3689 | ||
678 | 3683 | madspin_cmd.update_status = lambda *x,**opt: self.update_status(*x, level='madspin',**opt) | 3690 | madspin_cmd.update_status = lambda *x,**opt: self.update_status(*x, level='madspin',**opt) |
679 | @@ -4481,10 +4488,23 @@ | |||
680 | 4481 | if from_banner is None: | 4488 | if from_banner is None: |
681 | 4482 | self.from_banner = {} | 4489 | self.from_banner = {} |
682 | 4483 | return | 4490 | return |
684 | 4484 | misc.sprint(from_banner) | 4491 | |
685 | 4485 | self.from_banner = {} | 4492 | self.from_banner = {} |
688 | 4486 | for card in from_banner: | 4493 | try: |
689 | 4487 | self.from_banner[card] = banner.charge_card(card) | 4494 | for card in from_banner: |
690 | 4495 | self.from_banner[card] = banner.charge_card(card) | ||
691 | 4496 | except KeyError: | ||
692 | 4497 | if from_banner == ['param', 'run'] and banner.keys() == ['mgversion']: | ||
693 | 4498 | if self.mother_interface: | ||
694 | 4499 | results = self.mother_interface.results | ||
695 | 4500 | run_name = self.mother_interface.run_name | ||
696 | 4501 | run_tag = self.mother_interface.run_tag | ||
697 | 4502 | banner = banner_mod.recover_banner(results, 'parton', run_name, run_tag) | ||
698 | 4503 | self.mother_interface.banner = banner | ||
699 | 4504 | return self.init_from_banner(from_banner, banner) | ||
700 | 4505 | else: | ||
701 | 4506 | raise | ||
702 | 4507 | |||
703 | 4488 | return self.from_banner | 4508 | return self.from_banner |
704 | 4489 | 4509 | ||
705 | 4490 | 4510 | ||
706 | @@ -5413,7 +5433,7 @@ | |||
707 | 5413 | val = ' '.join(args[start+1:]) | 5433 | val = ' '.join(args[start+1:]) |
708 | 5414 | val = val.split('#')[0] | 5434 | val = val.split('#')[0] |
709 | 5415 | else: | 5435 | else: |
711 | 5416 | val = args[start+1] | 5436 | val = ' '.join(args[start+1:]) |
712 | 5417 | self.setR(args[start], val) | 5437 | self.setR(args[start], val) |
713 | 5418 | self.modified_card.add('run') # delayed writing of the run_card | 5438 | self.modified_card.add('run') # delayed writing of the run_card |
714 | 5419 | # special mode for set run_card nocut T (generated by set no_parton_cut | 5439 | # special mode for set run_card nocut T (generated by set no_parton_cut |
715 | @@ -5585,7 +5605,7 @@ | |||
716 | 5585 | else: | 5605 | else: |
717 | 5586 | args_str = ' '.join(str(a) for a in args[start+1:len(args)]) | 5606 | args_str = ' '.join(str(a) for a in args[start+1:len(args)]) |
718 | 5587 | self.shower_card.set_param(args[start],args_str,self.paths['shower']) | 5607 | self.shower_card.set_param(args[start],args_str,self.paths['shower']) |
720 | 5588 | 5608 | ||
721 | 5589 | # MadLoop Parameter --------------------------------------------------- | 5609 | # MadLoop Parameter --------------------------------------------------- |
722 | 5590 | elif self.has_ml and args[start] in self.ml_vars \ | 5610 | elif self.has_ml and args[start] in self.ml_vars \ |
723 | 5591 | and card in ['', 'MadLoop_card']: | 5611 | and card in ['', 'MadLoop_card']: |
724 | @@ -5768,22 +5788,53 @@ | |||
725 | 5768 | 5788 | ||
726 | 5769 | if mass: | 5789 | if mass: |
727 | 5770 | if abs(width/mass) < self.run_card['small_width_treatment']: | 5790 | if abs(width/mass) < self.run_card['small_width_treatment']: |
732 | 5771 | logger.warning("Particle %s will use a fake width ( %s instead of %s ).\n" + | 5791 | 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 | 5772 | "Cross-section will be rescaled according to NWA if needed." + | 5792 | param.lhacode[0], width) |
730 | 5773 | "To force exact treatment reduce the value of 'small_width_treatment' parameter of the run_card", | ||
731 | 5774 | param.lhacode[0], abs(mass*self.run_card['small_width_treatment']), width) | ||
734 | 5775 | elif abs(width/mass) < 1e-12: | 5793 | elif abs(width/mass) < 1e-12: |
735 | 5776 | 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) | 5794 | 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 | 5777 | if CommonRunCmd.sleep_for_error: | 5795 | if CommonRunCmd.sleep_for_error: |
737 | 5778 | time.sleep(5) | 5796 | time.sleep(5) |
738 | 5779 | CommonRunCmd.sleep_for_error = False | 5797 | CommonRunCmd.sleep_for_error = False |
740 | 5780 | 5798 | ||
741 | 5799 | # @LO if PY6 shower => event_norm on sum | ||
742 | 5800 | if 'pythia_card.dat' in self.cards and 'run' in self.allow_arg: | ||
743 | 5801 | if self.run_card['event_norm'] != 'sum': | ||
744 | 5802 | logger.info('Pythia6 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' ) | ||
745 | 5803 | self.do_set('run_card event_norm sum') | ||
746 | 5804 | # @LO if PY6 shower => event_norm on sum | ||
747 | 5805 | elif 'pythia8_card.dat' in self.cards: | ||
748 | 5806 | if self.run_card['event_norm'] == 'sum': | ||
749 | 5807 | logger.info('Pythia8 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' ) | ||
750 | 5808 | self.do_set('run_card event_norm average') | ||
751 | 5809 | |||
752 | 5810 | if 'MLM' in proc_charac['limitations']: | ||
753 | 5811 | if self.run_card['dynamical_scale_choice'] == -1: | ||
754 | 5812 | raise InvalidCmd, "Your model is identified as not fully supported within MG5aMC.\n" +\ | ||
755 | 5813 | "As your process seems to be impacted by the issue,\n"+\ | ||
756 | 5814 | "You can NOT run with CKKW dynamical scale for this model. Please choose another one." | ||
757 | 5815 | if self.run_card['ickkw']: | ||
758 | 5816 | raise InvalidCmd, "Your model is identified as not fully supported within MG5aMC.\n" +\ | ||
759 | 5817 | "As your process seems to be impacted by the issue,\n" +\ | ||
760 | 5818 | "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 | 5819 | |||
762 | 5781 | 5820 | ||
763 | 5782 | ######################################################################## | 5821 | ######################################################################## |
764 | 5783 | # NLO specific check | 5822 | # NLO specific check |
765 | 5784 | ######################################################################## | 5823 | ######################################################################## |
766 | 5785 | # For NLO run forbid any pdg specific cut on massless particle | 5824 | # For NLO run forbid any pdg specific cut on massless particle |
767 | 5786 | if isinstance(self.run_card,banner_mod.RunCardNLO): | 5825 | if isinstance(self.run_card,banner_mod.RunCardNLO): |
768 | 5826 | |||
769 | 5827 | try: | ||
770 | 5828 | proc_charac = self.mother_interface.proc_characteristics | ||
771 | 5829 | except: | ||
772 | 5830 | proc_charac = None | ||
773 | 5831 | |||
774 | 5832 | if proc_charac and 'MLM' in proc_charac['limitations']: | ||
775 | 5833 | if self.run_card['ickkw']: | ||
776 | 5834 | raise Exception, "Your model is identified as not fully supported within MG5aMC.\n" +\ | ||
777 | 5835 | "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 | 5836 | |||
779 | 5837 | |||
780 | 5787 | for pdg in set(self.run_card['pt_min_pdg'].keys()+self.run_card['pt_max_pdg'].keys()+ | 5838 | for pdg in set(self.run_card['pt_min_pdg'].keys()+self.run_card['pt_max_pdg'].keys()+ |
781 | 5788 | self.run_card['mxx_min_pdg'].keys()): | 5839 | self.run_card['mxx_min_pdg'].keys()): |
782 | 5789 | 5840 | ||
783 | @@ -5792,9 +5843,8 @@ | |||
784 | 5792 | if self.param_card.get_value('mass', int(pdg), default=0) ==0: | 5843 | if self.param_card.get_value('mass', int(pdg), default=0) ==0: |
785 | 5793 | raise Exception, "For NLO runs, you can use PDG specific cuts only for massive particles: (failed for %s)" % pdg | 5844 | raise Exception, "For NLO runs, you can use PDG specific cuts only for massive particles: (failed for %s)" % pdg |
786 | 5794 | 5845 | ||
790 | 5795 | # if NLO reweighting is ON: ensure that we keep the rwgt information | 5846 | # if NLO reweighting is ON: ensure that we keep the rwgt information |
791 | 5796 | if 'reweight' in self.allow_arg and 'run' in self.allow_arg and \ | 5847 | if 'reweight' in self.allow_arg and 'run' in self.allow_arg and \ |
789 | 5797 | isinstance(self.run_card,banner_mod.RunCardNLO) and \ | ||
792 | 5798 | not self.run_card['store_rwgt_info']: | 5848 | not self.run_card['store_rwgt_info']: |
793 | 5799 | #check if a NLO reweighting is required | 5849 | #check if a NLO reweighting is required |
794 | 5800 | re_pattern = re.compile(r'''^\s*change\s*mode\s* (LO\+NLO|LO|NLO|NLO_tree)\s*(?:#|$)''', re.M+re.I) | 5850 | 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 | 5804 | logger.info('NLO reweighting is on ON. Automatically set store_rwgt_info to True', '$MG:BOLD' ) | 5854 | logger.info('NLO reweighting is on ON. Automatically set store_rwgt_info to True', '$MG:BOLD' ) |
797 | 5805 | self.do_set('run_card store_rwgt_info True') | 5855 | self.do_set('run_card store_rwgt_info True') |
798 | 5806 | 5856 | ||
807 | 5807 | # if external computation for the systematics are asked then switch | 5857 | # if external computation for the systematics are asked then switch |
808 | 5808 | #automatically the book-keeping of the weight for NLO | 5858 | #automatically the book-keeping of the weight for NLO |
809 | 5809 | if 'run' in self.allow_arg and \ | 5859 | if 'run' in self.allow_arg and \ |
810 | 5810 | self.run_card['systematics_program'] == 'systematics' and \ | 5860 | self.run_card['systematics_program'] == 'systematics' and \ |
811 | 5811 | isinstance(self.run_card,banner_mod.RunCardNLO) and \ | 5861 | not self.run_card['store_rwgt_info']: |
812 | 5812 | not self.run_card['store_rwgt_info']: | 5862 | logger.warning('To be able to run systematics program, we set store_rwgt_info to True') |
813 | 5813 | logger.warning('To be able to run systematics program, we set store_rwgt_info to True') | 5863 | self.do_set('run_card store_rwgt_info True') |
806 | 5814 | self.do_set('run_card store_rwgt_info True') | ||
814 | 5815 | 5864 | ||
825 | 5816 | # @LO if PY6 shower => event_norm on sum | 5865 | |
816 | 5817 | if 'pythia_card.dat' in self.cards and 'run' in self.allow_arg: | ||
817 | 5818 | if self.run_card['event_norm'] != 'sum': | ||
818 | 5819 | logger.info('Pythia6 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' ) | ||
819 | 5820 | self.do_set('run_card event_norm sum') | ||
820 | 5821 | # @LO if PY6 shower => event_norm on sum | ||
821 | 5822 | elif 'pythia8_card.dat' in self.cards: | ||
822 | 5823 | if self.run_card['event_norm'] == 'sum': | ||
823 | 5824 | logger.info('Pythia8 needs a specific normalisation of the events. We will change it accordingly.', '$MG:BOLD' ) | ||
824 | 5825 | self.do_set('run_card event_norm average') | ||
826 | 5826 | 5866 | ||
827 | 5827 | # Check the extralibs flag. | 5867 | # Check the extralibs flag. |
828 | 5828 | if self.has_shower and isinstance(self.run_card, banner_mod.RunCardNLO): | 5868 | if self.has_shower and isinstance(self.run_card, banner_mod.RunCardNLO): |
829 | @@ -5961,7 +6001,7 @@ | |||
830 | 5961 | elif pattern_width.search(param_text): | 6001 | elif pattern_width.search(param_text): |
831 | 5962 | self.do_compute_widths('') | 6002 | self.do_compute_widths('') |
832 | 5963 | self.param_card = param_card_mod.ParamCard(self.paths['param']) | 6003 | self.param_card = param_card_mod.ParamCard(self.paths['param']) |
834 | 5964 | 6004 | ||
835 | 5965 | # calling the routine doing the work | 6005 | # calling the routine doing the work |
836 | 5966 | self.update_dependent(self.mother_interface, self.me_dir, self.param_card, | 6006 | self.update_dependent(self.mother_interface, self.me_dir, self.param_card, |
837 | 5967 | self.paths['param'], timer) | 6007 | self.paths['param'], timer) |
838 | @@ -6011,7 +6051,7 @@ | |||
839 | 6011 | if name in self.modified_card: | 6051 | if name in self.modified_card: |
840 | 6012 | self.modified_card.remove(name) | 6052 | self.modified_card.remove(name) |
841 | 6013 | else: | 6053 | else: |
843 | 6014 | raise Exception, "Need to add the associate writter proxy" | 6054 | raise Exception, "Need to add the associate writter proxy for %s" % name |
844 | 6015 | 6055 | ||
845 | 6016 | def write_card_run(self): | 6056 | def write_card_run(self): |
846 | 6017 | """ write the run_card """ | 6057 | """ write the run_card """ |
847 | @@ -6329,9 +6369,29 @@ | |||
848 | 6329 | line += ' --nlo' | 6369 | line += ' --nlo' |
849 | 6330 | 6370 | ||
850 | 6331 | try: | 6371 | try: |
852 | 6332 | return self.mother_interface.do_compute_widths(line) | 6372 | out = self.mother_interface.do_compute_widths(line) |
853 | 6333 | except InvalidCmd, error: | 6373 | except InvalidCmd, error: |
854 | 6334 | logger.error("Invalid command: %s " % error) | 6374 | logger.error("Invalid command: %s " % error) |
855 | 6375 | else: | ||
856 | 6376 | if hasattr(self, 'run_card'): | ||
857 | 6377 | for pid, info in out.items(): | ||
858 | 6378 | total = 0 | ||
859 | 6379 | for key, partial in info: | ||
860 | 6380 | total += partial | ||
861 | 6381 | mass = self.param_card.get_value('mass', pid) | ||
862 | 6382 | try: | ||
863 | 6383 | small_width_treatment = self.run_card['small_width_treatment'] | ||
864 | 6384 | except Exception: #NLO | ||
865 | 6385 | small_width_treatment = 0 | ||
866 | 6386 | |||
867 | 6387 | if total and total/mass < small_width_treatment: | ||
868 | 6388 | text = "Particle %s with very small width (%g): Learn about special handling here: https://answers.launchpad.net/mg5amcnlo/+faq/3053" | ||
869 | 6389 | logger.warning(text,pid,total) | ||
870 | 6390 | elif total and total/mass < 1e-11: | ||
871 | 6391 | text = "Particle %s with very small width (%g): Numerical inaccuracies can occur if that particle is in a s-channel" | ||
872 | 6392 | logger.critical(text,pid,total) | ||
873 | 6393 | |||
874 | 6394 | |||
875 | 6335 | 6395 | ||
876 | 6336 | def help_compute_widths(self): | 6396 | def help_compute_widths(self): |
877 | 6337 | signal.alarm(0) # avoid timer if any | 6397 | signal.alarm(0) # avoid timer if any |
878 | 6338 | 6398 | ||
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 | 2332 | elif line and hasattr(self, 'do_%s' % line.split()[0]): | 2332 | elif line and hasattr(self, 'do_%s' % line.split()[0]): |
884 | 2333 | # go to retry | 2333 | # go to retry |
885 | 2334 | reprint_opt = True | 2334 | reprint_opt = True |
887 | 2335 | elif self.value == 'repeat': | 2335 | elif self.value in ['repeat', 'reask']: |
888 | 2336 | reprint_opt = True | 2336 | reprint_opt = True |
889 | 2337 | else: | 2337 | else: |
890 | 2338 | raise Exception | 2338 | raise Exception |
892 | 2339 | except Exception, error: | 2339 | except Exception, error: |
893 | 2340 | print """not valid argument. Valid argument are file path or value in (%s).""" \ | 2340 | print """not valid argument. Valid argument are file path or value in (%s).""" \ |
894 | 2341 | % ','.join(self.allow_arg) | 2341 | % ','.join(self.allow_arg) |
895 | 2342 | print 'please retry' | 2342 | print 'please retry' |
896 | @@ -2421,6 +2421,7 @@ | |||
897 | 2421 | allowed_args += ['%s=%s;' % (key,s) for s in self.get_allowed(key)] | 2421 | allowed_args += ['%s=%s;' % (key,s) for s in self.get_allowed(key)] |
898 | 2422 | # adding special mode | 2422 | # adding special mode |
899 | 2423 | allowed_args += [key[4:]+';' for key in dir(self) if key.startswith('ans_')] | 2423 | allowed_args += [key[4:]+';' for key in dir(self) if key.startswith('ans_')] |
900 | 2424 | allowed_args += [arg[:-1] for arg in allowed_args if arg[-1] == ';'] | ||
901 | 2424 | if 'allow_arg' in opts: | 2425 | if 'allow_arg' in opts: |
902 | 2425 | allowed_args += opts['allow_arg'] | 2426 | allowed_args += opts['allow_arg'] |
903 | 2426 | del opts['allow_arg'] | 2427 | del opts['allow_arg'] |
904 | 2427 | 2428 | ||
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 | 2557 | 2557 | ||
910 | 2558 | 2558 | ||
911 | 2559 | self.create_plot('parton') | 2559 | self.create_plot('parton') |
913 | 2560 | self.exec_cmd('store_events', postcmd=False) | 2560 | self.exec_cmd('store_events', postcmd=False) |
914 | 2561 | if self.run_card['boost_event'].strip() and self.run_card['boost_event'] != 'False': | ||
915 | 2562 | self.boost_events() | ||
916 | 2563 | |||
917 | 2564 | |||
918 | 2561 | self.exec_cmd('reweight -from_cards', postcmd=False) | 2565 | self.exec_cmd('reweight -from_cards', postcmd=False) |
919 | 2562 | self.exec_cmd('decay_events -from_cards', postcmd=False) | 2566 | self.exec_cmd('decay_events -from_cards', postcmd=False) |
920 | 2563 | if self.run_card['time_of_flight']>=0: | 2567 | if self.run_card['time_of_flight']>=0: |
921 | @@ -2580,6 +2584,49 @@ | |||
922 | 2580 | self.results.current['cross'], | 2584 | self.results.current['cross'], |
923 | 2581 | self.results.current['error'])) | 2585 | self.results.current['error'])) |
924 | 2582 | 2586 | ||
925 | 2587 | def boost_events(self): | ||
926 | 2588 | |||
927 | 2589 | if not self.run_card['boost_event']: | ||
928 | 2590 | return | ||
929 | 2591 | |||
930 | 2592 | if self.run_card['boost_event'].startswith('lambda'): | ||
931 | 2593 | if not isinstance(self, cmd.CmdShell): | ||
932 | 2594 | raise Exception, "boost not allowed online" | ||
933 | 2595 | filter = eval(self.run_card['boost_event']) | ||
934 | 2596 | else: | ||
935 | 2597 | raise Exception | ||
936 | 2598 | |||
937 | 2599 | path = [pjoin(self.me_dir, 'Events', self.run_name, 'unweighted_events.lhe.gz'), | ||
938 | 2600 | pjoin(self.me_dir, 'Events', self.run_name, 'unweighted_events.lhe'), | ||
939 | 2601 | pjoin(self.me_dir, 'Events', self.run_name, 'events.lhe.gz'), | ||
940 | 2602 | pjoin(self.me_dir, 'Events', self.run_name, 'events.lhe')] | ||
941 | 2603 | |||
942 | 2604 | for p in path: | ||
943 | 2605 | if os.path.exists(p): | ||
944 | 2606 | event_path = p | ||
945 | 2607 | break | ||
946 | 2608 | else: | ||
947 | 2609 | raise Exception, "fail to find event file for the boost" | ||
948 | 2610 | |||
949 | 2611 | |||
950 | 2612 | lhe = lhe_parser.EventFile(event_path) | ||
951 | 2613 | with misc.TMP_directory() as tmp_dir: | ||
952 | 2614 | output = lhe_parser.EventFile(pjoin(tmp_dir, os.path.basename(event_path)), 'w') | ||
953 | 2615 | #write the banner to the output file | ||
954 | 2616 | output.write(lhe.banner) | ||
955 | 2617 | # Loop over all events | ||
956 | 2618 | for event in lhe: | ||
957 | 2619 | event.boost(filter) | ||
958 | 2620 | #write this modify event | ||
959 | 2621 | output.write(str(event)) | ||
960 | 2622 | output.write('</LesHouchesEvent>\n') | ||
961 | 2623 | lhe.close() | ||
962 | 2624 | files.mv(pjoin(tmp_dir, os.path.basename(event_path)), event_path) | ||
963 | 2625 | |||
964 | 2626 | |||
965 | 2627 | |||
966 | 2628 | |||
967 | 2629 | |||
968 | 2583 | def do_initMadLoop(self,line): | 2630 | def do_initMadLoop(self,line): |
969 | 2584 | """Compile and run MadLoop for a certain number of PS point so as to | 2631 | """Compile and run MadLoop for a certain number of PS point so as to |
970 | 2585 | initialize MadLoop (setup the zero helicity and loop filter.)""" | 2632 | initialize MadLoop (setup the zero helicity and loop filter.)""" |
971 | @@ -3356,8 +3403,7 @@ | |||
972 | 3356 | #fsock.close() | 3403 | #fsock.close() |
973 | 3357 | 3404 | ||
974 | 3358 | # Compile | 3405 | # Compile |
977 | 3359 | for name in ['../bin/internal/gen_ximprove', 'all', | 3406 | for name in ['../bin/internal/gen_ximprove', 'all']: |
976 | 3360 | '../bin/internal/combine_events']: | ||
978 | 3361 | self.compile(arg=[name], cwd=os.path.join(self.me_dir, 'Source')) | 3407 | self.compile(arg=[name], cwd=os.path.join(self.me_dir, 'Source')) |
979 | 3362 | 3408 | ||
980 | 3363 | 3409 | ||
981 | @@ -3516,11 +3562,9 @@ | |||
982 | 3516 | args = self.split_arg(line) | 3562 | args = self.split_arg(line) |
983 | 3517 | # Check argument's validity | 3563 | # Check argument's validity |
984 | 3518 | self.check_combine_events(args) | 3564 | self.check_combine_events(args) |
985 | 3519 | |||
986 | 3520 | self.update_status('Combining Events', level='parton') | 3565 | self.update_status('Combining Events', level='parton') |
987 | 3521 | 3566 | ||
988 | 3522 | 3567 | ||
989 | 3523 | |||
990 | 3524 | if self.run_card['gridpack'] and isinstance(self, GridPackCmd): | 3568 | if self.run_card['gridpack'] and isinstance(self, GridPackCmd): |
991 | 3525 | return GridPackCmd.do_combine_events(self, line) | 3569 | return GridPackCmd.do_combine_events(self, line) |
992 | 3526 | 3570 | ||
993 | @@ -3546,7 +3590,9 @@ | |||
994 | 3546 | 3590 | ||
995 | 3547 | partials = 0 # if too many file make some partial unweighting | 3591 | partials = 0 # if too many file make some partial unweighting |
996 | 3548 | sum_xsec, sum_xerru, sum_axsec = 0,[],0 | 3592 | sum_xsec, sum_xerru, sum_axsec = 0,[],0 |
998 | 3549 | for Gdir in self.get_Gdir(): | 3593 | Gdirs = self.get_Gdir() |
999 | 3594 | Gdirs.sort() | ||
1000 | 3595 | for Gdir in Gdirs: | ||
1001 | 3550 | if os.path.exists(pjoin(Gdir, 'events.lhe')): | 3596 | if os.path.exists(pjoin(Gdir, 'events.lhe')): |
1002 | 3551 | result = sum_html.OneResult('') | 3597 | result = sum_html.OneResult('') |
1003 | 3552 | result.read_results(pjoin(Gdir, 'results.dat')) | 3598 | result.read_results(pjoin(Gdir, 'results.dat')) |
1004 | @@ -3555,7 +3601,6 @@ | |||
1005 | 3555 | result.get('xerru'), | 3601 | result.get('xerru'), |
1006 | 3556 | result.get('axsec') | 3602 | result.get('axsec') |
1007 | 3557 | ) | 3603 | ) |
1008 | 3558 | |||
1009 | 3559 | sum_xsec += result.get('xsec') | 3604 | sum_xsec += result.get('xsec') |
1010 | 3560 | sum_xerru.append(result.get('xerru')) | 3605 | sum_xerru.append(result.get('xerru')) |
1011 | 3561 | sum_axsec += result.get('axsec') | 3606 | sum_axsec += result.get('axsec') |
1012 | @@ -3580,7 +3625,6 @@ | |||
1013 | 3580 | get_wgt, trunc_error=1e-2, event_target=self.run_card['nevents'], | 3625 | get_wgt, trunc_error=1e-2, event_target=self.run_card['nevents'], |
1014 | 3581 | log_level=logging.DEBUG, normalization=self.run_card['event_norm'], | 3626 | log_level=logging.DEBUG, normalization=self.run_card['event_norm'], |
1015 | 3582 | proc_charac=self.proc_characteristic) | 3627 | proc_charac=self.proc_characteristic) |
1016 | 3583 | |||
1017 | 3584 | if partials: | 3628 | if partials: |
1018 | 3585 | for i in range(partials): | 3629 | for i in range(partials): |
1019 | 3586 | try: | 3630 | try: |
1020 | @@ -5587,7 +5631,6 @@ | |||
1021 | 5587 | elif self.run_card['python_seed'] >= 0: | 5631 | elif self.run_card['python_seed'] >= 0: |
1022 | 5588 | import random | 5632 | import random |
1023 | 5589 | random.seed(self.run_card['python_seed']) | 5633 | random.seed(self.run_card['python_seed']) |
1024 | 5590 | |||
1025 | 5591 | if self.run_card['ickkw'] == 2: | 5634 | if self.run_card['ickkw'] == 2: |
1026 | 5592 | logger.info('Running with CKKW matching') | 5635 | logger.info('Running with CKKW matching') |
1027 | 5593 | self.treat_ckkw_matching() | 5636 | self.treat_ckkw_matching() |
1028 | @@ -5603,7 +5646,7 @@ | |||
1029 | 5603 | logger.info("compile Source Directory") | 5646 | logger.info("compile Source Directory") |
1030 | 5604 | 5647 | ||
1031 | 5605 | # Compile | 5648 | # Compile |
1033 | 5606 | for name in [ 'all', '../bin/internal/combine_events']: | 5649 | for name in [ 'all']:#, '../bin/internal/combine_events']: |
1034 | 5607 | self.compile(arg=[name], cwd=os.path.join(self.me_dir, 'Source')) | 5650 | self.compile(arg=[name], cwd=os.path.join(self.me_dir, 'Source')) |
1035 | 5608 | 5651 | ||
1036 | 5609 | bias_name = os.path.basename(self.run_card['bias_module']) | 5652 | bias_name = os.path.basename(self.run_card['bias_module']) |
1037 | @@ -6193,7 +6236,7 @@ | |||
1038 | 6193 | 6236 | ||
1039 | 6194 | if not banner: | 6237 | if not banner: |
1040 | 6195 | banner = self.banner | 6238 | banner = self.banner |
1042 | 6196 | 6239 | ||
1043 | 6197 | if auto: | 6240 | if auto: |
1044 | 6198 | self.ask_edit_cards(cards, from_banner=['param', 'run'], | 6241 | self.ask_edit_cards(cards, from_banner=['param', 'run'], |
1045 | 6199 | mode='auto', plot=(pythia_version==6), banner=banner | 6242 | mode='auto', plot=(pythia_version==6), banner=banner |
1046 | @@ -6570,7 +6613,9 @@ | |||
1047 | 6570 | 6613 | ||
1048 | 6571 | partials = 0 # if too many file make some partial unweighting | 6614 | partials = 0 # if too many file make some partial unweighting |
1049 | 6572 | sum_xsec, sum_xerru, sum_axsec = 0,[],0 | 6615 | sum_xsec, sum_xerru, sum_axsec = 0,[],0 |
1051 | 6573 | for Gdir in self.get_Gdir(): | 6616 | Gdirs = self.get_Gdir() |
1052 | 6617 | Gdirs.sort() | ||
1053 | 6618 | for Gdir in Gdirs: | ||
1054 | 6574 | #mfactor already taken into accoun in auto_dsig.f | 6619 | #mfactor already taken into accoun in auto_dsig.f |
1055 | 6575 | if os.path.exists(pjoin(Gdir, 'events.lhe')): | 6620 | if os.path.exists(pjoin(Gdir, 'events.lhe')): |
1056 | 6576 | result = sum_html.OneResult('') | 6621 | result = sum_html.OneResult('') |
1057 | @@ -6598,7 +6643,8 @@ | |||
1058 | 6598 | 6643 | ||
1059 | 6599 | if not hasattr(self,'proc_characteristic'): | 6644 | if not hasattr(self,'proc_characteristic'): |
1060 | 6600 | self.proc_characteristic = self.get_characteristics() | 6645 | self.proc_characteristic = self.get_characteristics() |
1062 | 6601 | 6646 | ||
1063 | 6647 | self.banner.add_generation_info(sum_xsec, self.nb_event) | ||
1064 | 6602 | nb_event = AllEvent.unweight(pjoin(outdir, self.run_name, "unweighted_events.lhe.gz"), | 6648 | nb_event = AllEvent.unweight(pjoin(outdir, self.run_name, "unweighted_events.lhe.gz"), |
1065 | 6603 | get_wgt, trunc_error=1e-2, event_target=self.nb_event, | 6649 | get_wgt, trunc_error=1e-2, event_target=self.nb_event, |
1066 | 6604 | log_level=logging.DEBUG, normalization=self.run_card['event_norm'], | 6650 | log_level=logging.DEBUG, normalization=self.run_card['event_norm'], |
1067 | @@ -6613,75 +6659,10 @@ | |||
1068 | 6613 | os.remove(pjoin(outdir, self.run_name, "partials%s.lhe" % i)) | 6659 | os.remove(pjoin(outdir, self.run_name, "partials%s.lhe" % i)) |
1069 | 6614 | 6660 | ||
1070 | 6615 | self.results.add_detail('nb_event', nb_event) | 6661 | self.results.add_detail('nb_event', nb_event) |
1072 | 6616 | 6662 | self.banner.add_generation_info(sum_xsec, nb_event) | |
1073 | 6617 | if self.run_card['bias_module'].lower() not in ['dummy', 'none']: | 6663 | if self.run_card['bias_module'].lower() not in ['dummy', 'none']: |
1074 | 6618 | self.correct_bias() | 6664 | self.correct_bias() |
1075 | 6619 | 6665 | ||
1076 | 6620 | def do_combine_events_v4(self, line): | ||
1077 | 6621 | """Advanced commands: Launch combine events""" | ||
1078 | 6622 | |||
1079 | 6623 | args = self.split_arg(line) | ||
1080 | 6624 | |||
1081 | 6625 | # Check argument's validity | ||
1082 | 6626 | self.check_combine_events(args) | ||
1083 | 6627 | |||
1084 | 6628 | self.update_status('Combining Events', level='parton') | ||
1085 | 6629 | |||
1086 | 6630 | try: | ||
1087 | 6631 | os.remove(pjoin(self.me_dir,'SubProcesses', 'combine.log')) | ||
1088 | 6632 | except Exception: | ||
1089 | 6633 | pass | ||
1090 | 6634 | |||
1091 | 6635 | if not self.readonly: | ||
1092 | 6636 | run_dir = pjoin(self.me_dir,'SubProcesses') | ||
1093 | 6637 | stdout_file = pjoin(self.me_dir,'SubProcesses', 'combine.log') | ||
1094 | 6638 | else: | ||
1095 | 6639 | run_dir = pjoin('SubProcesses') | ||
1096 | 6640 | stdout_file = pjoin('SubProcesses', 'combine.log') | ||
1097 | 6641 | |||
1098 | 6642 | cluster.onecore.launch_and_wait('../bin/internal/run_combine', | ||
1099 | 6643 | args=[self.run_name], | ||
1100 | 6644 | cwd=run_dir, | ||
1101 | 6645 | stdout=stdout_file, | ||
1102 | 6646 | required_output=[pjoin(self.me_dir,'SubProcesses', 'combine.log')]) | ||
1103 | 6647 | |||
1104 | 6648 | output = misc.mult_try_open(stdout_file).read() | ||
1105 | 6649 | # Store the number of unweighted events for the results object | ||
1106 | 6650 | pat = re.compile(r'''\s*Unweighting\s*selected\s*(\d+)\s*events''') | ||
1107 | 6651 | try: | ||
1108 | 6652 | nb_event = pat.search(output).groups()[0] | ||
1109 | 6653 | except AttributeError: | ||
1110 | 6654 | time.sleep(10) | ||
1111 | 6655 | output = misc.mult_try_open(pjoin(self.me_dir,'SubProcesses','combine.log')).read() | ||
1112 | 6656 | try: | ||
1113 | 6657 | nb_event = pat.search(output).groups()[0] | ||
1114 | 6658 | except AttributeError: | ||
1115 | 6659 | logger.warning('Fail to read the number of unweighted events in the combine.log file') | ||
1116 | 6660 | nb_event = 0 | ||
1117 | 6661 | self.results.add_detail('nb_event', nb_event) | ||
1118 | 6662 | |||
1119 | 6663 | # Define The Banner | ||
1120 | 6664 | tag = self.run_card['run_tag'] | ||
1121 | 6665 | |||
1122 | 6666 | # Update the banner with the pythia card | ||
1123 | 6667 | if not self.banner: | ||
1124 | 6668 | self.banner = banner_mod.recover_banner(self.results, 'parton') | ||
1125 | 6669 | self.banner.load_basic(self.me_dir) | ||
1126 | 6670 | # Add cross-section/event information | ||
1127 | 6671 | self.banner.add_generation_info(self.results.current['cross'], nb_event) | ||
1128 | 6672 | if not hasattr(self, 'random_orig'): self.random_orig = 0 | ||
1129 | 6673 | self.banner.change_seed(self.random_orig) | ||
1130 | 6674 | if not os.path.exists(pjoin(self.me_dir, 'Events', self.run_name)): | ||
1131 | 6675 | os.mkdir(pjoin(self.me_dir, 'Events', self.run_name)) | ||
1132 | 6676 | self.banner.write(pjoin(self.me_dir, 'Events', self.run_name, | ||
1133 | 6677 | '%s_%s_banner.txt' % (self.run_name, tag))) | ||
1134 | 6678 | |||
1135 | 6679 | |||
1136 | 6680 | self.banner.add_to_file(pjoin(self.me_dir,'Events', 'events.lhe'), | ||
1137 | 6681 | out=pjoin(self.me_dir,'Events', self.run_name, 'events.lhe')) | ||
1138 | 6682 | self.banner.add_to_file(pjoin(self.me_dir,'Events', 'unweighted_events.lhe'), | ||
1139 | 6683 | out=pjoin(self.me_dir,'Events', self.run_name, 'unweighted_events.lhe')) | ||
1140 | 6684 | |||
1141 | 6685 | 6666 | ||
1142 | 6686 | class MadLoopInitializer(object): | 6667 | class MadLoopInitializer(object): |
1143 | 6687 | """ A container class for the various methods for initializing MadLoop. It is | 6668 | """ A container class for the various methods for initializing MadLoop. It is |
1144 | 6688 | 6669 | ||
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 | 1447 | if not args[1].isdigit(): | 1447 | if not args[1].isdigit(): |
1150 | 1448 | raise self.InvalidCmd('%s values should be a integer' % args[0]) | 1448 | raise self.InvalidCmd('%s values should be a integer' % args[0]) |
1151 | 1449 | 1449 | ||
1152 | 1450 | if args[0] in ['low_mem_multicore_nlo_generation']: | ||
1153 | 1451 | if sys.version_info[0] == 2 and sys.version_info[1] == 6: | ||
1154 | 1452 | raise self.InvalidCmd('python2.6 does not support such functionalities please use python2.7') | ||
1155 | 1453 | |||
1156 | 1454 | |||
1157 | 1450 | if args[0] in ['loop_optimized_output', 'loop_color_flows', 'low_mem_multicore_nlo_generation']: | 1455 | if args[0] in ['loop_optimized_output', 'loop_color_flows', 'low_mem_multicore_nlo_generation']: |
1158 | 1451 | try: | 1456 | try: |
1159 | 1452 | args[1] = banner_module.ConfigFile.format_variable(args[1], bool, args[0]) | 1457 | args[1] = banner_module.ConfigFile.format_variable(args[1], bool, args[0]) |
1160 | 1453 | except Exception: | 1458 | except Exception: |
1161 | 1454 | raise self.InvalidCmd('%s needs argument True or False'%args[0]) | 1459 | raise self.InvalidCmd('%s needs argument True or False'%args[0]) |
1162 | 1455 | 1460 | ||
1163 | 1461 | |||
1164 | 1456 | if args[0] in ['gauge']: | 1462 | if args[0] in ['gauge']: |
1165 | 1457 | if args[1] not in ['unitary','Feynman']: | 1463 | if args[1] not in ['unitary','Feynman']: |
1166 | 1458 | raise self.InvalidCmd('gauge needs argument unitary or Feynman.') | 1464 | raise self.InvalidCmd('gauge needs argument unitary or Feynman.') |
1167 | @@ -3081,6 +3087,14 @@ | |||
1168 | 3081 | " can only be given on one type of coupling and either on"+\ | 3087 | " can only be given on one type of coupling and either on"+\ |
1169 | 3082 | " squared orders or amplitude orders, not both.") | 3088 | " squared orders or amplitude orders, not both.") |
1170 | 3083 | 3089 | ||
1171 | 3090 | if myprocdef.get_ninitial() ==1 and myprocdef.get('squared_orders'): | ||
1172 | 3091 | logger.warning('''Computation of interference term with decay is not 100% validated. | ||
1173 | 3092 | Please check carefully your result. | ||
1174 | 3093 | One suggestion is also to compare the generation of your process with and without | ||
1175 | 3094 | set group_subprocesses True | ||
1176 | 3095 | (to write Before the generate command) | ||
1177 | 3096 | ''') | ||
1178 | 3097 | |||
1179 | 3084 | cpu_time1 = time.time() | 3098 | cpu_time1 = time.time() |
1180 | 3085 | 3099 | ||
1181 | 3086 | # Generate processes | 3100 | # Generate processes |
1182 | @@ -4718,7 +4732,7 @@ | |||
1183 | 4718 | split_orders=list(set(perturbation_couplings_list+squared_orders.keys())) | 4732 | split_orders=list(set(perturbation_couplings_list+squared_orders.keys())) |
1184 | 4719 | try: | 4733 | try: |
1185 | 4720 | split_orders.sort(key=lambda elem: 0 if elem=='WEIGHTED' else | 4734 | split_orders.sort(key=lambda elem: 0 if elem=='WEIGHTED' else |
1187 | 4721 | self._curr_model['order_hierarchy'] | 4735 | self._curr_model.get('order_hierarchy') |
1188 | 4722 | [elem if not elem.endswith('.sqrt') else elem[:-5]]) | 4736 | [elem if not elem.endswith('.sqrt') else elem[:-5]]) |
1189 | 4723 | except KeyError: | 4737 | except KeyError: |
1190 | 4724 | raise self.InvalidCmd, "The loaded model does not defined a "+\ | 4738 | raise self.InvalidCmd, "The loaded model does not defined a "+\ |
1191 | @@ -5825,8 +5839,8 @@ | |||
1192 | 5825 | 'MadAnalysis':['arXiv:1206.1599'], | 5839 | 'MadAnalysis':['arXiv:1206.1599'], |
1193 | 5826 | 'collier':['arXiv:1604.06792'], | 5840 | 'collier':['arXiv:1604.06792'], |
1194 | 5827 | 'oneloop':['arXiv:1007.4716'], | 5841 | 'oneloop':['arXiv:1007.4716'], |
1197 | 5828 | 'maddm':['arXiv:1505.04190'], | 5842 | 'maddm':['arXiv:1804.00444'], |
1198 | 5829 | 'maddump':['arXiv:1806.xxxxx']} | 5843 | 'maddump':['arXiv:1812.06771']} |
1199 | 5830 | 5844 | ||
1200 | 5831 | install_server = ['http://madgraph.phys.ucl.ac.be/package_info.dat', | 5845 | install_server = ['http://madgraph.phys.ucl.ac.be/package_info.dat', |
1201 | 5832 | 'http://madgraph.physics.illinois.edu/package_info.dat'] | 5846 | 'http://madgraph.physics.illinois.edu/package_info.dat'] |
1202 | @@ -7292,7 +7306,11 @@ | |||
1203 | 7292 | # We don't want to go through the MasterCommand again | 7306 | # We don't want to go through the MasterCommand again |
1204 | 7293 | # because it messes with the interface switching when | 7307 | # because it messes with the interface switching when |
1205 | 7294 | # importing a loop model from MG5 | 7308 | # importing a loop model from MG5 |
1207 | 7295 | MadGraphCmd.do_import(self,'model %s' %model_name, force=True) | 7309 | if 'modelname' in self.history.get('full_model_line'): |
1208 | 7310 | opts = '--modelname' | ||
1209 | 7311 | else: | ||
1210 | 7312 | opts='' | ||
1211 | 7313 | MadGraphCmd.do_import(self,'model %s %s' % (model_name, opts), force=True) | ||
1212 | 7296 | elif log: | 7314 | elif log: |
1213 | 7297 | logger.info('Note that you have to reload the model') | 7315 | logger.info('Note that you have to reload the model') |
1214 | 7298 | 7316 | ||
1215 | @@ -8132,7 +8150,7 @@ | |||
1216 | 8132 | madevent_interface.MadEventCmd.update_width_in_param_card(decay_info, | 8150 | madevent_interface.MadEventCmd.update_width_in_param_card(decay_info, |
1217 | 8133 | opts['path'], opts['output']) | 8151 | opts['path'], opts['output']) |
1218 | 8134 | if float(opts['body_decay']) == 2: | 8152 | if float(opts['body_decay']) == 2: |
1220 | 8135 | return | 8153 | return decay_info |
1221 | 8136 | else: | 8154 | else: |
1222 | 8137 | skip_2body = True | 8155 | skip_2body = True |
1223 | 8138 | 8156 | ||
1224 | @@ -8153,7 +8171,7 @@ | |||
1225 | 8153 | 8171 | ||
1226 | 8154 | 8172 | ||
1227 | 8155 | 8173 | ||
1229 | 8156 | return | 8174 | return decay_info |
1230 | 8157 | 8175 | ||
1231 | 8158 | # Do the MadEvent integration!! | 8176 | # Do the MadEvent integration!! |
1232 | 8159 | with misc.TMP_directory(dir=os.getcwd()) as path: | 8177 | with misc.TMP_directory(dir=os.getcwd()) as path: |
1233 | @@ -8161,6 +8179,15 @@ | |||
1234 | 8161 | logger_mg.info('More info in temporary files:\n %s/index.html' % (decay_dir)) | 8179 | logger_mg.info('More info in temporary files:\n %s/index.html' % (decay_dir)) |
1235 | 8162 | with misc.MuteLogger(['madgraph','ALOHA','cmdprint','madevent'], [40,40,40,40]): | 8180 | with misc.MuteLogger(['madgraph','ALOHA','cmdprint','madevent'], [40,40,40,40]): |
1236 | 8163 | self.exec_cmd('output %s -f' % decay_dir,child=False) | 8181 | self.exec_cmd('output %s -f' % decay_dir,child=False) |
1237 | 8182 | |||
1238 | 8183 | #modify some parameter of the default run_card | ||
1239 | 8184 | run_card = banner_module.RunCard(pjoin(decay_dir,'Cards','run_card.dat')) | ||
1240 | 8185 | if run_card['ickkw']: | ||
1241 | 8186 | run_card['ickkw'] = 0 | ||
1242 | 8187 | run_card['xqcut'] = 0 | ||
1243 | 8188 | run_card.remove_all_cut() | ||
1244 | 8189 | run_card.write(pjoin(decay_dir,'Cards','run_card.dat')) | ||
1245 | 8190 | |||
1246 | 8164 | # Need to write the correct param_card in the correct place !!! | 8191 | # Need to write the correct param_card in the correct place !!! |
1247 | 8165 | if os.path.exists(opts['output']): | 8192 | if os.path.exists(opts['output']): |
1248 | 8166 | files.cp(opts['output'], pjoin(decay_dir, 'Cards', 'param_card.dat')) | 8193 | files.cp(opts['output'], pjoin(decay_dir, 'Cards', 'param_card.dat')) |
1249 | @@ -8223,7 +8250,7 @@ | |||
1250 | 8223 | 8250 | ||
1251 | 8224 | if self._curr_model['name'] == 'mssm' or self._curr_model['name'].startswith('mssm-'): | 8251 | if self._curr_model['name'] == 'mssm' or self._curr_model['name'].startswith('mssm-'): |
1252 | 8225 | check_param_card.convert_to_slha1(opts['output']) | 8252 | check_param_card.convert_to_slha1(opts['output']) |
1254 | 8226 | return | 8253 | return decay_info |
1255 | 8227 | 8254 | ||
1256 | 8228 | 8255 | ||
1257 | 8229 | 8256 | ||
1258 | 8230 | 8257 | ||
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 | 47 | import madgraph.iolibs.files as files | 47 | import madgraph.iolibs.files as files |
1264 | 48 | import madgraph.various.misc as misc | 48 | import madgraph.various.misc as misc |
1265 | 49 | 49 | ||
1267 | 50 | from madgraph import MG4DIR, MG5DIR, MadGraph5Error | 50 | from madgraph import MG4DIR, MG5DIR, MadGraph5Error, InvalidCmd |
1268 | 51 | 51 | ||
1269 | 52 | logger = logging.getLogger('cmdprint') # -> stdout | 52 | logger = logging.getLogger('cmdprint') # -> stdout |
1270 | 53 | 53 | ||
1271 | @@ -198,6 +198,10 @@ | |||
1272 | 198 | 198 | ||
1273 | 199 | def do_add(self, line, *args, **opts): | 199 | def do_add(self, line, *args, **opts): |
1274 | 200 | 200 | ||
1275 | 201 | allow_switch = True | ||
1276 | 202 | if self._curr_proc_defs: | ||
1277 | 203 | allow_switch = False | ||
1278 | 204 | |||
1279 | 201 | argss = cmd.Cmd.split_arg(line) | 205 | argss = cmd.Cmd.split_arg(line) |
1280 | 202 | if len(argss)>=1 and argss[0] in ['process','timing','profile']: | 206 | if len(argss)>=1 and argss[0] in ['process','timing','profile']: |
1281 | 203 | proc_line = ' '.join(argss[1:]) | 207 | proc_line = ' '.join(argss[1:]) |
1282 | @@ -207,17 +211,17 @@ | |||
1283 | 207 | 'The NLO mode %s is not valid. Please choose one among: %s' \ | 211 | 'The NLO mode %s is not valid. Please choose one among: %s' \ |
1284 | 208 | % (nlo_mode, ' '.join(self._valid_nlo_modes))) | 212 | % (nlo_mode, ' '.join(self._valid_nlo_modes))) |
1285 | 209 | elif nlo_mode in ['all', 'real', 'LOonly']: | 213 | elif nlo_mode in ['all', 'real', 'LOonly']: |
1287 | 210 | self.change_principal_cmd('aMC@NLO') | 214 | self.change_principal_cmd('aMC@NLO', allow_switch) |
1288 | 211 | elif nlo_mode in ['virt', 'sqrvirt']: | 215 | elif nlo_mode in ['virt', 'sqrvirt']: |
1290 | 212 | self.change_principal_cmd('MadLoop') | 216 | self.change_principal_cmd('MadLoop', allow_switch) |
1291 | 213 | elif nlo_mode == 'noborn': | 217 | elif nlo_mode == 'noborn': |
1293 | 214 | self.change_principal_cmd('MadLoop') | 218 | self.change_principal_cmd('MadLoop', allow_switch) |
1294 | 215 | self.cmd.validate_model(self, loop_type=nlo_mode, | 219 | self.cmd.validate_model(self, loop_type=nlo_mode, |
1295 | 216 | coupling_type=orders) | 220 | coupling_type=orders) |
1297 | 217 | self.change_principal_cmd('MadGraph') | 221 | self.change_principal_cmd('MadGraph', allow_switch) |
1298 | 218 | return self.cmd.create_loop_induced(self, line, *args, **opts) | 222 | return self.cmd.create_loop_induced(self, line, *args, **opts) |
1299 | 219 | else: | 223 | else: |
1301 | 220 | self.change_principal_cmd('MadGraph') | 224 | self.change_principal_cmd('MadGraph', allow_switch) |
1302 | 221 | try: | 225 | try: |
1303 | 222 | return self.cmd.do_add(self, line, *args, **opts) | 226 | return self.cmd.do_add(self, line, *args, **opts) |
1304 | 223 | except fks_base.NoBornException: | 227 | except fks_base.NoBornException: |
1305 | @@ -225,7 +229,7 @@ | |||
1306 | 225 | logger.info(" No Born diagrams found. Now switching to the loop-induced mode. ", '$MG:BOLD') | 229 | logger.info(" No Born diagrams found. Now switching to the loop-induced mode. ", '$MG:BOLD') |
1307 | 226 | logger.info(" Please cite ref. 'arXiv:1507.00020' when using results from this mode. ", '$MG:BOLD') | 230 | logger.info(" Please cite ref. 'arXiv:1507.00020' when using results from this mode. ", '$MG:BOLD') |
1308 | 227 | logger.info("------------------------------------------------------------------------", '$MG:BOLD') | 231 | logger.info("------------------------------------------------------------------------", '$MG:BOLD') |
1310 | 228 | self.change_principal_cmd('MadGraph') | 232 | self.change_principal_cmd('MadGraph',allow_switch) |
1311 | 229 | return self.cmd.create_loop_induced(self, line, *args, **opts) | 233 | return self.cmd.create_loop_induced(self, line, *args, **opts) |
1312 | 230 | 234 | ||
1313 | 231 | 235 | ||
1314 | @@ -608,9 +612,15 @@ | |||
1315 | 608 | %args[0]+" Valid interfaces are %s"\ | 612 | %args[0]+" Valid interfaces are %s"\ |
1316 | 609 | %','.join(interface_quick_name.keys())) | 613 | %','.join(interface_quick_name.keys())) |
1317 | 610 | 614 | ||
1319 | 611 | def change_principal_cmd(self, name): | 615 | def change_principal_cmd(self, name, allow_switch=True): |
1320 | 616 | |||
1321 | 612 | 617 | ||
1322 | 613 | old_cmd=self.current_interface | 618 | old_cmd=self.current_interface |
1323 | 619 | if old_cmd == name: | ||
1324 | 620 | return | ||
1325 | 621 | elif not allow_switch: | ||
1326 | 622 | raise InvalidCmd, "Command not compatible with previous command: Can not combine LO/NLO feature." | ||
1327 | 623 | |||
1328 | 614 | if name in self.interface_names.keys(): | 624 | if name in self.interface_names.keys(): |
1329 | 615 | self.prompt= self.interface_names[name][0]+'>' | 625 | self.prompt= self.interface_names[name][0]+'>' |
1330 | 616 | self.cmd= self.interface_names[name][1] | 626 | self.cmd= self.interface_names[name][1] |
1331 | 617 | 627 | ||
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 | 108 | self.has_nlo = False | 108 | self.has_nlo = False |
1337 | 109 | self.rwgt_dir = None | 109 | self.rwgt_dir = None |
1338 | 110 | self.exitted = False # Flag to know if do_quit was already called. | 110 | self.exitted = False # Flag to know if do_quit was already called. |
1340 | 111 | 111 | self.keep_ordering = False | |
1341 | 112 | if event_path: | 112 | if event_path: |
1342 | 113 | logger.info("Extracting the banner ...") | 113 | logger.info("Extracting the banner ...") |
1343 | 114 | self.do_import(event_path, allow_madspin=allow_madspin) | 114 | self.do_import(event_path, allow_madspin=allow_madspin) |
1344 | @@ -354,6 +354,8 @@ | |||
1345 | 354 | if self.has_standalone_dir: | 354 | if self.has_standalone_dir: |
1346 | 355 | self.terminate_fortran_executables() | 355 | self.terminate_fortran_executables() |
1347 | 356 | self.has_standalone_dir = False | 356 | self.has_standalone_dir = False |
1348 | 357 | elif args[0] == "keep_ordering": | ||
1349 | 358 | self.keep_ordering = banner.ConfigFile.format_variable(args[1], bool, "keep_ordering") | ||
1350 | 357 | elif args[0] == "process": | 359 | elif args[0] == "process": |
1351 | 358 | nb_f2py_module += 1 | 360 | nb_f2py_module += 1 |
1352 | 359 | if self.has_standalone_dir: | 361 | if self.has_standalone_dir: |
1353 | @@ -747,7 +749,6 @@ | |||
1354 | 747 | if 'initrwgt' in self.banner and self.output_type == 'default': | 749 | if 'initrwgt' in self.banner and self.output_type == 'default': |
1355 | 748 | if 'name=\'mg_reweighting\'' in self.banner['initrwgt']: | 750 | if 'name=\'mg_reweighting\'' in self.banner['initrwgt']: |
1356 | 749 | blockpat = re.compile(r'''<weightgroup name=\'mg_reweighting\'\s*weight_name_strategy=\'includeIdInWeightName\'>(?P<text>.*?)</weightgroup>''', re.I+re.M+re.S) | 751 | blockpat = re.compile(r'''<weightgroup name=\'mg_reweighting\'\s*weight_name_strategy=\'includeIdInWeightName\'>(?P<text>.*?)</weightgroup>''', re.I+re.M+re.S) |
1357 | 750 | misc.sprint(blockpat, self.banner['initrwgt']) | ||
1358 | 751 | before, content, after = blockpat.split(self.banner['initrwgt']) | 752 | before, content, after = blockpat.split(self.banner['initrwgt']) |
1359 | 752 | header_rwgt_other = before + after | 753 | header_rwgt_other = before + after |
1360 | 753 | 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) | 754 | 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 | 1144 | nb_retry, sleep = 5, 20 | 1145 | nb_retry, sleep = 5, 20 |
1363 | 1145 | 1146 | ||
1364 | 1146 | tag, order = event.get_tag_and_order() | 1147 | tag, order = event.get_tag_and_order() |
1365 | 1148 | if self.keep_ordering: | ||
1366 | 1149 | old_tag = tuple(tag) | ||
1367 | 1150 | tag = (tag[0], tuple(order[1])) | ||
1368 | 1147 | if isinstance(hypp_id, str) and hypp_id.startswith('V'): | 1151 | if isinstance(hypp_id, str) and hypp_id.startswith('V'): |
1369 | 1148 | tag = (tag,'V') | 1152 | tag = (tag,'V') |
1370 | 1149 | hypp_id = int(hypp_id[1:]) | 1153 | hypp_id = int(hypp_id[1:]) |
1371 | @@ -1404,6 +1408,7 @@ | |||
1372 | 1404 | else: | 1408 | else: |
1373 | 1405 | proc = proc.replace('[', '[ virt=') | 1409 | proc = proc.replace('[', '[ virt=') |
1374 | 1406 | commandline += "add process %s ;" % proc | 1410 | commandline += "add process %s ;" % proc |
1375 | 1411 | commandline = re.sub('@\s*\d+', '', commandline) | ||
1376 | 1407 | # deactivate golem since it creates troubles | 1412 | # deactivate golem since it creates troubles |
1377 | 1408 | old_options = dict(mgcmd.options) | 1413 | old_options = dict(mgcmd.options) |
1378 | 1409 | if mgcmd.options['golem'] or mgcmd.options['pjfry']: | 1414 | if mgcmd.options['golem'] or mgcmd.options['pjfry']: |
1379 | @@ -1776,7 +1781,8 @@ | |||
1380 | 1776 | outgoing = pdg[2:] | 1781 | outgoing = pdg[2:] |
1381 | 1777 | order = (list(incoming), list(outgoing)) | 1782 | order = (list(incoming), list(outgoing)) |
1382 | 1778 | incoming.sort() | 1783 | incoming.sort() |
1384 | 1779 | outgoing.sort() | 1784 | if not self.keep_ordering: |
1385 | 1785 | outgoing.sort() | ||
1386 | 1780 | tag = (tuple(incoming), tuple(outgoing)) | 1786 | tag = (tuple(incoming), tuple(outgoing)) |
1387 | 1781 | if 'virt' in onedir: | 1787 | if 'virt' in onedir: |
1388 | 1782 | tag = (tag, 'V') | 1788 | tag = (tag, 'V') |
1389 | @@ -1797,10 +1803,12 @@ | |||
1390 | 1797 | misc.sprint(order, pdir,) | 1803 | misc.sprint(order, pdir,) |
1391 | 1798 | raise Exception | 1804 | raise Exception |
1392 | 1799 | else: | 1805 | else: |
1393 | 1806 | misc.sprint(all_prefix[all_pdgs.index(pdg)]) | ||
1394 | 1807 | misc.sprint(all_prefix[all_pdgs.index(oldpdg)]) | ||
1395 | 1800 | misc.sprint(tag, onedir) | 1808 | misc.sprint(tag, onedir) |
1396 | 1801 | misc.sprint(data[tag][:-1]) | 1809 | misc.sprint(data[tag][:-1]) |
1397 | 1802 | misc.sprint(order, pdir,) | 1810 | misc.sprint(order, pdir,) |
1399 | 1803 | raise Exception | 1811 | 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 | 1804 | 1812 | ||
1401 | 1805 | data[tag] = order, pdir, hel | 1813 | data[tag] = order, pdir, hel |
1402 | 1806 | 1814 | ||
1403 | 1807 | 1815 | ||
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 | 3840 | # indicate that the output type is not grouped | 3840 | # indicate that the output type is not grouped |
1409 | 3841 | if not isinstance(self, ProcessExporterFortranMEGroup): | 3841 | if not isinstance(self, ProcessExporterFortranMEGroup): |
1410 | 3842 | self.proc_characteristic['grouped_matrix'] = False | 3842 | self.proc_characteristic['grouped_matrix'] = False |
1411 | 3843 | |||
1412 | 3843 | self.proc_characteristic['complex_mass_scheme'] = mg5options['complex_mass_scheme'] | 3844 | self.proc_characteristic['complex_mass_scheme'] = mg5options['complex_mass_scheme'] |
1413 | 3845 | |||
1414 | 3846 | # set limitation linked to the model | ||
1415 | 3847 | |||
1416 | 3848 | |||
1417 | 3844 | # indicate the PDG of all initial particle | 3849 | # indicate the PDG of all initial particle |
1418 | 3845 | try: | 3850 | try: |
1419 | 3846 | 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)] | 3851 | 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 | 3971 | # Set lowercase/uppercase Fortran code | 3976 | # Set lowercase/uppercase Fortran code |
1422 | 3972 | writers.FortranWriter.downcase = False | 3977 | writers.FortranWriter.downcase = False |
1423 | 3973 | 3978 | ||
1424 | 3979 | # check if MLM/.../ is supported for this matrix-element and update associate flag | ||
1425 | 3980 | if self.model and 'MLM' in self.model["limitations"]: | ||
1426 | 3981 | if 'MLM' not in self.proc_characteristic["limitations"]: | ||
1427 | 3982 | used_couplings = matrix_element.get_used_couplings(output="set") | ||
1428 | 3983 | for vertex in self.model.get('interactions'): | ||
1429 | 3984 | particles = [p for p in vertex.get('particles')] | ||
1430 | 3985 | if 21 in [p.get('pdg_code') for p in particles]: | ||
1431 | 3986 | colors = [par.get('color') for par in particles] | ||
1432 | 3987 | if 1 in colors: | ||
1433 | 3988 | continue | ||
1434 | 3989 | elif 'QCD' not in vertex.get('orders'): | ||
1435 | 3990 | for bad_coup in vertex.get('couplings').values(): | ||
1436 | 3991 | if bad_coup in used_couplings: | ||
1437 | 3992 | self.proc_characteristic["limitations"].append('MLM') | ||
1438 | 3993 | break | ||
1439 | 3994 | |||
1440 | 3974 | # The proc prefix is not used for MadEvent output so it can safely be set | 3995 | # The proc prefix is not used for MadEvent output so it can safely be set |
1441 | 3975 | # to an empty string. | 3996 | # to an empty string. |
1442 | 3976 | replace_dict = {'proc_prefix':''} | 3997 | replace_dict = {'proc_prefix':''} |
1443 | @@ -4103,7 +4124,7 @@ | |||
1444 | 4103 | replace_dict['ampsplitorders']='\n'.join(amp_so) | 4124 | replace_dict['ampsplitorders']='\n'.join(amp_so) |
1445 | 4104 | replace_dict['sqsplitorders']='\n'.join(sqamp_so) | 4125 | replace_dict['sqsplitorders']='\n'.join(sqamp_so) |
1446 | 4105 | 4126 | ||
1448 | 4106 | 4127 | ||
1449 | 4107 | # Extract JAMP lines | 4128 | # Extract JAMP lines |
1450 | 4108 | # If no split_orders then artificiall add one entry called 'ALL_ORDERS' | 4129 | # If no split_orders then artificiall add one entry called 'ALL_ORDERS' |
1451 | 4109 | jamp_lines = self.get_JAMP_lines_split_order(\ | 4130 | jamp_lines = self.get_JAMP_lines_split_order(\ |
1452 | @@ -5120,6 +5141,16 @@ | |||
1453 | 5120 | 5141 | ||
1454 | 5121 | filename = 'symfact_orig.dat' | 5142 | filename = 'symfact_orig.dat' |
1455 | 5122 | self.write_symfact_file(open(filename, 'w'), symmetry) | 5143 | self.write_symfact_file(open(filename, 'w'), symmetry) |
1456 | 5144 | |||
1457 | 5145 | # check consistency | ||
1458 | 5146 | for i, sym_fact in enumerate(symmetry): | ||
1459 | 5147 | if sym_fact > 0: | ||
1460 | 5148 | continue | ||
1461 | 5149 | if nqcd_list[i] != nqcd_list[abs(sym_fact)-1]: | ||
1462 | 5150 | misc.sprint(i, sym_fact, nqcd_list[i], nqcd_list[abs(sym_fact)]) | ||
1463 | 5151 | raise Exception, "identical diagram with different QCD powwer" | ||
1464 | 5152 | |||
1465 | 5153 | |||
1466 | 5123 | 5154 | ||
1467 | 5124 | filename = 'symperms.inc' | 5155 | filename = 'symperms.inc' |
1468 | 5125 | self.write_symperms_file(writers.FortranWriter(filename), | 5156 | self.write_symperms_file(writers.FortranWriter(filename), |
1469 | 5126 | 5157 | ||
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 | 26 | 26 | ||
1475 | 27 | # Binaries | 27 | # Binaries |
1476 | 28 | 28 | ||
1479 | 29 | BINARIES = $(BINDIR)gen_ximprove $(BINDIR)combine_events \ | 29 | BINARIES = $(BINDIR)gen_ximprove $(BINDIR)gensudgrid $(BINDIR)combine_runs |
1478 | 30 | $(BINDIR)gensudgrid $(BINDIR)combine_runs | ||
1480 | 31 | 30 | ||
1481 | 32 | # Compile commands | 31 | # Compile commands |
1482 | 33 | 32 | ||
1483 | @@ -54,8 +53,8 @@ | |||
1484 | 54 | 53 | ||
1485 | 55 | $(BINDIR)gen_ximprove: gen_ximprove.o ranmar.o rw_routines.o open_file.o | 54 | $(BINDIR)gen_ximprove: gen_ximprove.o ranmar.o rw_routines.o open_file.o |
1486 | 56 | $(FC) $(LDFLAGS) -o $@ $^ | 55 | $(FC) $(LDFLAGS) -o $@ $^ |
1489 | 57 | $(BINDIR)combine_events: $(COMBINE) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libpdf.$(libext) run_card.inc $(LIBDIR)libbias.$(libext) | 56 | #$(BINDIR)combine_events: $(COMBINE) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libpdf.$(libext) run_card.inc $(LIBDIR)libbias.$(libext) |
1490 | 58 | $(FC) -o $@ $(COMBINE) -L$(LIBDIR) -lmodel -lpdf $(llhapdf) $(LDFLAGS) -lbias | 57 | # $(FC) -o $@ $(COMBINE) -L$(LIBDIR) -lmodel -lpdf $(llhapdf) $(LDFLAGS) -lbias |
1491 | 59 | $(BINDIR)gensudgrid: $(GENSUDGRID) $(LIBDIR)libpdf.$(libext) $(LIBDIR)libcernlib.$(libext) | 58 | $(BINDIR)gensudgrid: $(GENSUDGRID) $(LIBDIR)libpdf.$(libext) $(LIBDIR)libcernlib.$(libext) |
1492 | 60 | $(FC) -o $@ $(GENSUDGRID) -L$(LIBDIR) -lmodel -lpdf -lcernlib $(llhapdf) $(LDFLAGS) | 59 | $(FC) -o $@ $(GENSUDGRID) -L$(LIBDIR) -lmodel -lpdf -lcernlib $(llhapdf) $(LDFLAGS) |
1493 | 61 | 60 | ||
1494 | @@ -66,7 +65,7 @@ | |||
1495 | 66 | invarients.o: invarients.f genps.inc | 65 | invarients.o: invarients.f genps.inc |
1496 | 67 | setrun.o: setrun.f nexternal.inc leshouche.inc genps.inc | 66 | setrun.o: setrun.f nexternal.inc leshouche.inc genps.inc |
1497 | 68 | gen_ximprove.o: gen_ximprove.f run_config.inc run_card.inc | 67 | gen_ximprove.o: gen_ximprove.f run_config.inc run_card.inc |
1499 | 69 | combine_events.o: combine_events.f run_config.inc run_card.inc | 68 | #combine_events.o: combine_events.f run_config.inc run_card.inc |
1500 | 70 | combine_runs.o: combine_runs.f run_config.inc run_card.inc | 69 | combine_runs.o: combine_runs.f run_config.inc run_card.inc |
1501 | 71 | select_events.o: select_events.f run_config.inc | 70 | select_events.o: select_events.f run_config.inc |
1502 | 72 | setrun.o: setrun.f nexternal.inc leshouche.inc run_card.inc run_config.inc | 71 | setrun.o: setrun.f nexternal.inc leshouche.inc run_card.inc run_config.inc |
1503 | 73 | 72 | ||
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 | 132 | JHEL = 1 | 132 | JHEL = 1 |
1509 | 133 | IF(NTRY.LE.MAXTRIES)THEN | 133 | IF(NTRY.LE.MAXTRIES)THEN |
1510 | 134 | DO I=1,NCOMB | 134 | DO I=1,NCOMB |
1512 | 135 | IF (.NOT.GOODHEL(I) .AND. (TS(I).GT.ANS*LIMHEL/NCOMB)) THEN | 135 | IF (.NOT.GOODHEL(I) .AND. (DABS(TS(I)).GT.ANS*LIMHEL/NCOMB)) THEN |
1513 | 136 | GOODHEL(I)=.TRUE. | 136 | GOODHEL(I)=.TRUE. |
1514 | 137 | NGOOD = NGOOD +1 | 137 | NGOOD = NGOOD +1 |
1515 | 138 | IGOOD(NGOOD) = I | 138 | IGOOD(NGOOD) = I |
1516 | 139 | 139 | ||
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 | 7 | #include "Parameters_%(model_name)s.h" | 7 | #include "Parameters_%(model_name)s.h" |
1522 | 8 | #include "%(include_prefix)sPythiaStdlib.h" | 8 | #include "%(include_prefix)sPythiaStdlib.h" |
1523 | 9 | 9 | ||
1569 | 10 | namespace Pythia8 { | 10 | using namespace Pythia8; |
1570 | 11 | 11 | ||
1571 | 12 | // Initialize static instance | 12 | // Initialize static instance |
1572 | 13 | Parameters_%(model_name)s* Parameters_%(model_name)s::instance = 0; | 13 | Parameters_%(model_name)s* Parameters_%(model_name)s::instance = 0; |
1573 | 14 | 14 | ||
1574 | 15 | // Function to get static instance - only one instance per program | 15 | // Function to get static instance - only one instance per program |
1575 | 16 | Parameters_%(model_name)s* Parameters_%(model_name)s::getInstance(){ | 16 | Parameters_%(model_name)s* Parameters_%(model_name)s::getInstance(){ |
1576 | 17 | if (instance == 0) | 17 | if (instance == 0) |
1577 | 18 | instance = new Parameters_%(model_name)s(); | 18 | instance = new Parameters_%(model_name)s(); |
1578 | 19 | 19 | ||
1579 | 20 | return instance; | 20 | return instance; |
1580 | 21 | } | 21 | } |
1581 | 22 | 22 | ||
1582 | 23 | void Parameters_%(model_name)s::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){ | 23 | void Parameters_%(model_name)s::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){ |
1583 | 24 | %(set_independent_parameters)s | 24 | %(set_independent_parameters)s |
1584 | 25 | } | 25 | } |
1585 | 26 | void Parameters_%(model_name)s::setIndependentCouplings(){ | 26 | void Parameters_%(model_name)s::setIndependentCouplings(){ |
1586 | 27 | %(set_independent_couplings)s | 27 | %(set_independent_couplings)s |
1587 | 28 | } | 28 | } |
1588 | 29 | void Parameters_%(model_name)s::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){ | 29 | |
1589 | 30 | %(set_dependent_parameters)s | 30 | void Parameters_%(model_name)s::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){ |
1590 | 31 | } | 31 | %(set_dependent_parameters)s |
1591 | 32 | void Parameters_%(model_name)s::setDependentCouplings(){ | 32 | } |
1592 | 33 | %(set_dependent_couplings)s | 33 | |
1593 | 34 | } | 34 | |
1594 | 35 | 35 | void Parameters_%(model_name)s::setDependentCouplings(){ | |
1595 | 36 | // Routines for printing out parameters | 36 | %(set_dependent_couplings)s |
1596 | 37 | void Parameters_%(model_name)s::printIndependentParameters(){ | 37 | } |
1597 | 38 | cout << "%(model_name)s model parameters independent of event kinematics:" << endl; | 38 | |
1598 | 39 | %(print_independent_parameters)s | 39 | // Routines for printing out parameters |
1599 | 40 | } | 40 | void Parameters_%(model_name)s::printIndependentParameters(){ |
1600 | 41 | void Parameters_%(model_name)s::printIndependentCouplings(){ | 41 | cout << "%(model_name)s model parameters independent of event kinematics:" << endl; |
1601 | 42 | cout << "%(model_name)s model couplings independent of event kinematics:" << endl; | 42 | %(print_independent_parameters)s |
1602 | 43 | %(print_independent_couplings)s | 43 | } |
1603 | 44 | } | 44 | void Parameters_%(model_name)s::printIndependentCouplings(){ |
1604 | 45 | void Parameters_%(model_name)s::printDependentParameters(){ | 45 | cout << "%(model_name)s model couplings independent of event kinematics:" << endl; |
1605 | 46 | cout << "%(model_name)s model parameters dependent on event kinematics:" << endl; | 46 | %(print_independent_couplings)s |
1606 | 47 | %(print_dependent_parameters)s | 47 | } |
1607 | 48 | } | 48 | void Parameters_%(model_name)s::printDependentParameters(){ |
1608 | 49 | void Parameters_%(model_name)s::printDependentCouplings(){ | 49 | cout << "%(model_name)s model parameters dependent on event kinematics:" << endl; |
1609 | 50 | cout << "%(model_name)s model couplings dependent on event kinematics:" << endl; | 50 | %(print_dependent_parameters)s |
1610 | 51 | %(print_dependent_couplings)s | 51 | } |
1611 | 52 | } | 52 | void Parameters_%(model_name)s::printDependentCouplings(){ |
1612 | 53 | 53 | cout << "%(model_name)s model couplings dependent on event kinematics:" << endl; | |
1613 | 54 | } // end namespace Pythia8 | 54 | %(print_dependent_couplings)s |
1614 | 55 | } | ||
1615 | 56 | |||
1616 | 55 | 57 | ||
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 | 14 | 14 | ||
1622 | 15 | using namespace std; | 15 | using namespace std; |
1623 | 16 | 16 | ||
1625 | 17 | namespace Pythia8 { | 17 | using namespace Pythia8; |
1626 | 18 | 18 | ||
1627 | 19 | class Parameters_%(model_name)s | 19 | class Parameters_%(model_name)s |
1628 | 20 | { | 20 | { |
1629 | @@ -33,6 +33,10 @@ | |||
1630 | 33 | void setIndependentCouplings(); | 33 | void setIndependentCouplings(); |
1631 | 34 | // Set parameters that are changed event by event | 34 | // Set parameters that are changed event by event |
1632 | 35 | void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS); | 35 | void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS); |
1633 | 36 | // TMP: hardcoded bogus implementation with no arguments since this | ||
1634 | 37 | // is being called from within the matrix elements. | ||
1635 | 38 | void setDependentParameters() {}; | ||
1636 | 39 | |||
1637 | 36 | // Set couplings that are changed event by event | 40 | // Set couplings that are changed event by event |
1638 | 37 | void setDependentCouplings(); | 41 | void setDependentCouplings(); |
1639 | 38 | 42 | ||
1640 | @@ -45,10 +49,8 @@ | |||
1641 | 45 | // Print couplings that are changed event by event | 49 | // Print couplings that are changed event by event |
1642 | 46 | void printDependentCouplings(); | 50 | void printDependentCouplings(); |
1643 | 47 | 51 | ||
1644 | 48 | |||
1645 | 49 | private: | 52 | private: |
1646 | 50 | static Parameters_%(model_name)s* instance; | 53 | static Parameters_%(model_name)s* instance; |
1647 | 51 | }; | 54 | }; |
1648 | 52 | 55 | ||
1649 | 53 | } // end namespace Pythia8 | ||
1650 | 54 | #endif // Pythia8_parameters_%(model_name)s_H | 56 | #endif // Pythia8_parameters_%(model_name)s_H |
1651 | 55 | 57 | ||
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 | 3053 | Not needed for StandAlone so we need to call the correct one | 3053 | Not needed for StandAlone so we need to call the correct one |
1657 | 3054 | """ | 3054 | """ |
1658 | 3055 | 3055 | ||
1660 | 3056 | return export_v4.ProcessExporterFortranMEGroup.write_procdef_mg5( | 3056 | return export_v4.ProcessExporterFortran.write_procdef_mg5( |
1661 | 3057 | self, file_pos, modelname, process_str) | 3057 | self, file_pos, modelname, process_str) |
1662 | 3058 | 3058 | ||
1663 | 3059 | def get_source_libraries_list(self): | 3059 | def get_source_libraries_list(self): |
1664 | 3060 | 3060 | ||
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 | 686 | try: | 686 | try: |
1670 | 687 | _tag = results_object[run].tags[-1] | 687 | _tag = results_object[run].tags[-1] |
1671 | 688 | except Exception,error: | 688 | except Exception,error: |
1673 | 689 | return Banner() | 689 | if os.path.exists( pjoin(results_object.path,'Events','%s_banner.txt' % (run))): |
1674 | 690 | tag = None | ||
1675 | 691 | else: | ||
1676 | 692 | return Banner() | ||
1677 | 690 | else: | 693 | else: |
1678 | 691 | _tag = tag | 694 | _tag = tag |
1680 | 692 | 695 | ||
1681 | 693 | path = results_object.path | 696 | path = results_object.path |
1684 | 694 | banner_path = pjoin(path,'Events',run,'%s_%s_banner.txt' % (run, tag)) | 697 | if tag: |
1685 | 695 | 698 | banner_path = pjoin(path,'Events',run,'%s_%s_banner.txt' % (run, tag)) | |
1686 | 699 | else: | ||
1687 | 700 | banner_path = pjoin(results_object.path,'Events','%s_banner.txt' % (run)) | ||
1688 | 701 | |||
1689 | 696 | if not os.path.exists(banner_path): | 702 | if not os.path.exists(banner_path): |
1690 | 697 | if level != "parton" and tag != _tag: | 703 | if level != "parton" and tag != _tag: |
1691 | 698 | return recover_banner(results_object, level, _run, results_object[_run].tags[0]) | 704 | return recover_banner(results_object, level, _run, results_object[_run].tags[0]) |
1692 | @@ -712,6 +718,7 @@ | |||
1693 | 712 | 718 | ||
1694 | 713 | # security if the banner was remove (or program canceled before created it) | 719 | # security if the banner was remove (or program canceled before created it) |
1695 | 714 | return Banner() | 720 | return Banner() |
1696 | 721 | |||
1697 | 715 | banner = Banner(banner_path) | 722 | banner = Banner(banner_path) |
1698 | 716 | 723 | ||
1699 | 717 | 724 | ||
1700 | @@ -1207,8 +1214,8 @@ | |||
1701 | 1207 | if value in allowed: | 1214 | if value in allowed: |
1702 | 1208 | valid=True | 1215 | valid=True |
1703 | 1209 | elif isinstance(value, str): | 1216 | elif isinstance(value, str): |
1706 | 1210 | value = value.lower() | 1217 | value = value.lower().strip() |
1707 | 1211 | allowed = [v.lower() for v in allowed] | 1218 | allowed = [str(v).lower() for v in allowed] |
1708 | 1212 | if value in allowed: | 1219 | if value in allowed: |
1709 | 1213 | i = allowed.index(value) | 1220 | i = allowed.index(value) |
1710 | 1214 | value = self.allowed_value[lower_name][i] | 1221 | value = self.allowed_value[lower_name][i] |
1711 | @@ -1343,25 +1350,7 @@ | |||
1712 | 1343 | elif value.endswith(('k', 'M')) and value[:-1].isdigit(): | 1350 | elif value.endswith(('k', 'M')) and value[:-1].isdigit(): |
1713 | 1344 | convert = {'k':1000, 'M':1000000} | 1351 | convert = {'k':1000, 'M':1000000} |
1714 | 1345 | value =int(value[:-1]) * convert[value[-1]] | 1352 | value =int(value[:-1]) * convert[value[-1]] |
1734 | 1346 | else: | 1353 | elif '/' in value or '*' in value: |
1716 | 1347 | try: | ||
1717 | 1348 | value = float(value.replace('d','e')) | ||
1718 | 1349 | except ValueError: | ||
1719 | 1350 | raise InvalidCmd, "%s can not be mapped to an integer" % value | ||
1720 | 1351 | try: | ||
1721 | 1352 | new_value = int(value) | ||
1722 | 1353 | except ValueError: | ||
1723 | 1354 | raise InvalidCmd, "%s can not be mapped to an integer" % value | ||
1724 | 1355 | else: | ||
1725 | 1356 | if value == new_value: | ||
1726 | 1357 | value = new_value | ||
1727 | 1358 | else: | ||
1728 | 1359 | raise InvalidCmd, "incorect input: %s need an integer for %s" % (value,name) | ||
1729 | 1360 | elif targettype == float: | ||
1730 | 1361 | value = value.replace('d','e') # pass from Fortran formatting | ||
1731 | 1362 | try: | ||
1732 | 1363 | value = float(value) | ||
1733 | 1364 | except ValueError: | ||
1735 | 1365 | try: | 1354 | try: |
1736 | 1366 | split = re.split('(\*|/)',value) | 1355 | split = re.split('(\*|/)',value) |
1737 | 1367 | v = float(split[0]) | 1356 | v = float(split[0]) |
1738 | @@ -1372,9 +1361,48 @@ | |||
1739 | 1372 | v /= float(split[2*i+2]) | 1361 | v /= float(split[2*i+2]) |
1740 | 1373 | except: | 1362 | except: |
1741 | 1374 | v=0 | 1363 | v=0 |
1743 | 1375 | raise InvalidCmd, "%s can not be mapped to a float" % value | 1364 | raise InvalidCmd, "%s can not be mapped to an integer" % value |
1744 | 1376 | finally: | 1365 | finally: |
1746 | 1377 | value = v | 1366 | value = int(v) |
1747 | 1367 | if value != v: | ||
1748 | 1368 | raise InvalidCmd, "%s can not be mapped to an integer" % v | ||
1749 | 1369 | else: | ||
1750 | 1370 | try: | ||
1751 | 1371 | value = float(value.replace('d','e')) | ||
1752 | 1372 | except ValueError: | ||
1753 | 1373 | raise InvalidCmd, "%s can not be mapped to an integer" % value | ||
1754 | 1374 | try: | ||
1755 | 1375 | new_value = int(value) | ||
1756 | 1376 | except ValueError: | ||
1757 | 1377 | raise InvalidCmd, "%s can not be mapped to an integer" % value | ||
1758 | 1378 | else: | ||
1759 | 1379 | if value == new_value: | ||
1760 | 1380 | value = new_value | ||
1761 | 1381 | else: | ||
1762 | 1382 | raise InvalidCmd, "incorect input: %s need an integer for %s" % (value,name) | ||
1763 | 1383 | |||
1764 | 1384 | elif targettype == float: | ||
1765 | 1385 | if value.endswith(('k', 'M')) and value[:-1].isdigit(): | ||
1766 | 1386 | convert = {'k':1000, 'M':1000000} | ||
1767 | 1387 | value = 1.*int(value[:-1]) * convert[value[-1]] | ||
1768 | 1388 | else: | ||
1769 | 1389 | value = value.replace('d','e') # pass from Fortran formatting | ||
1770 | 1390 | try: | ||
1771 | 1391 | value = float(value) | ||
1772 | 1392 | except ValueError: | ||
1773 | 1393 | try: | ||
1774 | 1394 | split = re.split('(\*|/)',value) | ||
1775 | 1395 | v = float(split[0]) | ||
1776 | 1396 | for i in range((len(split)//2)): | ||
1777 | 1397 | if split[2*i+1] == '*': | ||
1778 | 1398 | v *= float(split[2*i+2]) | ||
1779 | 1399 | else: | ||
1780 | 1400 | v /= float(split[2*i+2]) | ||
1781 | 1401 | except: | ||
1782 | 1402 | v=0 | ||
1783 | 1403 | raise InvalidCmd, "%s can not be mapped to a float" % value | ||
1784 | 1404 | finally: | ||
1785 | 1405 | value = v | ||
1786 | 1378 | else: | 1406 | else: |
1787 | 1379 | raise InvalidCmd, "type %s is not handle by the card" % targettype | 1407 | raise InvalidCmd, "type %s is not handle by the card" % targettype |
1788 | 1380 | 1408 | ||
1789 | @@ -1434,7 +1462,8 @@ | |||
1790 | 1434 | self.add_param('colored_pdgs', [1,2,3,4,5]) | 1462 | self.add_param('colored_pdgs', [1,2,3,4,5]) |
1791 | 1435 | self.add_param('complex_mass_scheme', False) | 1463 | self.add_param('complex_mass_scheme', False) |
1792 | 1436 | self.add_param('pdg_initial1', [0]) | 1464 | self.add_param('pdg_initial1', [0]) |
1794 | 1437 | self.add_param('pdg_initial2', [0]) | 1465 | self.add_param('pdg_initial2', [0]) |
1795 | 1466 | self.add_param('limitations', [], typelist=str) | ||
1796 | 1438 | 1467 | ||
1797 | 1439 | def read(self, finput): | 1468 | def read(self, finput): |
1798 | 1440 | """Read the input file, this can be a path to a file, | 1469 | """Read the input file, this can be a path to a file, |
1799 | @@ -2744,8 +2773,26 @@ | |||
1800 | 2744 | # | 2773 | # |
1801 | 2745 | """, | 2774 | """, |
1802 | 2746 | template_off= '# Syscalc is deprecated but to see the associate options type\'update syscalc\''), | 2775 | template_off= '# Syscalc is deprecated but to see the associate options type\'update syscalc\''), |
1805 | 2747 | ] | 2776 | |
1806 | 2748 | 2777 | # ECUT block (hidden it by default but for e+ e- collider) | |
1807 | 2778 | runblock(name='ecut', fields=('ej','eb','ea','el','ejmax','ebmax','eamax','elmax','e_min_pdg','e_max_pdg'), | ||
1808 | 2779 | template_on=\ | ||
1809 | 2780 | """#********************************************************************* | ||
1810 | 2781 | # Minimum and maximum E's (in the center of mass frame) * | ||
1811 | 2782 | #********************************************************************* | ||
1812 | 2783 | %(ej)s = ej ! minimum E for the jets | ||
1813 | 2784 | %(eb)s = eb ! minimum E for the b | ||
1814 | 2785 | %(ea)s = ea ! minimum E for the photons | ||
1815 | 2786 | %(el)s = el ! minimum E for the charged leptons | ||
1816 | 2787 | %(ejmax)s = ejmax ! maximum E for the jets | ||
1817 | 2788 | %(ebmax)s = ebmax ! maximum E for the b | ||
1818 | 2789 | %(eamax)s = eamax ! maximum E for the photons | ||
1819 | 2790 | %(elmax)s = elmax ! maximum E for the charged leptons | ||
1820 | 2791 | %(e_min_pdg)s = e_min_pdg ! E cut for other particles (use pdg code). Applied on particle and anti-particle | ||
1821 | 2792 | %(e_max_pdg)s = e_max_pdg ! E cut for other particles (syntax e.g. {6: 100, 25: 50}) | ||
1822 | 2793 | """, | ||
1823 | 2794 | template_off= '#\n# For display option for energy cut in the partonic center of mass frame type \'update ecut\'\n#'), | ||
1824 | 2795 | ] | ||
1825 | 2749 | 2796 | ||
1826 | 2750 | 2797 | ||
1827 | 2751 | def default_setup(self): | 2798 | def default_setup(self): |
1828 | @@ -2807,6 +2854,7 @@ | |||
1829 | 2807 | self.add_param("asrwgtflavor", 5, comment = 'highest quark flavor for a_s reweighting in MLM') | 2854 | self.add_param("asrwgtflavor", 5, comment = 'highest quark flavor for a_s reweighting in MLM') |
1830 | 2808 | self.add_param("clusinfo", True) | 2855 | self.add_param("clusinfo", True) |
1831 | 2809 | self.add_param("lhe_version", 3.0) | 2856 | self.add_param("lhe_version", 3.0) |
1832 | 2857 | 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 | 2810 | self.add_param("event_norm", "average", allowed=['sum','average', 'unity'], | 2858 | self.add_param("event_norm", "average", allowed=['sum','average', 'unity'], |
1834 | 2811 | include=False, sys_default='sum') | 2859 | include=False, sys_default='sum') |
1835 | 2812 | #cut | 2860 | #cut |
1836 | @@ -2828,14 +2876,14 @@ | |||
1837 | 2828 | self.add_param("ptlmax", -1.0, cut=True) | 2876 | self.add_param("ptlmax", -1.0, cut=True) |
1838 | 2829 | self.add_param("missetmax", -1.0, cut=True) | 2877 | self.add_param("missetmax", -1.0, cut=True) |
1839 | 2830 | # E cut | 2878 | # E cut |
1848 | 2831 | self.add_param("ej", 0.0, cut=True) | 2879 | self.add_param("ej", 0.0, cut=True, hidden=True) |
1849 | 2832 | self.add_param("eb", 0.0, cut=True) | 2880 | self.add_param("eb", 0.0, cut=True, hidden=True) |
1850 | 2833 | self.add_param("ea", 0.0, cut=True) | 2881 | self.add_param("ea", 0.0, cut=True, hidden=True) |
1851 | 2834 | self.add_param("el", 0.0, cut=True) | 2882 | self.add_param("el", 0.0, cut=True, hidden=True) |
1852 | 2835 | self.add_param("ejmax", -1.0, cut=True) | 2883 | self.add_param("ejmax", -1.0, cut=True, hidden=True) |
1853 | 2836 | self.add_param("ebmax", -1.0, cut=True) | 2884 | self.add_param("ebmax", -1.0, cut=True, hidden=True) |
1854 | 2837 | self.add_param("eamax", -1.0, cut=True) | 2885 | self.add_param("eamax", -1.0, cut=True, hidden=True) |
1855 | 2838 | self.add_param("elmax", -1.0, cut=True) | 2886 | self.add_param("elmax", -1.0, cut=True, hidden=True) |
1856 | 2839 | # Eta cut | 2887 | # Eta cut |
1857 | 2840 | self.add_param("etaj", 5.0, cut=True) | 2888 | self.add_param("etaj", 5.0, cut=True) |
1858 | 2841 | self.add_param("etab", -1.0, cut=True) | 2889 | self.add_param("etab", -1.0, cut=True) |
1859 | @@ -2958,8 +3006,8 @@ | |||
1860 | 2958 | # Special syntax are related to those. (can not be edit directly) | 3006 | # Special syntax are related to those. (can not be edit directly) |
1861 | 2959 | self.add_param('pt_min_pdg',{'__type__':0.}, include=False) | 3007 | self.add_param('pt_min_pdg',{'__type__':0.}, include=False) |
1862 | 2960 | self.add_param('pt_max_pdg',{'__type__':0.}, include=False) | 3008 | self.add_param('pt_max_pdg',{'__type__':0.}, include=False) |
1865 | 2961 | self.add_param('E_min_pdg',{'__type__':0.}, include=False) | 3009 | self.add_param('E_min_pdg',{'__type__':0.}, include=False, hidden=True) |
1866 | 2962 | self.add_param('E_max_pdg',{'__type__':0.}, include=False) | 3010 | self.add_param('E_max_pdg',{'__type__':0.}, include=False, hidden=True) |
1867 | 2963 | self.add_param('eta_min_pdg',{'__type__':0.}, include=False) | 3011 | self.add_param('eta_min_pdg',{'__type__':0.}, include=False) |
1868 | 2964 | self.add_param('eta_max_pdg',{'__type__':0.}, include=False) | 3012 | self.add_param('eta_max_pdg',{'__type__':0.}, include=False) |
1869 | 2965 | self.add_param('mxx_min_pdg',{'__type__':0.}, include=False) | 3013 | self.add_param('mxx_min_pdg',{'__type__':0.}, include=False) |
1870 | @@ -2975,6 +3023,7 @@ | |||
1871 | 2975 | self.add_param('mxxmin4pdg',[-1.], system=True) | 3023 | self.add_param('mxxmin4pdg',[-1.], system=True) |
1872 | 2976 | self.add_param('mxxpart_antipart', [False], system=True) | 3024 | self.add_param('mxxpart_antipart', [False], system=True) |
1873 | 2977 | 3025 | ||
1874 | 3026 | |||
1875 | 2978 | 3027 | ||
1876 | 2979 | def check_validity(self): | 3028 | def check_validity(self): |
1877 | 2980 | """ """ | 3029 | """ """ |
1878 | @@ -3155,10 +3204,13 @@ | |||
1879 | 3155 | self['ebeam1'] = 500 | 3204 | self['ebeam1'] = 500 |
1880 | 3156 | self['ebeam2'] = 500 | 3205 | self['ebeam2'] = 500 |
1881 | 3157 | self['use_syst'] = False | 3206 | self['use_syst'] = False |
1882 | 3207 | self.display_block.append('beam_pol') | ||
1883 | 3208 | self.display_block.append('ecut') | ||
1884 | 3158 | else: | 3209 | else: |
1885 | 3159 | self['lpp1'] = 0 | 3210 | self['lpp1'] = 0 |
1886 | 3160 | self['lpp2'] = 0 | 3211 | self['lpp2'] = 0 |
1888 | 3161 | self['use_syst'] = False | 3212 | self['use_syst'] = False |
1889 | 3213 | self.display_block.append('beam_pol') | ||
1890 | 3162 | 3214 | ||
1891 | 3163 | # Check if need matching | 3215 | # Check if need matching |
1892 | 3164 | min_particle = 99 | 3216 | min_particle = 99 |
1893 | @@ -3211,9 +3263,19 @@ | |||
1894 | 3211 | else: | 3263 | else: |
1895 | 3212 | continue | 3264 | continue |
1896 | 3213 | break | 3265 | break |
1897 | 3266 | |||
1898 | 3267 | |||
1899 | 3214 | if no_systematics: | 3268 | if no_systematics: |
1900 | 3215 | self['use_syst'] = False | 3269 | self['use_syst'] = False |
1901 | 3216 | self['systematics_program'] = 'none' | 3270 | self['systematics_program'] = 'none' |
1902 | 3271 | |||
1903 | 3272 | if 'MLM' in proc_characteristic['limitations']: | ||
1904 | 3273 | if self['dynamical_scale_choice'] == -1: | ||
1905 | 3274 | self['dynamical_scale_choice'] = 3 | ||
1906 | 3275 | if self['ickkw'] == 1: | ||
1907 | 3276 | logger.critical("MLM matching/merging not compatible with the model! You need to use another method to remove the double counting!") | ||
1908 | 3277 | self['ickkw'] = 0 | ||
1909 | 3278 | |||
1910 | 3217 | 3279 | ||
1911 | 3218 | def write(self, output_file, template=None, python_template=False, | 3280 | def write(self, output_file, template=None, python_template=False, |
1912 | 3219 | **opt): | 3281 | **opt): |
1913 | 3220 | 3282 | ||
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 | 348 | interaction color, mass, width.""" | 348 | interaction color, mass, width.""" |
1919 | 349 | 349 | ||
1920 | 350 | inter = model.get_interaction(vertex.get('id')) | 350 | inter = model.get_interaction(vertex.get('id')) |
1922 | 351 | 351 | ||
1923 | 352 | if last_vertex: | 352 | if last_vertex: |
1924 | 353 | return (0,) | 353 | return (0,) |
1925 | 354 | else: | 354 | else: |
1926 | 355 | part = model.get_particle(vertex.get('legs')[-1].get('id')) | 355 | part = model.get_particle(vertex.get('legs')[-1].get('id')) |
1927 | 356 | try: | ||
1928 | 357 | QCD = inter.get('orders')['QCD'] | ||
1929 | 358 | except Exception, error: | ||
1930 | 359 | QCD = 0 | ||
1931 | 360 | |||
1932 | 356 | return ((part.get('color'), | 361 | return ((part.get('color'), |
1934 | 357 | part.get('mass'), part.get('width')),) | 362 | part.get('mass'), part.get('width'), QCD),) |
1935 | 358 | 363 | ||
1936 | 359 | def find_symmetry_subproc_group(subproc_group): | 364 | def find_symmetry_subproc_group(subproc_group): |
1937 | 360 | """Find symmetric configs by directly comparing the configurations | 365 | """Find symmetric configs by directly comparing the configurations |
1938 | 361 | 366 | ||
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 | 2108 | ratio_correlations=True, arg_string='', | 2108 | ratio_correlations=True, arg_string='', |
1944 | 2109 | jet_samples_to_keep=None, | 2109 | jet_samples_to_keep=None, |
1945 | 2110 | auto_open=True, | 2110 | auto_open=True, |
1947 | 2111 | lhapdfconfig='lhapdf-config'): | 2111 | lhapdfconfig='lhapdf-config', |
1948 | 2112 | assigned_colours=None): | ||
1949 | 2112 | """ Ouput this histogram to a file, stream or string if path is kept to | 2113 | """ Ouput this histogram to a file, stream or string if path is kept to |
1950 | 2113 | None. The supported format are for now. Chose whether to print the header | 2114 | None. The supported format are for now. Chose whether to print the header |
1951 | 2114 | or not.""" | 2115 | or not.""" |
1952 | @@ -2160,6 +2161,24 @@ | |||
1953 | 2160 | 2161 | ||
1954 | 2161 | self[:] = matching_histo_lists | 2162 | self[:] = matching_histo_lists |
1955 | 2162 | 2163 | ||
1956 | 2164 | # the histogram colours: | ||
1957 | 2165 | coli=['col1','col2','col3','col4','col5','col6','col7','col8'] | ||
1958 | 2166 | colours={coli[0] : "#009e73", | ||
1959 | 2167 | coli[1] : "#0072b2", | ||
1960 | 2168 | coli[2] : "#d55e00", | ||
1961 | 2169 | coli[3] : "#f0e442", | ||
1962 | 2170 | coli[4] : "#56b4e9", | ||
1963 | 2171 | coli[5] : "#cc79a7", | ||
1964 | 2172 | coli[6] : "#e69f00", | ||
1965 | 2173 | coli[7] : "black"} | ||
1966 | 2174 | if assigned_colours: | ||
1967 | 2175 | for index, item in enumerate(assigned_colours): | ||
1968 | 2176 | if (item != None): colours[coli[index]]=item | ||
1969 | 2177 | |||
1970 | 2178 | replace_dict=colours | ||
1971 | 2179 | replace_dict['arg_string']=arg_string | ||
1972 | 2180 | replace_dict['output_base_name']=output_base_name | ||
1973 | 2181 | |||
1974 | 2163 | # Write the gnuplot header | 2182 | # Write the gnuplot header |
1975 | 2164 | gnuplot_output_list_v4 = [ | 2183 | gnuplot_output_list_v4 = [ |
1976 | 2165 | """ | 2184 | """ |
1977 | @@ -2173,7 +2192,7 @@ | |||
1978 | 2173 | # For more information, visit madgraph.phys.ucl.ac.be and amcatnlo.web.cern.ch | 2192 | # For more information, visit madgraph.phys.ucl.ac.be and amcatnlo.web.cern.ch |
1979 | 2174 | # | 2193 | # |
1980 | 2175 | ################################################################################ | 2194 | ################################################################################ |
1982 | 2176 | # %s | 2195 | # %(arg_string)s |
1983 | 2177 | reset | 2196 | reset |
1984 | 2178 | 2197 | ||
1985 | 2179 | set lmargin 10 | 2198 | set lmargin 10 |
1986 | @@ -2183,60 +2202,60 @@ | |||
1987 | 2183 | #set terminal pdf enhanced font "Helvetica 12" lw 1.0 dashed size 29.7cm, 21cm | 2202 | #set terminal pdf enhanced font "Helvetica 12" lw 1.0 dashed size 29.7cm, 21cm |
1988 | 2184 | set key font ",9" | 2203 | set key font ",9" |
1989 | 2185 | set key samplen "2" | 2204 | set key samplen "2" |
1991 | 2186 | set output "%s.ps" | 2205 | set output "%(output_base_name)s.ps" |
1992 | 2187 | 2206 | ||
1993 | 2188 | # This is the "PODO" color palette of gnuplot v.5, but with the order | 2207 | # This is the "PODO" color palette of gnuplot v.5, but with the order |
1994 | 2189 | # changed: palette of colors selected to be easily distinguishable by | 2208 | # changed: palette of colors selected to be easily distinguishable by |
1995 | 2190 | # color-blind individuals with either protanopia or deuteranopia. Bang | 2209 | # color-blind individuals with either protanopia or deuteranopia. Bang |
1996 | 2191 | # Wong [2011] Nature Methods 8, 441. | 2210 | # Wong [2011] Nature Methods 8, 441. |
1997 | 2192 | 2211 | ||
2045 | 2193 | set style line 1 lt 1 lc rgb "#009e73" lw 2.5 | 2212 | set style line 1 lt 1 lc rgb "%(col1)s" lw 2.5 |
2046 | 2194 | set style line 11 lt 2 lc rgb "#009e73" lw 2.5 | 2213 | set style line 11 lt 2 lc rgb "%(col1)s" lw 2.5 |
2047 | 2195 | set style line 21 lt 4 lc rgb "#009e73" lw 2.5 | 2214 | set style line 21 lt 4 lc rgb "%(col1)s" lw 2.5 |
2048 | 2196 | set style line 31 lt 6 lc rgb "#009e73" lw 2.5 | 2215 | set style line 31 lt 6 lc rgb "%(col1)s" lw 2.5 |
2049 | 2197 | set style line 41 lt 8 lc rgb "#009e73" lw 2.5 | 2216 | set style line 41 lt 8 lc rgb "%(col1)s" lw 2.5 |
2050 | 2198 | 2217 | ||
2051 | 2199 | set style line 2 lt 1 lc rgb "#0072b2" lw 2.5 | 2218 | set style line 2 lt 1 lc rgb "%(col2)s" lw 2.5 |
2052 | 2200 | set style line 12 lt 2 lc rgb "#0072b2" lw 2.5 | 2219 | set style line 12 lt 2 lc rgb "%(col2)s" lw 2.5 |
2053 | 2201 | set style line 22 lt 4 lc rgb "#0072b2" lw 2.5 | 2220 | set style line 22 lt 4 lc rgb "%(col2)s" lw 2.5 |
2054 | 2202 | set style line 32 lt 6 lc rgb "#0072b2" lw 2.5 | 2221 | set style line 32 lt 6 lc rgb "%(col2)s" lw 2.5 |
2055 | 2203 | set style line 42 lt 8 lc rgb "#0072b2" lw 2.5 | 2222 | set style line 42 lt 8 lc rgb "%(col2)s" lw 2.5 |
2056 | 2204 | 2223 | ||
2057 | 2205 | set style line 3 lt 1 lc rgb "#d55e00" lw 2.5 | 2224 | set style line 3 lt 1 lc rgb "%(col3)s" lw 2.5 |
2058 | 2206 | set style line 13 lt 2 lc rgb "#d55e00" lw 2.5 | 2225 | set style line 13 lt 2 lc rgb "%(col3)s" lw 2.5 |
2059 | 2207 | set style line 23 lt 4 lc rgb "#d55e00" lw 2.5 | 2226 | set style line 23 lt 4 lc rgb "%(col3)s" lw 2.5 |
2060 | 2208 | set style line 33 lt 6 lc rgb "#d55e00" lw 2.5 | 2227 | set style line 33 lt 6 lc rgb "%(col3)s" lw 2.5 |
2061 | 2209 | set style line 43 lt 8 lc rgb "#d55e00" lw 2.5 | 2228 | set style line 43 lt 8 lc rgb "%(col3)s" lw 2.5 |
2062 | 2210 | 2229 | ||
2063 | 2211 | set style line 4 lt 1 lc rgb "#f0e442" lw 2.5 | 2230 | set style line 4 lt 1 lc rgb "%(col4)s" lw 2.5 |
2064 | 2212 | set style line 14 lt 2 lc rgb "#f0e442" lw 2.5 | 2231 | set style line 14 lt 2 lc rgb "%(col4)s" lw 2.5 |
2065 | 2213 | set style line 24 lt 4 lc rgb "#f0e442" lw 2.5 | 2232 | set style line 24 lt 4 lc rgb "%(col4)s" lw 2.5 |
2066 | 2214 | set style line 34 lt 6 lc rgb "#f0e442" lw 2.5 | 2233 | set style line 34 lt 6 lc rgb "%(col4)s" lw 2.5 |
2067 | 2215 | set style line 44 lt 8 lc rgb "#f0e442" lw 2.5 | 2234 | set style line 44 lt 8 lc rgb "%(col4)s" lw 2.5 |
2068 | 2216 | 2235 | ||
2069 | 2217 | set style line 5 lt 1 lc rgb "#56b4e9" lw 2.5 | 2236 | set style line 5 lt 1 lc rgb "%(col5)s" lw 2.5 |
2070 | 2218 | set style line 15 lt 2 lc rgb "#56b4e9" lw 2.5 | 2237 | set style line 15 lt 2 lc rgb "%(col5)s" lw 2.5 |
2071 | 2219 | set style line 25 lt 4 lc rgb "#56b4e9" lw 2.5 | 2238 | set style line 25 lt 4 lc rgb "%(col5)s" lw 2.5 |
2072 | 2220 | set style line 35 lt 6 lc rgb "#56b4e9" lw 2.5 | 2239 | set style line 35 lt 6 lc rgb "%(col5)s" lw 2.5 |
2073 | 2221 | set style line 45 lt 8 lc rgb "#56b4e9" lw 2.5 | 2240 | set style line 45 lt 8 lc rgb "%(col5)s" lw 2.5 |
2074 | 2222 | 2241 | ||
2075 | 2223 | set style line 6 lt 1 lc rgb "#cc79a7" lw 2.5 | 2242 | set style line 6 lt 1 lc rgb "%(col6)s" lw 2.5 |
2076 | 2224 | set style line 16 lt 2 lc rgb "#cc79a7" lw 2.5 | 2243 | set style line 16 lt 2 lc rgb "%(col6)s" lw 2.5 |
2077 | 2225 | set style line 26 lt 4 lc rgb "#cc79a7" lw 2.5 | 2244 | set style line 26 lt 4 lc rgb "%(col6)s" lw 2.5 |
2078 | 2226 | set style line 36 lt 6 lc rgb "#cc79a7" lw 2.5 | 2245 | set style line 36 lt 6 lc rgb "%(col6)s" lw 2.5 |
2079 | 2227 | set style line 46 lt 8 lc rgb "#cc79a7" lw 2.5 | 2246 | set style line 46 lt 8 lc rgb "%(col6)s" lw 2.5 |
2080 | 2228 | 2247 | ||
2081 | 2229 | set style line 7 lt 1 lc rgb "#e69f00" lw 2.5 | 2248 | set style line 7 lt 1 lc rgb "%(col7)s" lw 2.5 |
2082 | 2230 | set style line 17 lt 2 lc rgb "#e69f00" lw 2.5 | 2249 | set style line 17 lt 2 lc rgb "%(col7)s" lw 2.5 |
2083 | 2231 | set style line 27 lt 4 lc rgb "#e69f00" lw 2.5 | 2250 | set style line 27 lt 4 lc rgb "%(col7)s" lw 2.5 |
2084 | 2232 | set style line 37 lt 6 lc rgb "#e69f00" lw 2.5 | 2251 | set style line 37 lt 6 lc rgb "%(col7)s" lw 2.5 |
2085 | 2233 | set style line 47 lt 8 lc rgb "#e69f00" lw 2.5 | 2252 | set style line 47 lt 8 lc rgb "%(col7)s" lw 2.5 |
2086 | 2234 | 2253 | ||
2087 | 2235 | set style line 8 lt 1 lc rgb "black" lw 2.5 | 2254 | set style line 8 lt 1 lc rgb "%(col8)s" lw 2.5 |
2088 | 2236 | set style line 18 lt 2 lc rgb "black" lw 2.5 | 2255 | set style line 18 lt 2 lc rgb "%(col8)s" lw 2.5 |
2089 | 2237 | set style line 28 lt 4 lc rgb "black" lw 2.5 | 2256 | set style line 28 lt 4 lc rgb "%(col8)s" lw 2.5 |
2090 | 2238 | set style line 38 lt 6 lc rgb "black" lw 2.5 | 2257 | set style line 38 lt 6 lc rgb "%(col8)s" lw 2.5 |
2091 | 2239 | set style line 48 lt 7 lc rgb "black" lw 2.5 | 2258 | set style line 48 lt 7 lc rgb "%(col8)s" lw 2.5 |
2092 | 2240 | 2259 | ||
2093 | 2241 | 2260 | ||
2094 | 2242 | set style line 999 lt 1 lc rgb "gray" lw 2.5 | 2261 | set style line 999 lt 1 lc rgb "gray" lw 2.5 |
2095 | @@ -2246,7 +2265,7 @@ | |||
2096 | 2246 | set style data histeps | 2265 | set style data histeps |
2097 | 2247 | set key invert | 2266 | set key invert |
2098 | 2248 | 2267 | ||
2100 | 2249 | """%(arg_string,output_base_name) | 2268 | """%(replace_dict) |
2101 | 2250 | ] | 2269 | ] |
2102 | 2251 | 2270 | ||
2103 | 2252 | gnuplot_output_list_v5 = [ | 2271 | gnuplot_output_list_v5 = [ |
2104 | @@ -2261,7 +2280,7 @@ | |||
2105 | 2261 | # For more information, visit madgraph.phys.ucl.ac.be and amcatnlo.web.cern.ch | 2280 | # For more information, visit madgraph.phys.ucl.ac.be and amcatnlo.web.cern.ch |
2106 | 2262 | # | 2281 | # |
2107 | 2263 | ################################################################################ | 2282 | ################################################################################ |
2109 | 2264 | # %s | 2283 | # %(arg_string)s |
2110 | 2265 | reset | 2284 | reset |
2111 | 2266 | 2285 | ||
2112 | 2267 | set lmargin 10 | 2286 | set lmargin 10 |
2113 | @@ -2271,69 +2290,68 @@ | |||
2114 | 2271 | #set terminal pdf enhanced font "Helvetica 12" lw 1.0 dashed size 29.7cm, 21cm | 2290 | #set terminal pdf enhanced font "Helvetica 12" lw 1.0 dashed size 29.7cm, 21cm |
2115 | 2272 | set key font ",9" | 2291 | set key font ",9" |
2116 | 2273 | set key samplen "2" | 2292 | set key samplen "2" |
2118 | 2274 | set output "%s.ps" | 2293 | set output "%(output_base_name)s.ps" |
2119 | 2275 | 2294 | ||
2120 | 2276 | # This is the "PODO" color palette of gnuplot v.5, but with the order | 2295 | # This is the "PODO" color palette of gnuplot v.5, but with the order |
2121 | 2277 | # changed: palette of colors selected to be easily distinguishable by | 2296 | # changed: palette of colors selected to be easily distinguishable by |
2122 | 2278 | # color-blind individuals with either protanopia or deuteranopia. Bang | 2297 | # color-blind individuals with either protanopia or deuteranopia. Bang |
2123 | 2279 | # Wong [2011] Nature Methods 8, 441. | 2298 | # Wong [2011] Nature Methods 8, 441. |
2124 | 2280 | 2299 | ||
2181 | 2281 | set style line 1 lt 1 lc rgb "#009e73" lw 1.3 | 2300 | set style line 1 lt 1 lc rgb "%(col1)s" lw 1.3 |
2182 | 2282 | set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3) | 2301 | set style line 101 lt 1 lc rgb "%(col1)s" lw 1.3 dt (6,3) |
2183 | 2283 | set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3) | 2302 | set style line 11 lt 2 lc rgb "%(col1)s" lw 1.3 dt (6,3) |
2184 | 2284 | set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2) | 2303 | set style line 21 lt 4 lc rgb "%(col1)s" lw 1.3 dt (3,2) |
2185 | 2285 | set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1) | 2304 | set style line 31 lt 6 lc rgb "%(col1)s" lw 1.3 dt (2,1) |
2186 | 2286 | set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3) | 2305 | set style line 41 lt 8 lc rgb "%(col1)s" lw 1.3 dt (4,3) |
2187 | 2287 | 2306 | ||
2188 | 2288 | set style line 2 lt 1 lc rgb "#0072b2" lw 1.3 | 2307 | set style line 2 lt 1 lc rgb "%(col2)s" lw 1.3 |
2189 | 2289 | set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3) | 2308 | set style line 102 lt 1 lc rgb "%(col2)s" lw 1.3 dt (6,3) |
2190 | 2290 | set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3) | 2309 | set style line 12 lt 2 lc rgb "%(col2)s" lw 1.3 dt (6,3) |
2191 | 2291 | set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2) | 2310 | set style line 22 lt 4 lc rgb "%(col2)s" lw 1.3 dt (3,2) |
2192 | 2292 | set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1) | 2311 | set style line 32 lt 6 lc rgb "%(col2)s" lw 1.3 dt (2,1) |
2193 | 2293 | set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3) | 2312 | set style line 42 lt 8 lc rgb "%(col2)s" lw 1.3 dt (4,3) |
2194 | 2294 | 2313 | ||
2195 | 2295 | 2314 | set style line 3 lt 1 lc rgb "%(col3)s" lw 1.3 | |
2196 | 2296 | set style line 3 lt 1 lc rgb "#d55e00" lw 1.3 | 2315 | set style line 103 lt 1 lc rgb "%(col3)s" lw 1.3 dt (6,3) |
2197 | 2297 | set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3) | 2316 | set style line 13 lt 2 lc rgb "%(col3)s" lw 1.3 dt (6,3) |
2198 | 2298 | set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3) | 2317 | set style line 23 lt 4 lc rgb "%(col3)s" lw 1.3 dt (3,2) |
2199 | 2299 | set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2) | 2318 | set style line 33 lt 6 lc rgb "%(col3)s" lw 1.3 dt (2,1) |
2200 | 2300 | set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1) | 2319 | set style line 43 lt 8 lc rgb "%(col3)s" lw 1.3 dt (4,3) |
2201 | 2301 | set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3) | 2320 | |
2202 | 2302 | 2321 | set style line 4 lt 1 lc rgb "%(col4)s" lw 1.3 | |
2203 | 2303 | set style line 4 lt 1 lc rgb "#f0e442" lw 1.3 | 2322 | set style line 104 lt 1 lc rgb "%(col4)s" lw 1.3 dt (6,3) |
2204 | 2304 | set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3) | 2323 | set style line 14 lt 2 lc rgb "%(col4)s" lw 1.3 dt (6,3) |
2205 | 2305 | set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3) | 2324 | set style line 24 lt 4 lc rgb "%(col4)s" lw 1.3 dt (3,2) |
2206 | 2306 | set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2) | 2325 | set style line 34 lt 6 lc rgb "%(col4)s" lw 1.3 dt (2,1) |
2207 | 2307 | set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1) | 2326 | set style line 44 lt 8 lc rgb "%(col4)s" lw 1.3 dt (4,3) |
2208 | 2308 | set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3) | 2327 | |
2209 | 2309 | 2328 | set style line 5 lt 1 lc rgb "%(col5)s" lw 1.3 | |
2210 | 2310 | set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3 | 2329 | set style line 105 lt 1 lc rgb "%(col5)s" lw 1.3 dt (6,3) |
2211 | 2311 | set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3) | 2330 | set style line 15 lt 2 lc rgb "%(col5)s" lw 1.3 dt (6,3) |
2212 | 2312 | set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3) | 2331 | set style line 25 lt 4 lc rgb "%(col5)s" lw 1.3 dt (3,2) |
2213 | 2313 | set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2) | 2332 | set style line 35 lt 6 lc rgb "%(col5)s" lw 1.3 dt (2,1) |
2214 | 2314 | set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1) | 2333 | set style line 45 lt 8 lc rgb "%(col5)s" lw 1.3 dt (4,3) |
2215 | 2315 | set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3) | 2334 | |
2216 | 2316 | 2335 | set style line 6 lt 1 lc rgb "%(col6)s" lw 1.3 | |
2217 | 2317 | set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3 | 2336 | set style line 106 lt 1 lc rgb "%(col6)s" lw 1.3 dt (6,3) |
2218 | 2318 | set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3) | 2337 | set style line 16 lt 2 lc rgb "%(col6)s" lw 1.3 dt (6,3) |
2219 | 2319 | set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3) | 2338 | set style line 26 lt 4 lc rgb "%(col6)s" lw 1.3 dt (3,2) |
2220 | 2320 | set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2) | 2339 | set style line 36 lt 6 lc rgb "%(col6)s" lw 1.3 dt (2,1) |
2221 | 2321 | set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1) | 2340 | set style line 46 lt 8 lc rgb "%(col6)s" lw 1.3 dt (4,3) |
2222 | 2322 | set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3) | 2341 | |
2223 | 2323 | 2342 | set style line 7 lt 1 lc rgb "%(col7)s" lw 1.3 | |
2224 | 2324 | set style line 7 lt 1 lc rgb "#e69f00" lw 1.3 | 2343 | set style line 107 lt 1 lc rgb "%(col7)s" lw 1.3 dt (6,3) |
2225 | 2325 | set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3) | 2344 | set style line 17 lt 2 lc rgb "%(col7)s" lw 1.3 dt (6,3) |
2226 | 2326 | set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3) | 2345 | set style line 27 lt 4 lc rgb "%(col7)s" lw 1.3 dt (3,2) |
2227 | 2327 | set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2) | 2346 | set style line 37 lt 6 lc rgb "%(col7)s" lw 1.3 dt (2,1) |
2228 | 2328 | set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1) | 2347 | set style line 47 lt 8 lc rgb "%(col7)s" lw 1.3 dt (4,3) |
2229 | 2329 | set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3) | 2348 | |
2230 | 2330 | 2349 | set style line 8 lt 1 lc rgb "%(col8)s" lw 1.3 | |
2231 | 2331 | set style line 8 lt 1 lc rgb "black" lw 1.3 | 2350 | set style line 108 lt 1 lc rgb "%(col8)s" lw 1.3 dt (6,3) |
2232 | 2332 | set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3) | 2351 | set style line 18 lt 2 lc rgb "%(col8)s" lw 1.3 dt (6,3) |
2233 | 2333 | set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3) | 2352 | set style line 28 lt 4 lc rgb "%(col8)s" lw 1.3 dt (3,2) |
2234 | 2334 | set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2) | 2353 | set style line 38 lt 6 lc rgb "%(col8)s" lw 1.3 dt (2,1) |
2235 | 2335 | set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1) | 2354 | set style line 48 lt 8 lc rgb "%(col8)s" lw 1.3 dt (4,3) |
2180 | 2336 | set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3) | ||
2236 | 2337 | 2355 | ||
2237 | 2338 | 2356 | ||
2238 | 2339 | set style line 999 lt 1 lc rgb "gray" lw 1.3 | 2357 | set style line 999 lt 1 lc rgb "gray" lw 1.3 |
2239 | @@ -2343,7 +2361,7 @@ | |||
2240 | 2343 | set style data histeps | 2361 | set style data histeps |
2241 | 2344 | set key invert | 2362 | set key invert |
2242 | 2345 | 2363 | ||
2244 | 2346 | """%(arg_string,output_base_name) | 2364 | """%(replace_dict) |
2245 | 2347 | ] | 2365 | ] |
2246 | 2348 | 2366 | ||
2247 | 2349 | # determine the gnuplot version | 2367 | # determine the gnuplot version |
2248 | @@ -3382,6 +3400,7 @@ | |||
2249 | 3382 | '--show_full' to show the complete output of what was read. | 3400 | '--show_full' to show the complete output of what was read. |
2250 | 3383 | '--show_short' to show a summary of what was read. | 3401 | '--show_short' to show a summary of what was read. |
2251 | 3384 | '--simple_ratios' to turn off correlations and error propagation in the ratio. | 3402 | '--simple_ratios' to turn off correlations and error propagation in the ratio. |
2252 | 3403 | '--colours=<colour1>,<colour2>,...' to assign a non-default colour to GnuPlot histograms (max 8 colours) | ||
2253 | 3385 | '--sum' To sum all identical histograms together | 3404 | '--sum' To sum all identical histograms together |
2254 | 3386 | '--average' To average over all identical histograms | 3405 | '--average' To average over all identical histograms |
2255 | 3387 | '--rebin=<n>' Rebin the plots by merging n-consecutive bins together. | 3406 | '--rebin=<n>' Rebin the plots by merging n-consecutive bins together. |
2256 | @@ -3420,7 +3439,7 @@ | |||
2257 | 3420 | '--no_scale','--no_pdf','--no_stat','--no_merging','--no_alpsfact', | 3439 | '--no_scale','--no_pdf','--no_stat','--no_merging','--no_alpsfact', |
2258 | 3421 | '--only_scale','--only_pdf','--only_stat','--only_merging','--only_alpsfact', | 3440 | '--only_scale','--only_pdf','--only_stat','--only_merging','--only_alpsfact', |
2259 | 3422 | '--variations','--band','--central_only', '--lhapdf-config','--titles', | 3441 | '--variations','--band','--central_only', '--lhapdf-config','--titles', |
2261 | 3423 | '--keep_all_weights'] | 3442 | '--keep_all_weights','--colours'] |
2262 | 3424 | n_ratios = -1 | 3443 | n_ratios = -1 |
2263 | 3425 | uncertainties = ['scale','pdf','statistical','merging_scale','alpsfact'] | 3444 | uncertainties = ['scale','pdf','statistical','merging_scale','alpsfact'] |
2264 | 3426 | # The list of type of uncertainties for which to use bands. None is a 'smart' default | 3445 | # The list of type of uncertainties for which to use bands. None is a 'smart' default |
2265 | @@ -3466,6 +3485,12 @@ | |||
2266 | 3466 | assigned_types = [(type if type!='None' else None) for type in \ | 3485 | assigned_types = [(type if type!='None' else None) for type in \ |
2267 | 3467 | arg[15:].split(',')] | 3486 | arg[15:].split(',')] |
2268 | 3468 | 3487 | ||
2269 | 3488 | assigned_colours = [] | ||
2270 | 3489 | for arg in sys.argv[1:]: | ||
2271 | 3490 | if arg.startswith('--colours='): | ||
2272 | 3491 | assigned_colours = [(colour if colour!='None' else None) for colour in \ | ||
2273 | 3492 | arg[10:].split(',')] | ||
2274 | 3493 | |||
2275 | 3469 | jet_samples_to_keep = None | 3494 | jet_samples_to_keep = None |
2276 | 3470 | 3495 | ||
2277 | 3471 | lhapdfconfig = ['lhapdf-config'] | 3496 | lhapdfconfig = ['lhapdf-config'] |
2278 | @@ -3623,7 +3648,8 @@ | |||
2279 | 3623 | jet_samples_to_keep=jet_samples_to_keep, | 3648 | jet_samples_to_keep=jet_samples_to_keep, |
2280 | 3624 | use_band=use_band, | 3649 | use_band=use_band, |
2281 | 3625 | auto_open=auto_open, | 3650 | auto_open=auto_open, |
2283 | 3626 | lhapdfconfig=lhapdfconfig) | 3651 | lhapdfconfig=lhapdfconfig, |
2284 | 3652 | assigned_colours=assigned_colours) | ||
2285 | 3627 | # Tell the user that everything went for the best | 3653 | # Tell the user that everything went for the best |
2286 | 3628 | log("%d histograms have been output in " % len(histo_list)+\ | 3654 | log("%d histograms have been output in " % len(histo_list)+\ |
2287 | 3629 | "the gnuplot format at '%s.[HwU|gnuplot]'." % OutName) | 3655 | "the gnuplot format at '%s.[HwU|gnuplot]'." % OutName) |
2288 | 3630 | 3656 | ||
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 | 976 | self.seek(0) | 976 | self.seek(0) |
2294 | 977 | else: | 977 | else: |
2295 | 978 | # check special case without PDF for one (or both) beam | 978 | # check special case without PDF for one (or both) beam |
2297 | 979 | if init_information["idbmup1"] == 0: | 979 | if init_information["idbmup1"] in [0,9]: |
2298 | 980 | event = self.next() | 980 | event = self.next() |
2299 | 981 | init_information["idbmup1"]= event[0].pdg | 981 | init_information["idbmup1"]= event[0].pdg |
2300 | 982 | if init_information["idbmup2"] == 0: | 982 | if init_information["idbmup2"] == 0: |
2301 | 983 | init_information["idbmup2"]= event[1].pdg | 983 | init_information["idbmup2"]= event[1].pdg |
2302 | 984 | self.seek(0) | 984 | self.seek(0) |
2304 | 985 | if init_information["idbmup2"] == 0: | 985 | if init_information["idbmup2"] in [0,9]: |
2305 | 986 | event = self.next() | 986 | event = self.next() |
2306 | 987 | init_information["idbmup2"] = event[1].pdg | 987 | init_information["idbmup2"] = event[1].pdg |
2307 | 988 | self.seek(0) | 988 | self.seek(0) |
2308 | @@ -1572,7 +1572,7 @@ | |||
2309 | 1572 | if old_scales: | 1572 | if old_scales: |
2310 | 1573 | self.matched_scale_data.append(old_scales[initial_pos+jet_position]) | 1573 | self.matched_scale_data.append(old_scales[initial_pos+jet_position]) |
2311 | 1574 | # compute and assign the new four_momenta | 1574 | # compute and assign the new four_momenta |
2313 | 1575 | new_momentum = this_4mom.boost(FourMomentum(new_particle)) | 1575 | new_momentum = FourMomentum(new_particle).boost(this_4mom) |
2314 | 1576 | new_particle.set_momentum(new_momentum) | 1576 | new_particle.set_momentum(new_momentum) |
2315 | 1577 | # compute the new mother | 1577 | # compute the new mother |
2316 | 1578 | for tag in ['mother1', 'mother2']: | 1578 | for tag in ['mother1', 'mother2']: |
2317 | @@ -1726,6 +1726,25 @@ | |||
2318 | 1726 | 1726 | ||
2319 | 1727 | return new_event | 1727 | return new_event |
2320 | 1728 | 1728 | ||
2321 | 1729 | def boost(self, filter=None): | ||
2322 | 1730 | """modify the current event to boost it according to the current filter""" | ||
2323 | 1731 | if filter is None: | ||
2324 | 1732 | filter = lambda p: p.status==-1 | ||
2325 | 1733 | |||
2326 | 1734 | pboost = FourMomentum() | ||
2327 | 1735 | for p in self: | ||
2328 | 1736 | if filter(p): | ||
2329 | 1737 | pboost += p | ||
2330 | 1738 | |||
2331 | 1739 | # change sign of three-component due to helas convention | ||
2332 | 1740 | pboost.px *=-1 | ||
2333 | 1741 | pboost.py *=-1 | ||
2334 | 1742 | pboost.pz *=-1 | ||
2335 | 1743 | for p in self: | ||
2336 | 1744 | b= FourMomentum(p).boost(pboost) | ||
2337 | 1745 | p.E, p.px, p.py, p.pz = b.E, b.px, b.py, b.pz | ||
2338 | 1746 | |||
2339 | 1747 | return self | ||
2340 | 1729 | 1748 | ||
2341 | 1730 | def check(self): | 1749 | def check(self): |
2342 | 1731 | """check various property of the events""" | 1750 | """check various property of the events""" |
2343 | @@ -2493,18 +2512,20 @@ | |||
2344 | 2493 | def boost(self, mom): | 2512 | def boost(self, mom): |
2345 | 2494 | """mom 4-momenta is suppose to be given in the rest frame of this 4-momenta. | 2513 | """mom 4-momenta is suppose to be given in the rest frame of this 4-momenta. |
2346 | 2495 | the output is the 4-momenta in the frame of this 4-momenta | 2514 | the output is the 4-momenta in the frame of this 4-momenta |
2348 | 2496 | function copied from HELAS routine.""" | 2515 | function copied from HELAS routine. |
2349 | 2516 | if the current momenta is (E,\vec{p}), in order to go to the rest frame | ||
2350 | 2517 | of the current particle, mom should be (E, -\vec{p}) | ||
2351 | 2518 | """ | ||
2352 | 2497 | 2519 | ||
2356 | 2498 | 2520 | pnorm = mom.px**2 + mom.py**2 + mom.pz**2 | |
2357 | 2499 | pt = self.px**2 + self.py**2 + self.pz**2 | 2521 | if pnorm: |
2355 | 2500 | if pt: | ||
2358 | 2501 | s3product = self.px * mom.px + self.py * mom.py + self.pz * mom.pz | 2522 | s3product = self.px * mom.px + self.py * mom.py + self.pz * mom.pz |
2361 | 2502 | mass = self.mass | 2523 | mass = mom.mass |
2362 | 2503 | lf = (mom.E + (self.E - mass) * s3product / pt ) / mass | 2524 | lf = (self.E + (mom.E - mass) * s3product / pnorm ) / mass |
2363 | 2504 | return FourMomentum(E=(self.E*mom.E+s3product)/mass, | 2525 | return FourMomentum(E=(self.E*mom.E+s3product)/mass, |
2367 | 2505 | px=mom.px + self.px * lf, | 2526 | px=self.px + mom.px * lf, |
2368 | 2506 | py=mom.py + self.py * lf, | 2527 | py=self.py + mom.py * lf, |
2369 | 2507 | pz=mom.pz + self.pz * lf) | 2528 | pz=self.pz + mom.pz * lf) |
2370 | 2508 | else: | 2529 | else: |
2371 | 2509 | return FourMomentum(mom) | 2530 | return FourMomentum(mom) |
2372 | 2510 | 2531 | ||
2373 | 2511 | 2532 | ||
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 | 121 | 121 | ||
2379 | 122 | if info_str: | 122 | if info_str: |
2380 | 123 | info_dict = parse_info_str(StringIO.StringIO(info_str)) | 123 | info_dict = parse_info_str(StringIO.StringIO(info_str)) |
2381 | 124 | return info_dict | ||
2382 | 124 | 125 | ||
2383 | 126 | if PACKAGE_INFO: | ||
2384 | 127 | return PACKAGE_INFO | ||
2385 | 128 | |||
2386 | 125 | elif MADEVENT: | 129 | elif MADEVENT: |
2387 | 126 | info_dict ={} | 130 | info_dict ={} |
2388 | 127 | info_dict['version'] = open(pjoin(internal.__path__[0],'..','..','MGMEVersion.txt')).read().strip() | 131 | info_dict['version'] = open(pjoin(internal.__path__[0],'..','..','MGMEVersion.txt')).read().strip() |
2390 | 128 | info_dict['date'] = '20xx-xx-xx' | 132 | info_dict['date'] = '20xx-xx-xx' |
2391 | 133 | PACKAGE_INFO = info_dict | ||
2392 | 129 | else: | 134 | else: |
2393 | 130 | if PACKAGE_INFO: | 135 | if PACKAGE_INFO: |
2394 | 131 | return PACKAGE_INFO | 136 | return PACKAGE_INFO |
2395 | @@ -867,10 +872,10 @@ | |||
2396 | 867 | return f(arg, *args, **opt) | 872 | return f(arg, *args, **opt) |
2397 | 868 | except OSError, error: | 873 | except OSError, error: |
2398 | 869 | logger.debug('try to recover from %s' % error) | 874 | logger.debug('try to recover from %s' % error) |
2400 | 870 | if isinstance(arg, list): | 875 | if isinstance(arg, (list,tuple)): |
2401 | 871 | prog = arg[0] | 876 | prog = arg[0] |
2402 | 872 | else: | 877 | else: |
2404 | 873 | prog = arg[0] | 878 | prog = arg |
2405 | 874 | 879 | ||
2406 | 875 | # Permission denied | 880 | # Permission denied |
2407 | 876 | if error.errno == 13: | 881 | if error.errno == 13: |
2408 | @@ -1704,10 +1709,49 @@ | |||
2409 | 1704 | "May the mass times acceleration be with you.", | 1709 | "May the mass times acceleration be with you.", |
2410 | 1705 | "NOTE: This product may actually be nine-dimensional. If this is the case, functionality is not affected by the extra five dimensions.", | 1710 | "NOTE: This product may actually be nine-dimensional. If this is the case, functionality is not affected by the extra five dimensions.", |
2411 | 1706 | "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.", | 1711 | "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 | 1712 | "", | ||
2413 | 1707 | 'The fish are out of jokes. See you next year for more!'], | 1713 | 'The fish are out of jokes. See you next year for more!'], |
2416 | 1708 | 'loading': ['Hi %(user)s, You are Loading Madgraph. Please be patient, we are doing the work.'], | 1714 | # 'loading': ['Hi %(user)s, You are Loading Madgraph. Please be patient, we are doing the work.'], |
2417 | 1709 | 'quit': ['Thanks %(user)s for using MadGraph5_aMC@NLO, even on April 1st!'] | 1715 | # 'quit': ['Thanks %(user)s for using MadGraph5_aMC@NLO, even on April 1st!'] |
2418 | 1710 | } | 1716 | } |
2419 | 1717 | |||
2420 | 1718 | default_banner_1 = "************************************************************\n" + \ | ||
2421 | 1719 | "* *\n" + \ | ||
2422 | 1720 | "* W E L C O M E to *\n" + \ | ||
2423 | 1721 | "* M A D G R A P H 5 _ a M C @ N L O *\n" + \ | ||
2424 | 1722 | "* *\n" + \ | ||
2425 | 1723 | "* *\n" | ||
2426 | 1724 | |||
2427 | 1725 | |||
2428 | 1726 | default_banner_2 = "* *\n" + \ | ||
2429 | 1727 | "%s" + \ | ||
2430 | 1728 | "* *\n" + \ | ||
2431 | 1729 | "* The MadGraph5_aMC@NLO Development Team - Find us at *\n" + \ | ||
2432 | 1730 | "* https://server06.fynu.ucl.ac.be/projects/madgraph *\n" + \ | ||
2433 | 1731 | "* and *\n" + \ | ||
2434 | 1732 | "* http://amcatnlo.web.cern.ch/amcatnlo/ *\n" + \ | ||
2435 | 1733 | "* *\n" + \ | ||
2436 | 1734 | "* Type 'help' for in-line help. *\n" + \ | ||
2437 | 1735 | "* Type 'tutorial' to learn how MG5 works *\n" + \ | ||
2438 | 1736 | "* Type 'tutorial aMCatNLO' to learn how aMC@NLO works *\n" + \ | ||
2439 | 1737 | "* Type 'tutorial MadLoop' to learn how MadLoop works *\n" + \ | ||
2440 | 1738 | "* *\n" + \ | ||
2441 | 1739 | "************************************************************" | ||
2442 | 1740 | |||
2443 | 1741 | May4_banner = "* _____ *\n" + \ | ||
2444 | 1742 | "* ,-~\" \"~-. *\n" + \ | ||
2445 | 1743 | "* * ,^ ___ ^. * *\n" + \ | ||
2446 | 1744 | "* * / .^ ^. \ * *\n" + \ | ||
2447 | 1745 | "* * Y l o ! Y * *\n" + \ | ||
2448 | 1746 | "* * l_ `.___.' _,[ * *\n" + \ | ||
2449 | 1747 | "* * |^~\"--------------~\"\"^| * *\n" + \ | ||
2450 | 1748 | "* * ! May the 4th ! * *\n" + \ | ||
2451 | 1749 | "* * \ / * *\n" + \ | ||
2452 | 1750 | "* * ^. .^ * *\n" + \ | ||
2453 | 1751 | "* * \"-.._____.,-\" * *\n" | ||
2454 | 1752 | |||
2455 | 1753 | special_banner = {(4,5): May4_banner} | ||
2456 | 1754 | |||
2457 | 1711 | 1755 | ||
2458 | 1712 | def __init__(self, msgtype): | 1756 | def __init__(self, msgtype): |
2459 | 1713 | 1757 | ||
2460 | @@ -1726,6 +1770,9 @@ | |||
2461 | 1726 | msg = choices[random.randint(0,len(choices)-2)] | 1770 | msg = choices[random.randint(0,len(choices)-2)] |
2462 | 1727 | EasterEgg.message_aprilfirst[msgtype].remove(msg) | 1771 | EasterEgg.message_aprilfirst[msgtype].remove(msg) |
2463 | 1728 | 1772 | ||
2464 | 1773 | elif msgtype=='loading' and date in self.special_banner: | ||
2465 | 1774 | self.change_banner(date) | ||
2466 | 1775 | return | ||
2467 | 1729 | else: | 1776 | else: |
2468 | 1730 | return | 1777 | return |
2469 | 1731 | if MADEVENT: | 1778 | if MADEVENT: |
2470 | @@ -1749,6 +1796,13 @@ | |||
2471 | 1749 | except: | 1796 | except: |
2472 | 1750 | pass | 1797 | pass |
2473 | 1751 | 1798 | ||
2474 | 1799 | def change_banner(self, date): | ||
2475 | 1800 | if MADEVENT: | ||
2476 | 1801 | return | ||
2477 | 1802 | import madgraph.interface.madgraph_interface as madgraph_interface | ||
2478 | 1803 | madgraph_interface.CmdExtended.intro_banner= self.default_banner_1 + self.special_banner[date] + self.default_banner_2 | ||
2479 | 1804 | |||
2480 | 1805 | |||
2481 | 1752 | def call_apple(self, msg): | 1806 | def call_apple(self, msg): |
2482 | 1753 | 1807 | ||
2483 | 1754 | #1. control if the volume is on or not | 1808 | #1. control if the volume is on or not |
2484 | @@ -1790,17 +1844,6 @@ | |||
2485 | 1790 | os.system(fishCmd) | 1844 | os.system(fishCmd) |
2486 | 1791 | 1845 | ||
2487 | 1792 | 1846 | ||
2488 | 1793 | if __debug__: | ||
2489 | 1794 | try: | ||
2490 | 1795 | import os | ||
2491 | 1796 | import pwd | ||
2492 | 1797 | username =pwd.getpwuid( os.getuid() )[ 0 ] | ||
2493 | 1798 | if 'hirschi' in username or 'vryonidou' in username and __debug__: | ||
2494 | 1799 | EasterEgg('loading') | ||
2495 | 1800 | except: | ||
2496 | 1801 | pass | ||
2497 | 1802 | |||
2498 | 1803 | |||
2499 | 1804 | def get_older_version(v1, v2): | 1847 | def get_older_version(v1, v2): |
2500 | 1805 | """ return v2 if v1>v2 | 1848 | """ return v2 if v1>v2 |
2501 | 1806 | return v1 if v1<v2 | 1849 | return v1 if v1<v2 |
2502 | 1807 | 1850 | ||
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 | 18 | import re | 18 | import re |
2508 | 19 | import os | 19 | import os |
2509 | 20 | import logging | 20 | import logging |
2511 | 21 | 21 | try: | |
2512 | 22 | import madgraph | ||
2513 | 23 | except ImportError: | ||
2514 | 24 | import internal.misc as misc | ||
2515 | 25 | import internal.banner as banner | ||
2516 | 26 | from internal import InvalidCmd | ||
2517 | 27 | else: | ||
2518 | 28 | import madgraph.various.misc as misc | ||
2519 | 29 | import madgraph.various.banner as banner | ||
2520 | 30 | from madgraph import InvalidCmd | ||
2521 | 31 | |||
2522 | 22 | logger = logging.getLogger('madgraph.shower_card') | 32 | logger = logging.getLogger('madgraph.shower_card') |
2523 | 23 | 33 | ||
2524 | 24 | pjoin = os.path.join | 34 | pjoin = os.path.join |
2525 | @@ -92,20 +102,20 @@ | |||
2526 | 92 | lines = content.split('\n') | 102 | lines = content.split('\n') |
2527 | 93 | list_dm = [] | 103 | list_dm = [] |
2528 | 94 | for l in lines: | 104 | for l in lines: |
2543 | 95 | if '#' in l: | 105 | if '#' in l: |
2544 | 96 | l = l.split('#',1)[0] | 106 | l = l.split('#',1)[0] |
2545 | 97 | if '=' not in l: | 107 | if '=' not in l: |
2546 | 98 | continue | 108 | continue |
2547 | 99 | args = l.split('=',1) # here the 1 is important in case of string passed | 109 | args = l.split('=',1) # here the 1 is important in case of string passed |
2548 | 100 | key = args[0].strip().lower() | 110 | key = args[0].strip().lower() |
2549 | 101 | value = args[1].strip() | 111 | value = args[1].strip() |
2550 | 102 | self.set_param(key, value) | 112 | self.set_param(key, value) |
2551 | 103 | if str(key).upper().startswith('DM'): | 113 | if str(key).upper().startswith('DM'): |
2552 | 104 | list_dm.append(int(key.split('_',1)[1])) | 114 | list_dm.append(int(key.split('_',1)[1])) |
2553 | 105 | #special case for DM_* | 115 | #special case for DM_* |
2554 | 106 | for i in range(1,100): | 116 | for i in range(1,100): |
2555 | 107 | if not i in list_dm: | 117 | if not i in list_dm: |
2556 | 108 | self['dm_'+str(i)] = '' | 118 | self['dm_'+str(i)] = '' |
2557 | 109 | 119 | ||
2558 | 110 | self.text=content | 120 | self.text=content |
2559 | 111 | 121 | ||
2560 | @@ -116,14 +126,12 @@ | |||
2561 | 116 | if not testing write_to is an input path, if testing the text is | 126 | if not testing write_to is an input path, if testing the text is |
2562 | 117 | returned by the function | 127 | returned by the function |
2563 | 118 | """ | 128 | """ |
2564 | 129 | |||
2565 | 119 | if key in self.logical_vars: | 130 | if key in self.logical_vars: |
2573 | 120 | if str(value).lower() in self.true: | 131 | try: |
2574 | 121 | self[key] = True | 132 | self[key] = banner.ConfigFile.format_variable(value, bool, key) |
2575 | 122 | elif str(value).lower() in self.false: | 133 | except InvalidCmd, error: |
2576 | 123 | self[key] = False | 134 | raise ShowerCardError(str(error)) |
2570 | 124 | else: | ||
2571 | 125 | raise ShowerCardError('%s is not a valid value for %s' % \ | ||
2572 | 126 | (value, key)) | ||
2577 | 127 | elif key in self.string_vars: | 135 | elif key in self.string_vars: |
2578 | 128 | if value.lower() == 'none': | 136 | if value.lower() == 'none': |
2579 | 129 | self[key] = '' | 137 | self[key] = '' |
2580 | @@ -131,16 +139,14 @@ | |||
2581 | 131 | self[key] = value | 139 | self[key] = value |
2582 | 132 | elif key in self.int_vars: | 140 | elif key in self.int_vars: |
2583 | 133 | try: | 141 | try: |
2588 | 134 | self[key] = int(value) | 142 | self[key] = banner.ConfigFile.format_variable(value, int, key) |
2589 | 135 | except ValueError: | 143 | except InvalidCmd, error: |
2590 | 136 | raise ShowerCardError('%s is not a valid value for %s. An integer number is expected' % \ | 144 | raise ShowerCardError(str(error)) |
2587 | 137 | (value, key)) | ||
2591 | 138 | elif key in self.float_vars: | 145 | elif key in self.float_vars: |
2592 | 139 | try: | 146 | try: |
2597 | 140 | self[key] = float(value) | 147 | self[key] = banner.ConfigFile.format_variable(value, float, key) |
2598 | 141 | except ValueError: | 148 | except InvalidCmd, error: |
2599 | 142 | raise ShowerCardError('%s is not a valid value for %s. A floating point number is expected' % \ | 149 | raise ShowerCardError(str(error)) |
2596 | 143 | (value, key)) | ||
2600 | 144 | else: | 150 | else: |
2601 | 145 | raise ShowerCardError('Unknown entry: %s = %s' % (key, value)) | 151 | raise ShowerCardError('Unknown entry: %s = %s' % (key, value)) |
2602 | 146 | self.keylist.append(key) | 152 | self.keylist.append(key) |
2603 | @@ -160,7 +166,8 @@ | |||
2604 | 160 | if key not in self.logical_vars: | 166 | if key not in self.logical_vars: |
2605 | 161 | newlines.append('%s = %s #%s' % (key, value, comment)) | 167 | newlines.append('%s = %s #%s' % (key, value, comment)) |
2606 | 162 | else: | 168 | else: |
2608 | 163 | if key: | 169 | |
2609 | 170 | if self[key]: | ||
2610 | 164 | newlines.append('%s = %s #%s' % (key, 'T', comment)) | 171 | newlines.append('%s = %s #%s' % (key, 'T', comment)) |
2611 | 165 | else: | 172 | else: |
2612 | 166 | newlines.append('%s = %s #%s' % (key, 'F', comment)) | 173 | newlines.append('%s = %s #%s' % (key, 'F', comment)) |
2613 | 167 | 174 | ||
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 | 93 | data, self.comment = text.split('#',1) | 93 | data, self.comment = text.split('#',1) |
2619 | 94 | else: | 94 | else: |
2620 | 95 | data, self.comment = text, "" | 95 | data, self.comment = text, "" |
2621 | 96 | |||
2622 | 97 | if ']]>' in data: | ||
2623 | 98 | data = data.split(']]>',1)[0] | ||
2624 | 96 | 99 | ||
2625 | 97 | 100 | ||
2626 | 98 | data = data.split() | 101 | data = data.split() |
2627 | 99 | 102 | ||
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 | 422 | model.set('version_tag', os.path.realpath(path) +'##'+ str(misc.get_pkg_info())) | 422 | model.set('version_tag', os.path.realpath(path) +'##'+ str(misc.get_pkg_info())) |
2633 | 423 | 423 | ||
2634 | 424 | # save in a pickle files to fasten future usage | 424 | # save in a pickle files to fasten future usage |
2636 | 425 | if ReadWrite: | 425 | if ReadWrite and model['allow_pickle']: |
2637 | 426 | save_load_object.save_to_file(os.path.join(model_path, pickle_name), | 426 | save_load_object.save_to_file(os.path.join(model_path, pickle_name), |
2638 | 427 | model, log=False) | 427 | model, log=False) |
2639 | 428 | 428 | ||
2640 | @@ -444,6 +444,8 @@ | |||
2641 | 444 | 444 | ||
2642 | 445 | self.particles = base_objects.ParticleList() | 445 | self.particles = base_objects.ParticleList() |
2643 | 446 | self.interactions = base_objects.InteractionList() | 446 | self.interactions = base_objects.InteractionList() |
2644 | 447 | self.non_qcd_gluon_emission = 0 # vertex where a gluon is emitted withou QCD interaction | ||
2645 | 448 | # only trigger if all particles are of QCD type (not h>gg) | ||
2646 | 447 | self.wavefunction_CT_couplings = [] | 449 | self.wavefunction_CT_couplings = [] |
2647 | 448 | 450 | ||
2648 | 449 | # Check here if we can extract the couplings perturbed in this model | 451 | # Check here if we can extract the couplings perturbed in this model |
2649 | @@ -545,6 +547,14 @@ | |||
2650 | 545 | for interaction_info in self.ufomodel.all_vertices: | 547 | for interaction_info in self.ufomodel.all_vertices: |
2651 | 546 | self.add_interaction(interaction_info, color_info) | 548 | self.add_interaction(interaction_info, color_info) |
2652 | 547 | 549 | ||
2653 | 550 | if self.non_qcd_gluon_emission: | ||
2654 | 551 | 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 | 552 | " Restriction on LO dynamical scale and MLM matching/merging can occur for some processes.\n"+\ | ||
2656 | 553 | " Use such features with care.", self.non_qcd_gluon_emission) | ||
2657 | 554 | |||
2658 | 555 | self.model['allow_pickle'] = False | ||
2659 | 556 | self.model['limitations'].append('MLM') | ||
2660 | 557 | |||
2661 | 548 | if self.perturbation_couplings: | 558 | if self.perturbation_couplings: |
2662 | 549 | try: | 559 | try: |
2663 | 550 | self.ufomodel.add_NLO() | 560 | self.ufomodel.add_NLO() |
2664 | @@ -1294,6 +1304,7 @@ | |||
2665 | 1294 | helas.name, helas.structure, error) | 1304 | helas.name, helas.structure, error) |
2666 | 1295 | raise InvalidModel, text | 1305 | raise InvalidModel, text |
2667 | 1296 | 1306 | ||
2668 | 1307 | |||
2669 | 1297 | 1308 | ||
2670 | 1298 | 1309 | ||
2671 | 1299 | # Now consider the name only | 1310 | # Now consider the name only |
2672 | @@ -1319,10 +1330,18 @@ | |||
2673 | 1319 | coupling_sign = '' | 1330 | coupling_sign = '' |
2674 | 1320 | for coupling in couplings: | 1331 | for coupling in couplings: |
2675 | 1321 | order = tuple(coupling.order.items()) | 1332 | order = tuple(coupling.order.items()) |
2677 | 1322 | if '1' in order: | 1333 | |
2678 | 1334 | if '1' in coupling.order: | ||
2679 | 1323 | raise InvalidModel, '''Some couplings have \'1\' order. | 1335 | raise InvalidModel, '''Some couplings have \'1\' order. |
2680 | 1324 | This is not allowed in MG. | 1336 | This is not allowed in MG. |
2681 | 1325 | Please defines an additional coupling to your model''' | 1337 | Please defines an additional coupling to your model''' |
2682 | 1338 | # check that gluon emission from quark are QCD tagged | ||
2683 | 1339 | if 21 in [particle.pdg_code for particle in interaction_info.particles] and\ | ||
2684 | 1340 | 'QCD' not in coupling.order: | ||
2685 | 1341 | col = [par.get('color') for par in particles] | ||
2686 | 1342 | if 1 not in col: | ||
2687 | 1343 | self.non_qcd_gluon_emission +=1 | ||
2688 | 1344 | |||
2689 | 1326 | if order in order_to_int: | 1345 | if order in order_to_int: |
2690 | 1327 | order_to_int[order].get('couplings')[key] = '%s%s' % \ | 1346 | order_to_int[order].get('couplings')[key] = '%s%s' % \ |
2691 | 1328 | (coupling_sign,coupling.name) | 1347 | (coupling_sign,coupling.name) |
2692 | @@ -1340,7 +1359,8 @@ | |||
2693 | 1340 | order_to_int[order] = interaction | 1359 | order_to_int[order] = interaction |
2694 | 1341 | # add to the interactions | 1360 | # add to the interactions |
2695 | 1342 | self.interactions.append(interaction) | 1361 | self.interactions.append(interaction) |
2697 | 1343 | 1362 | ||
2698 | 1363 | |||
2699 | 1344 | # check if this interaction conserve the charge defined | 1364 | # check if this interaction conserve the charge defined |
2700 | 1345 | # if type=='base': | 1365 | # if type=='base': |
2701 | 1346 | for charge in list(self.conservecharge): #duplicate to allow modification | 1366 | for charge in list(self.conservecharge): #duplicate to allow modification |
2702 | @@ -1353,7 +1373,7 @@ | |||
2703 | 1353 | if abs(total) > 1e-12: | 1373 | if abs(total) > 1e-12: |
2704 | 1354 | logger.info('The model has interaction violating the charge: %s' % charge) | 1374 | logger.info('The model has interaction violating the charge: %s' % charge) |
2705 | 1355 | self.conservecharge.discard(charge) | 1375 | self.conservecharge.discard(charge) |
2707 | 1356 | 1376 | ||
2708 | 1357 | 1377 | ||
2709 | 1358 | 1378 | ||
2710 | 1359 | def get_sign_flow(self, flow, nb_fermion): | 1379 | def get_sign_flow(self, flow, nb_fermion): |
2711 | @@ -1940,6 +1960,7 @@ | |||
2712 | 1940 | logger.debug('coupling with small value %s: %s treated as zero' % | 1960 | logger.debug('coupling with small value %s: %s treated as zero' % |
2713 | 1941 | (name, value)) | 1961 | (name, value)) |
2714 | 1942 | zero_coupling.append(name) | 1962 | zero_coupling.append(name) |
2715 | 1963 | continue | ||
2716 | 1943 | elif not strict_zero and abs(value) < 1e-10: | 1964 | elif not strict_zero and abs(value) < 1e-10: |
2717 | 1944 | return self.detect_identical_couplings(strict_zero=True) | 1965 | return self.detect_identical_couplings(strict_zero=True) |
2718 | 1945 | 1966 | ||
2719 | @@ -2234,8 +2255,10 @@ | |||
2720 | 2234 | else: | 2255 | else: |
2721 | 2235 | arg = 'width' | 2256 | arg = 'width' |
2722 | 2236 | change_name = [p.name for (p,f) in parameters[1:]] | 2257 | change_name = [p.name for (p,f) in parameters[1:]] |
2723 | 2258 | factor_for_name = [f for (p,f) in parameters[1:]] | ||
2724 | 2237 | [p.set(arg, new_name) for p in self['particle_dict'].values() | 2259 | [p.set(arg, new_name) for p in self['particle_dict'].values() |
2726 | 2238 | if p[arg] in change_name] | 2260 | if p[arg] in change_name and |
2727 | 2261 | factor_for_name[change_name.index(p[arg])]==1] | ||
2728 | 2239 | 2262 | ||
2729 | 2240 | def remove_interactions(self, zero_couplings): | 2263 | def remove_interactions(self, zero_couplings): |
2730 | 2241 | """ remove the interactions and particle counterterms | 2264 | """ remove the interactions and particle counterterms |
2731 | 2242 | 2265 | ||
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 | 242 | 242 | ||
2737 | 243 | if lhablock == 'MASS': | 243 | if lhablock == 'MASS': |
2738 | 244 | data = self.dep_mass | 244 | data = self.dep_mass |
2739 | 245 | #misc.sprint(data) | ||
2740 | 245 | prefix = " " | 246 | prefix = " " |
2741 | 246 | elif lhablock == 'DECAY': | 247 | elif lhablock == 'DECAY': |
2742 | 247 | data = self.dep_width | 248 | data = self.dep_width |
2743 | @@ -266,7 +267,7 @@ | |||
2744 | 266 | if self.model['parameter_dict'][param.name].imag: | 267 | if self.model['parameter_dict'][param.name].imag: |
2745 | 267 | raise ParamCardWriterError, 'All Mass/Width Parameter should be real (not the case for %s)'%param.name | 268 | raise ParamCardWriterError, 'All Mass/Width Parameter should be real (not the case for %s)'%param.name |
2746 | 268 | value = complex(self.model['parameter_dict'][param.name]).real | 269 | value = complex(self.model['parameter_dict'][param.name]).real |
2748 | 269 | text += """%s %s %f # %s : %s \n""" %(prefix, part["pdg_code"], | 270 | text += """%s %s %e # %s : %s \n""" %(prefix, part["pdg_code"], |
2749 | 270 | value, part["name"], param.expr.replace('mdl_','')) | 271 | value, part["name"], param.expr.replace('mdl_','')) |
2750 | 271 | 272 | ||
2751 | 272 | # Add duplicate parameter | 273 | # Add duplicate parameter |
2752 | @@ -281,9 +282,9 @@ | |||
2753 | 281 | if self.model['parameter_dict'][param.name].imag: | 282 | if self.model['parameter_dict'][param.name].imag: |
2754 | 282 | raise ParamCardWriterError, 'All Mass/Width Parameter should be real' | 283 | raise ParamCardWriterError, 'All Mass/Width Parameter should be real' |
2755 | 283 | value = complex(self.model['parameter_dict'][param.name]).real | 284 | value = complex(self.model['parameter_dict'][param.name]).real |
2757 | 284 | text += """%s %s %f # %s : %s \n""" %(prefix, part["pdg_code"], | 285 | text += """%s %s %e # %s : %s \n""" %(prefix, part["pdg_code"], |
2758 | 285 | value, part["name"], part[name].replace('mdl_','')) | 286 | value, part["name"], part[name].replace('mdl_','')) |
2760 | 286 | 287 | ||
2761 | 287 | if not text: | 288 | if not text: |
2762 | 288 | return | 289 | return |
2763 | 289 | 290 | ||
2764 | 290 | 291 | ||
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 | 1089 | 'lib', 'libpdf.a'))) | 1089 | 'lib', 'libpdf.a'))) |
2770 | 1090 | # Check that combine_events, gen_ximprove, combine_runs | 1090 | # Check that combine_events, gen_ximprove, combine_runs |
2771 | 1091 | # compile | 1091 | # compile |
2778 | 1092 | status = subprocess.call(['make', '../bin/internal/combine_events'], | 1092 | #status = subprocess.call(['make', '../bin/internal/combine_events'], |
2779 | 1093 | stdout=devnull, | 1093 | # stdout=devnull, |
2780 | 1094 | cwd=os.path.join(self.out_dir, 'Source')) | 1094 | # cwd=os.path.join(self.out_dir, 'Source')) |
2781 | 1095 | self.assertEqual(status, 0) | 1095 | #self.assertEqual(status, 0) |
2782 | 1096 | self.assertTrue(os.path.exists(os.path.join(self.out_dir, | 1096 | #self.assertTrue(os.path.exists(os.path.join(self.out_dir, |
2783 | 1097 | 'bin','internal', 'combine_events'))) | 1097 | # 'bin','internal', 'combine_events'))) |
2784 | 1098 | status = subprocess.call(['make', '../bin/internal/gen_ximprove'], | 1098 | status = subprocess.call(['make', '../bin/internal/gen_ximprove'], |
2785 | 1099 | stdout=devnull, | 1099 | stdout=devnull, |
2786 | 1100 | cwd=os.path.join(self.out_dir, 'Source')) | 1100 | cwd=os.path.join(self.out_dir, 'Source')) |
2787 | 1101 | 1101 | ||
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 | 152 | JHEL = 1 | 152 | JHEL = 1 |
2793 | 153 | IF(NTRY.LE.MAXTRIES)THEN | 153 | IF(NTRY.LE.MAXTRIES)THEN |
2794 | 154 | DO I=1,NCOMB | 154 | DO I=1,NCOMB |
2797 | 155 | IF (.NOT.GOODHEL(I) .AND. (TS(I).GT.ANS*LIMHEL/NCOMB)) | 155 | IF (.NOT.GOODHEL(I) .AND. (DABS(TS(I)).GT.ANS*LIMHEL |
2798 | 156 | $ THEN | 156 | $ /NCOMB)) THEN |
2799 | 157 | GOODHEL(I)=.TRUE. | 157 | GOODHEL(I)=.TRUE. |
2800 | 158 | NGOOD = NGOOD +1 | 158 | NGOOD = NGOOD +1 |
2801 | 159 | IGOOD(NGOOD) = I | 159 | IGOOD(NGOOD) = I |
2802 | 160 | 160 | ||
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 | 26 | # color-blind individuals with either protanopia or deuteranopia. Bang | 26 | # color-blind individuals with either protanopia or deuteranopia. Bang |
2808 | 27 | # Wong [2011] Nature Methods 8, 441. | 27 | # Wong [2011] Nature Methods 8, 441. |
2809 | 28 | 28 | ||
2811 | 29 | set style line 1 lt 1 lc rgb "#009e73" lw 1.3 | 29 | set style line 1 lt 1 lc rgb "#009e73" lw 1.3 |
2812 | 30 | set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3) | 30 | set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3) |
2827 | 31 | set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3) | 31 | set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3) |
2828 | 32 | set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2) | 32 | set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2) |
2829 | 33 | set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1) | 33 | set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1) |
2830 | 34 | set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3) | 34 | set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3) |
2831 | 35 | 35 | ||
2832 | 36 | set style line 2 lt 1 lc rgb "#0072b2" lw 1.3 | 36 | set style line 2 lt 1 lc rgb "#0072b2" lw 1.3 |
2833 | 37 | set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3) | 37 | set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3) |
2834 | 38 | set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3) | 38 | set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3) |
2835 | 39 | set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2) | 39 | set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2) |
2836 | 40 | set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1) | 40 | set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1) |
2837 | 41 | set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3) | 41 | set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3) |
2838 | 42 | 42 | ||
2839 | 43 | 43 | set style line 3 lt 1 lc rgb "#d55e00" lw 1.3 | |
2826 | 44 | set style line 3 lt 1 lc rgb "#d55e00" lw 1.3 | ||
2840 | 45 | set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3) | 44 | set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3) |
2880 | 46 | set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3) | 45 | set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3) |
2881 | 47 | set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2) | 46 | set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2) |
2882 | 48 | set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1) | 47 | set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1) |
2883 | 49 | set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3) | 48 | set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3) |
2884 | 50 | 49 | ||
2885 | 51 | set style line 4 lt 1 lc rgb "#f0e442" lw 1.3 | 50 | set style line 4 lt 1 lc rgb "#f0e442" lw 1.3 |
2886 | 52 | set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3) | 51 | set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3) |
2887 | 53 | set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3) | 52 | set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3) |
2888 | 54 | set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2) | 53 | set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2) |
2889 | 55 | set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1) | 54 | set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1) |
2890 | 56 | set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3) | 55 | set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3) |
2891 | 57 | 56 | ||
2892 | 58 | set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3 | 57 | set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3 |
2893 | 59 | set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3) | 58 | set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3) |
2894 | 60 | set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3) | 59 | set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3) |
2895 | 61 | set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2) | 60 | set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2) |
2896 | 62 | set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1) | 61 | set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1) |
2897 | 63 | set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3) | 62 | set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3) |
2898 | 64 | 63 | ||
2899 | 65 | set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3 | 64 | set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3 |
2900 | 66 | set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3) | 65 | set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3) |
2901 | 67 | set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3) | 66 | set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3) |
2902 | 68 | set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2) | 67 | set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2) |
2903 | 69 | set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1) | 68 | set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1) |
2904 | 70 | set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3) | 69 | set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3) |
2905 | 71 | 70 | ||
2906 | 72 | set style line 7 lt 1 lc rgb "#e69f00" lw 1.3 | 71 | set style line 7 lt 1 lc rgb "#e69f00" lw 1.3 |
2907 | 73 | set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3) | 72 | set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3) |
2908 | 74 | set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3) | 73 | set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3) |
2909 | 75 | set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2) | 74 | set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2) |
2910 | 76 | set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1) | 75 | set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1) |
2911 | 77 | set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3) | 76 | set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3) |
2912 | 78 | 77 | ||
2913 | 79 | set style line 8 lt 1 lc rgb "black" lw 1.3 | 78 | set style line 8 lt 1 lc rgb "black" lw 1.3 |
2914 | 80 | set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3) | 79 | set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3) |
2915 | 81 | set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3) | 80 | set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3) |
2916 | 82 | set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2) | 81 | set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2) |
2917 | 83 | set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1) | 82 | set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1) |
2918 | 84 | set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3) | 83 | set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3) |
2919 | 85 | 84 | ||
2920 | 86 | 85 | ||
2921 | 87 | set style line 999 lt 1 lc rgb "gray" lw 1.3 | 86 | set style line 999 lt 1 lc rgb "gray" lw 1.3 |
2922 | 88 | 87 | ||
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 | 26 | # color-blind individuals with either protanopia or deuteranopia. Bang | 26 | # color-blind individuals with either protanopia or deuteranopia. Bang |
2928 | 27 | # Wong [2011] Nature Methods 8, 441. | 27 | # Wong [2011] Nature Methods 8, 441. |
2929 | 28 | 28 | ||
2931 | 29 | set style line 1 lt 1 lc rgb "#009e73" lw 1.3 | 29 | set style line 1 lt 1 lc rgb "#009e73" lw 1.3 |
2932 | 30 | set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3) | 30 | set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3) |
2947 | 31 | set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3) | 31 | set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3) |
2948 | 32 | set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2) | 32 | set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2) |
2949 | 33 | set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1) | 33 | set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1) |
2950 | 34 | set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3) | 34 | set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3) |
2951 | 35 | 35 | ||
2952 | 36 | set style line 2 lt 1 lc rgb "#0072b2" lw 1.3 | 36 | set style line 2 lt 1 lc rgb "#0072b2" lw 1.3 |
2953 | 37 | set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3) | 37 | set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3) |
2954 | 38 | set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3) | 38 | set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3) |
2955 | 39 | set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2) | 39 | set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2) |
2956 | 40 | set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1) | 40 | set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1) |
2957 | 41 | set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3) | 41 | set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3) |
2958 | 42 | 42 | ||
2959 | 43 | 43 | set style line 3 lt 1 lc rgb "#d55e00" lw 1.3 | |
2946 | 44 | set style line 3 lt 1 lc rgb "#d55e00" lw 1.3 | ||
2960 | 45 | set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3) | 44 | set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3) |
3000 | 46 | set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3) | 45 | set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3) |
3001 | 47 | set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2) | 46 | set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2) |
3002 | 48 | set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1) | 47 | set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1) |
3003 | 49 | set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3) | 48 | set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3) |
3004 | 50 | 49 | ||
3005 | 51 | set style line 4 lt 1 lc rgb "#f0e442" lw 1.3 | 50 | set style line 4 lt 1 lc rgb "#f0e442" lw 1.3 |
3006 | 52 | set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3) | 51 | set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3) |
3007 | 53 | set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3) | 52 | set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3) |
3008 | 54 | set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2) | 53 | set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2) |
3009 | 55 | set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1) | 54 | set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1) |
3010 | 56 | set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3) | 55 | set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3) |
3011 | 57 | 56 | ||
3012 | 58 | set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3 | 57 | set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3 |
3013 | 59 | set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3) | 58 | set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3) |
3014 | 60 | set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3) | 59 | set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3) |
3015 | 61 | set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2) | 60 | set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2) |
3016 | 62 | set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1) | 61 | set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1) |
3017 | 63 | set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3) | 62 | set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3) |
3018 | 64 | 63 | ||
3019 | 65 | set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3 | 64 | set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3 |
3020 | 66 | set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3) | 65 | set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3) |
3021 | 67 | set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3) | 66 | set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3) |
3022 | 68 | set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2) | 67 | set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2) |
3023 | 69 | set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1) | 68 | set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1) |
3024 | 70 | set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3) | 69 | set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3) |
3025 | 71 | 70 | ||
3026 | 72 | set style line 7 lt 1 lc rgb "#e69f00" lw 1.3 | 71 | set style line 7 lt 1 lc rgb "#e69f00" lw 1.3 |
3027 | 73 | set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3) | 72 | set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3) |
3028 | 74 | set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3) | 73 | set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3) |
3029 | 75 | set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2) | 74 | set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2) |
3030 | 76 | set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1) | 75 | set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1) |
3031 | 77 | set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3) | 76 | set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3) |
3032 | 78 | 77 | ||
3033 | 79 | set style line 8 lt 1 lc rgb "black" lw 1.3 | 78 | set style line 8 lt 1 lc rgb "black" lw 1.3 |
3034 | 80 | set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3) | 79 | set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3) |
3035 | 81 | set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3) | 80 | set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3) |
3036 | 82 | set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2) | 81 | set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2) |
3037 | 83 | set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1) | 82 | set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1) |
3038 | 84 | set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3) | 83 | set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3) |
3039 | 85 | 84 | ||
3040 | 86 | 85 | ||
3041 | 87 | set style line 999 lt 1 lc rgb "gray" lw 1.3 | 86 | set style line 999 lt 1 lc rgb "gray" lw 1.3 |
3042 | 88 | 87 | ||
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 | 26 | # color-blind individuals with either protanopia or deuteranopia. Bang | 26 | # color-blind individuals with either protanopia or deuteranopia. Bang |
3048 | 27 | # Wong [2011] Nature Methods 8, 441. | 27 | # Wong [2011] Nature Methods 8, 441. |
3049 | 28 | 28 | ||
3051 | 29 | set style line 1 lt 1 lc rgb "#009e73" lw 1.3 | 29 | set style line 1 lt 1 lc rgb "#009e73" lw 1.3 |
3052 | 30 | set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3) | 30 | set style line 101 lt 1 lc rgb "#009e73" lw 1.3 dt (6,3) |
3067 | 31 | set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3) | 31 | set style line 11 lt 2 lc rgb "#009e73" lw 1.3 dt (6,3) |
3068 | 32 | set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2) | 32 | set style line 21 lt 4 lc rgb "#009e73" lw 1.3 dt (3,2) |
3069 | 33 | set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1) | 33 | set style line 31 lt 6 lc rgb "#009e73" lw 1.3 dt (2,1) |
3070 | 34 | set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3) | 34 | set style line 41 lt 8 lc rgb "#009e73" lw 1.3 dt (4,3) |
3071 | 35 | 35 | ||
3072 | 36 | set style line 2 lt 1 lc rgb "#0072b2" lw 1.3 | 36 | set style line 2 lt 1 lc rgb "#0072b2" lw 1.3 |
3073 | 37 | set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3) | 37 | set style line 102 lt 1 lc rgb "#0072b2" lw 1.3 dt (6,3) |
3074 | 38 | set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3) | 38 | set style line 12 lt 2 lc rgb "#0072b2" lw 1.3 dt (6,3) |
3075 | 39 | set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2) | 39 | set style line 22 lt 4 lc rgb "#0072b2" lw 1.3 dt (3,2) |
3076 | 40 | set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1) | 40 | set style line 32 lt 6 lc rgb "#0072b2" lw 1.3 dt (2,1) |
3077 | 41 | set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3) | 41 | set style line 42 lt 8 lc rgb "#0072b2" lw 1.3 dt (4,3) |
3078 | 42 | 42 | ||
3079 | 43 | 43 | set style line 3 lt 1 lc rgb "#d55e00" lw 1.3 | |
3066 | 44 | set style line 3 lt 1 lc rgb "#d55e00" lw 1.3 | ||
3080 | 45 | set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3) | 44 | set style line 103 lt 1 lc rgb "#d55e00" lw 1.3 dt (6,3) |
3120 | 46 | set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3) | 45 | set style line 13 lt 2 lc rgb "#d55e00" lw 1.3 dt (6,3) |
3121 | 47 | set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2) | 46 | set style line 23 lt 4 lc rgb "#d55e00" lw 1.3 dt (3,2) |
3122 | 48 | set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1) | 47 | set style line 33 lt 6 lc rgb "#d55e00" lw 1.3 dt (2,1) |
3123 | 49 | set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3) | 48 | set style line 43 lt 8 lc rgb "#d55e00" lw 1.3 dt (4,3) |
3124 | 50 | 49 | ||
3125 | 51 | set style line 4 lt 1 lc rgb "#f0e442" lw 1.3 | 50 | set style line 4 lt 1 lc rgb "#f0e442" lw 1.3 |
3126 | 52 | set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3) | 51 | set style line 104 lt 1 lc rgb "#f0e442" lw 1.3 dt (6,3) |
3127 | 53 | set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3) | 52 | set style line 14 lt 2 lc rgb "#f0e442" lw 1.3 dt (6,3) |
3128 | 54 | set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2) | 53 | set style line 24 lt 4 lc rgb "#f0e442" lw 1.3 dt (3,2) |
3129 | 55 | set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1) | 54 | set style line 34 lt 6 lc rgb "#f0e442" lw 1.3 dt (2,1) |
3130 | 56 | set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3) | 55 | set style line 44 lt 8 lc rgb "#f0e442" lw 1.3 dt (4,3) |
3131 | 57 | 56 | ||
3132 | 58 | set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3 | 57 | set style line 5 lt 1 lc rgb "#56b4e9" lw 1.3 |
3133 | 59 | set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3) | 58 | set style line 105 lt 1 lc rgb "#56b4e9" lw 1.3 dt (6,3) |
3134 | 60 | set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3) | 59 | set style line 15 lt 2 lc rgb "#56b4e9" lw 1.3 dt (6,3) |
3135 | 61 | set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2) | 60 | set style line 25 lt 4 lc rgb "#56b4e9" lw 1.3 dt (3,2) |
3136 | 62 | set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1) | 61 | set style line 35 lt 6 lc rgb "#56b4e9" lw 1.3 dt (2,1) |
3137 | 63 | set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3) | 62 | set style line 45 lt 8 lc rgb "#56b4e9" lw 1.3 dt (4,3) |
3138 | 64 | 63 | ||
3139 | 65 | set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3 | 64 | set style line 6 lt 1 lc rgb "#cc79a7" lw 1.3 |
3140 | 66 | set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3) | 65 | set style line 106 lt 1 lc rgb "#cc79a7" lw 1.3 dt (6,3) |
3141 | 67 | set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3) | 66 | set style line 16 lt 2 lc rgb "#cc79a7" lw 1.3 dt (6,3) |
3142 | 68 | set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2) | 67 | set style line 26 lt 4 lc rgb "#cc79a7" lw 1.3 dt (3,2) |
3143 | 69 | set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1) | 68 | set style line 36 lt 6 lc rgb "#cc79a7" lw 1.3 dt (2,1) |
3144 | 70 | set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3) | 69 | set style line 46 lt 8 lc rgb "#cc79a7" lw 1.3 dt (4,3) |
3145 | 71 | 70 | ||
3146 | 72 | set style line 7 lt 1 lc rgb "#e69f00" lw 1.3 | 71 | set style line 7 lt 1 lc rgb "#e69f00" lw 1.3 |
3147 | 73 | set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3) | 72 | set style line 107 lt 1 lc rgb "#e69f00" lw 1.3 dt (6,3) |
3148 | 74 | set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3) | 73 | set style line 17 lt 2 lc rgb "#e69f00" lw 1.3 dt (6,3) |
3149 | 75 | set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2) | 74 | set style line 27 lt 4 lc rgb "#e69f00" lw 1.3 dt (3,2) |
3150 | 76 | set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1) | 75 | set style line 37 lt 6 lc rgb "#e69f00" lw 1.3 dt (2,1) |
3151 | 77 | set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3) | 76 | set style line 47 lt 8 lc rgb "#e69f00" lw 1.3 dt (4,3) |
3152 | 78 | 77 | ||
3153 | 79 | set style line 8 lt 1 lc rgb "black" lw 1.3 | 78 | set style line 8 lt 1 lc rgb "black" lw 1.3 |
3154 | 80 | set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3) | 79 | set style line 108 lt 1 lc rgb "black" lw 1.3 dt (6,3) |
3155 | 81 | set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3) | 80 | set style line 18 lt 2 lc rgb "black" lw 1.3 dt (6,3) |
3156 | 82 | set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2) | 81 | set style line 28 lt 4 lc rgb "black" lw 1.3 dt (3,2) |
3157 | 83 | set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1) | 82 | set style line 38 lt 6 lc rgb "black" lw 1.3 dt (2,1) |
3158 | 84 | set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3) | 83 | set style line 48 lt 8 lc rgb "black" lw 1.3 dt (4,3) |
3159 | 85 | 84 | ||
3160 | 86 | 85 | ||
3161 | 87 | set style line 999 lt 1 lc rgb "gray" lw 1.3 | 86 | set style line 999 lt 1 lc rgb "gray" lw 1.3 |
3162 | 88 | 87 | ||
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 | 1 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasDiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000161170959473 | 1 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasDiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000161170959473 |
3169 | 2 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_madweight_card>]> 0.015398979187 | 2 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464 |
3170 | 3 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_add>]> 0.0435810089111 | 3 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_add>]> 0.0435810089111 |
3171 | 4 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_remove_line>]> 8.89301300049e-05 | 4 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_remove_line>]> 8.89301300049e-05 |
3172 | 5 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_get_length>]> 0.000235080718994 | 5 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_get_length>]> 0.000235080718994 |
3173 | @@ -45,16 +45,17 @@ | |||
3174 | 45 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_gg_ng>]> 1.61963582039 | 45 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_gg_ng>]> 1.61963582039 |
3175 | 46 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sm>]> 6.53617286682 | 46 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sm>]> 6.53617286682 |
3176 | 47 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_put_parameters_to_zero>]> 0.0871658325195 | 47 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_put_parameters_to_zero>]> 0.0871658325195 |
3177 | 48 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000128984451294 | ||
3178 | 49 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_InvalidCmd>]> 0.300333976746 | 48 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_InvalidCmd>]> 0.300333976746 |
3179 | 50 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order3>]> 0.0537929534912 | 49 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order3>]> 0.0537929534912 |
3180 | 51 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_python>]> 0.000648021697998 | 50 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_python>]> 0.000648021697998 |
3181 | 52 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_generate>]> 0.143531084061 | 51 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_generate>]> 0.143531084061 |
3182 | 52 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_float_handling>]> 0.000519990921021 | ||
3183 | 53 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOTestMadLoopSquaredOrdersExport testMethod=testIO_ProcOutputIOTests>]> 5.7862739563 | 53 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOTestMadLoopSquaredOrdersExport testMethod=testIO_ProcOutputIOTests>]> 5.7862739563 |
3184 | 54 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_part_antipart_after_output>]> 0.00266885757446 | 54 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_part_antipart_after_output>]> 0.00266885757446 |
3185 | 55 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_four_fermion_vertex_normal_fermion_flow>]> 0.0366899967194 | 55 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_four_fermion_vertex_normal_fermion_flow>]> 0.0366899967194 |
3186 | 56 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_epem_elpelmepem>]> 0.0915629863739 | 56 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_epem_elpelmepem>]> 0.0915629863739 |
3187 | 57 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFVC>]> 0.0635468959808 | 57 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFVC>]> 0.0635468959808 |
3188 | 58 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_identify_particle>]> 0.0015971660614 | ||
3189 | 58 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_group_channels2amplitudes>]> 0.346367835999 | 59 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_group_channels2amplitudes>]> 0.346367835999 |
3190 | 59 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_wmdxu>]> 27.2295429707 | 60 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_wmdxu>]> 27.2295429707 |
3191 | 60 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_file_writers.FortranWriterTest testMethod=test_write_fortran_error>]> 0.000140190124512 | 61 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_file_writers.FortranWriterTest testMethod=test_write_fortran_error>]> 0.000140190124512 |
3192 | @@ -65,7 +66,6 @@ | |||
3193 | 65 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_decay_chain_pp_jj>]> 0.284907102585 | 66 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_decay_chain_pp_jj>]> 0.284907102585 |
3194 | 66 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_particle>]> 0.000303030014038 | 67 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_particle>]> 0.000303030014038 |
3195 | 67 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.00014591217041 | 68 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.00014591217041 |
3196 | 68 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_complex_mass_scheme>]> 0.095272064209 | ||
3197 | 69 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_matrix_element_fks_EW>]> 4.6968460083e-05 | 69 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_matrix_element_fks_EW>]> 4.6968460083e-05 |
3198 | 70 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_e_e_collision>]> 36.1715919971 | 70 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_e_e_collision>]> 36.1715919971 |
3199 | 71 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_f_d_product>]> 0.00230002403259 | 71 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_f_d_product>]> 0.00230002403259 |
3200 | @@ -136,6 +136,7 @@ | |||
3201 | 136 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_emep_emep>]> 0.00920605659485 | 136 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_emep_emep>]> 0.00920605659485 |
3202 | 137 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_decay_chains>]> 0.378351926804 | 137 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_decay_chains>]> 0.378351926804 |
3203 | 138 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_color_flow_string>]> 0.00816702842712 | 138 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_color_flow_string>]> 0.00816702842712 |
3204 | 139 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_particle_list>]> 0.000241994857788 | ||
3205 | 139 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_part_spin32propagator>]> 0.0205278396606 | 140 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_part_spin32propagator>]> 0.0205278396606 |
3206 | 140 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.TestMadWeight testMethod=test_mw_wproduction>]> 11.4712297916 | 141 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.TestMadWeight testMethod=test_mw_wproduction>]> 11.4712297916 |
3207 | 141 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_decayBW_file_EW>]> 0.00243401527405 | 142 | <__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 | 166 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_replace_indices>]> 0.000101089477539 | 167 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_replace_indices>]> 0.000101089477539 |
3210 | 167 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestImportUFO testMethod=test_simple_import>]> 0.130714893341 | 168 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestImportUFO testMethod=test_simple_import>]> 0.130714893341 |
3211 | 168 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_jet_veto_xsec>]> 49.1917068958 | 169 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_jet_veto_xsec>]> 49.1917068958 |
3212 | 169 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_Plorentz>]> 0.0777571201324 | ||
3213 | 170 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.ProcCardV4ReaderTest testMethod=test_check_init>]> 0.0175278186798 | 170 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.ProcCardV4ReaderTest testMethod=test_check_init>]> 0.0175278186798 |
3214 | 171 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_uu_to_tt_sch>]> 0.152179956436 | 171 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_uu_to_tt_sch>]> 0.152179956436 |
3215 | 172 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWrapped>]> 0.00549483299255 | 172 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWrapped>]> 0.00549483299255 |
3216 | 173 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization5>]> 0.000308036804199 | 173 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization5>]> 0.000308036804199 |
3217 | 174 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_get_final_state_particle>]> 0.134166002274 | 174 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_get_final_state_particle>]> 0.134166002274 |
3218 | 175 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gd_ggd>]> 0.405319929123 | 175 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gd_ggd>]> 0.405319929123 |
3219 | 176 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=test_obj_are_not_modified>]> 0.000224113464355 | ||
3220 | 177 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_decay_chain_and_fermion_flow>]> 0.0173728466034 | 176 | <__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 | 178 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_decay_chain>]> 0.0154418945312 | 177 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_decay_chain>]> 0.0154418945312 |
3222 | 179 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_vertex_at_level>]> 0.00156879425049 | 178 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_vertex_at_level>]> 0.00156879425049 |
3223 | @@ -186,7 +185,6 @@ | |||
3224 | 186 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator5>]> 0.16034078598 | 185 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator5>]> 0.16034078598 |
3225 | 187 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massivecase>]> 0.000519037246704 | 186 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massivecase>]> 0.000519037246704 |
3226 | 188 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_lh_order>]> 0.000610113143921 | 187 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_lh_order>]> 0.000610113143921 |
3227 | 189 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testEpsilonProperty>]> 0.054888010025 | ||
3228 | 190 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gd_gd>]> 2.84897994995 | 188 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gd_gd>]> 2.84897994995 |
3229 | 191 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_representation>]> 0.389190196991 | 189 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_representation>]> 0.389190196991 |
3230 | 192 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_generate_events_shower_scripts>]> 85.5048270226 | 190 | <__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 | 198 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_ttx_wpwm_QED>]> 0.00127792358398 | 196 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_ttx_wpwm_QED>]> 0.00127792358398 |
3233 | 199 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_color_string_canonical>]> 0.000113010406494 | 197 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_color_string_canonical>]> 0.000113010406494 |
3234 | 200 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestBlock testMethod=test_block_str>]> 6.41345977783e-05 | 198 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestBlock testMethod=test_block_str>]> 6.41345977783e-05 |
3235 | 199 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_histograms.IOHistogramTest testMethod=testIO_DJR_histograms>]> 6.34016513824 | ||
3236 | 201 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_find_optimal_order>]> 0.190226793289 | 200 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_find_optimal_order>]> 0.190226793289 |
3237 | 202 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_setget_multi_leg_correct>]> 6.60419464111e-05 | ||
3238 | 203 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_creating_matched_plot>]> 59.4369688034 | 201 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_creating_matched_plot>]> 59.4369688034 |
3240 | 204 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_fortran>]> 0.0229299068451 | 202 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_full_sm_aloha>]> 1.30430817604 |
3241 | 205 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestBenchmarkModel testMethod=test_use_as_benchmark>]> 0.165615081787 | 203 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestBenchmarkModel testMethod=test_use_as_benchmark>]> 0.165615081787 |
3242 | 206 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess_add>]> 0.199738025665 | 204 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess_add>]> 0.199738025665 |
3243 | 207 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_httx>]> 33.0537629128 | 205 | <__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 | 221 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pmass_file_EW>]> 0.000478029251099 | 219 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pmass_file_EW>]> 0.000478029251099 |
3246 | 222 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_projector>]> 0.00798106193542 | 220 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_projector>]> 0.00798106193542 |
3247 | 223 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_fortranwriter_C>]> 0.0338780879974 | 221 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_fortranwriter_C>]> 0.0338780879974 |
3248 | 222 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_multiprocess>]> 0.708781957626 | ||
3249 | 224 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_ij_lines_EW>]> 0.0349681377411 | 223 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_ij_lines_EW>]> 0.0349681377411 |
3251 | 225 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_props_file_born>]> 0.00461411476135 | 224 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_F77writer_complex_mass_scheme>]> 0.0230450630188 |
3252 | 226 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_initial_setups>]> 0.125522851944 | 225 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_initial_setups>]> 0.125522851944 |
3254 | 227 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_maxconfigs>]> 0.00495791435242 | 226 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_fortran>]> 0.0229299068451 |
3255 | 228 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_max_WEIGHTED>]> 0.000354051589966 | 227 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_max_WEIGHTED>]> 0.000354051589966 |
3256 | 229 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_orders>]> 0.0471241474152 | 228 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_orders>]> 0.0471241474152 |
3257 | 230 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_6_e90>]> 96.6206810474 | 229 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_6_e90>]> 96.6206810474 |
3258 | @@ -236,10 +235,11 @@ | |||
3259 | 236 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_read_param_card>]> 2.07473993301 | 235 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_read_param_card>]> 2.07473993301 |
3260 | 237 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testGammaAlgebraDefinition>]> 1.02981591225 | 236 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testGammaAlgebraDefinition>]> 1.02981591225 |
3261 | 238 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_write_orders>]> 0.00100803375244 | 237 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_write_orders>]> 0.00100803375244 |
3263 | 239 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestExtendedCmd testMethod=test_the_exit_from_child_cmd2>]> 0.000120162963867 | 238 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_short_cross_gauge>]> 115.8441329 |
3264 | 240 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_identical_parameters>]> 0.0867898464203 | 239 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_identical_parameters>]> 0.0867898464203 |
3266 | 241 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024 | 240 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_write>]> 7.00950622559e-05 |
3267 | 242 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testequality>]> 0.000180006027222 | 241 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testequality>]> 0.000180006027222 |
3268 | 242 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_process_overall_orders>]> 0.876585006714 | ||
3269 | 243 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_begin_end_wrong_input>]> 0.000144958496094 | 243 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_begin_end_wrong_input>]> 0.000144958496094 |
3270 | 244 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_full_write>]> 0.0754480361938 | 244 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_full_write>]> 0.0754480361938 |
3271 | 245 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_sm_equivalence>]> 0.110821008682 | 245 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_sm_equivalence>]> 0.110821008682 |
3272 | @@ -248,7 +248,7 @@ | |||
3273 | 248 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization3>]> 0.000184774398804 | 248 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization3>]> 0.000184774398804 |
3274 | 249 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_sort_fks_proc>]> 0.163259029388 | 249 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_sort_fks_proc>]> 0.163259029388 |
3275 | 250 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures>]> 0.016254901886 | 250 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures>]> 0.016254901886 |
3277 | 251 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_F77writer_complex_mass_scheme>]> 0.0230450630188 | 251 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_props_file_born>]> 0.00461411476135 |
3278 | 252 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_pythia8_export_functions>]> 0.0397579669952 | 252 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_pythia8_export_functions>]> 0.0397579669952 |
3279 | 253 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_leg_list>]> 0.000253915786743 | 253 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_leg_list>]> 0.000253915786743 |
3280 | 254 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_wavefunctions testMethod=test_short_IR>]> 0.0010769367218 | 254 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_wavefunctions testMethod=test_short_IR>]> 0.0010769367218 |
3281 | @@ -258,9 +258,11 @@ | |||
3282 | 258 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order1>]> 0.0381689071655 | 258 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order1>]> 0.0381689071655 |
3283 | 259 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_8fs>]> 0.104753017426 | 259 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_8fs>]> 0.104753017426 |
3284 | 260 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_colorize_uux_ggg>]> 0.0345070362091 | 260 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_colorize_uux_ggg>]> 0.0345070362091 |
3285 | 261 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_maxconfigs>]> 0.00495791435242 | ||
3286 | 261 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_matrix_element_v4_standalone>]> 0.0386159420013 | 262 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_matrix_element_v4_standalone>]> 0.0386159420013 |
3287 | 262 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter>]> 0.0264060497284 | 263 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter>]> 0.0264060497284 |
3288 | 263 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_complete_decay_chain_process>]> 0.748803853989 | 264 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_complete_decay_chain_process>]> 0.748803853989 |
3289 | 265 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322 | ||
3290 | 264 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_split>]> 85.3567028046 | 266 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_split>]> 85.3567028046 |
3291 | 265 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_horizontal_mode>]> 0.00118708610535 | 267 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_horizontal_mode>]> 0.00118708610535 |
3292 | 266 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm_nobmass>]> 0.0748410224915 | 268 | <__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 | 278 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.Testmadweight testMethod=test_tt_semi>]> 8.710709095 | 280 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.Testmadweight testMethod=test_tt_semi>]> 8.710709095 |
3295 | 279 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddmult>]> 0.000133991241455 | 281 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddmult>]> 0.000133991241455 |
3296 | 280 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_add_external_parameters>]> 0.000850200653076 | 282 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_add_external_parameters>]> 0.000850200653076 |
3297 | 281 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct_MP>]> 0.0654561519623 | ||
3298 | 282 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_ddx_uux>]> 1.11160707474 | 283 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_ddx_uux>]> 1.11160707474 |
3299 | 283 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gg_wpwmttx>]> 1.00893592834 | 284 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gg_wpwmttx>]> 1.00893592834 |
3300 | 285 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_values_for_prop>]> 0.000379085540771 | ||
3301 | 284 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_param_card>]> 0.0154800415039 | 286 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_param_card>]> 0.0154800415039 |
3302 | 285 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testmassisdiffaswidth>]> 0.000320911407471 | 287 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testmassisdiffaswidth>]> 0.000320911407471 |
3303 | 286 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_shell_string>]> 0.000377893447876 | 288 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_shell_string>]> 0.000377893447876 |
3304 | @@ -318,8 +320,9 @@ | |||
3305 | 318 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_expand_veto>]> 0.00188112258911 | 320 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_expand_veto>]> 0.00188112258911 |
3306 | 319 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_dec_multiprocess_files>]> 0.481742143631 | 321 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_dec_multiprocess_files>]> 0.481742143631 |
3307 | 320 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_amcatnlo_from_file>]> 71.3001720905 | 322 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_amcatnlo_from_file>]> 71.3001720905 |
3308 | 323 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.TestIdentifyMETag testMethod=test_identify_me_tag_qq_qqg>]> 0.144216060638 | ||
3309 | 321 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization>]> 0.000678062438965 | 324 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization>]> 0.000678062438965 |
3311 | 322 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_process_overall_orders>]> 0.876585006714 | 325 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_complex_mass_scheme>]> 0.095272064209 |
3312 | 323 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_identical_parameters>]> 0.0875990390778 | 326 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_identical_parameters>]> 0.0875990390778 |
3313 | 324 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_phi4_vertex>]> 0.000259876251221 | 327 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_phi4_vertex>]> 0.000259876251221 |
3314 | 325 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_dictionaries>]> 0.000564098358154 | 328 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_dictionaries>]> 0.000564098358154 |
3315 | @@ -336,17 +339,16 @@ | |||
3316 | 336 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_parity_for_epsilon>]> 0.000375032424927 | 339 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_parity_for_epsilon>]> 0.000375032424927 |
3317 | 337 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pdf_wrapper_EW>]> 0.0362520217896 | 340 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pdf_wrapper_EW>]> 0.0362520217896 |
3318 | 338 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_fermion_flow_clash>]> 0.034786939621 | 341 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_fermion_flow_clash>]> 0.034786939621 |
3320 | 339 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_short_cross_gauge>]> 115.8441329 | 342 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestExtendedCmd testMethod=test_the_exit_from_child_cmd2>]> 0.000120162963867 |
3321 | 340 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_Cppwriter_C>]> 0.034628868103 | 343 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_Cppwriter_C>]> 0.034628868103 |
3322 | 341 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_nlo_hw6_split>]> 93.4157910347 | 344 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_nlo_hw6_split>]> 93.4157910347 |
3323 | 342 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000109910964966 | 345 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000109910964966 |
3324 | 343 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_leshouche_info_file_EW>]> 0.0766789913177 | 346 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_leshouche_info_file_EW>]> 0.0766789913177 |
3325 | 344 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testConjugateOperator>]> 0.0886290073395 | 347 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testConjugateOperator>]> 0.0886290073395 |
3328 | 345 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.000133991241455 | 348 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000128984451294 |
3329 | 346 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_multiprocess>]> 0.708781957626 | 349 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_madweight_card>]> 0.015398979187 |
3330 | 347 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_decay_chain>]> 8.23388409615 | 350 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_decay_chain>]> 8.23388409615 |
3331 | 348 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uxu_zz_QCD>]> 0.00123119354248 | 351 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uxu_zz_QCD>]> 0.00123119354248 |
3332 | 349 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_complex_equality>]> 0.453453063965 | ||
3333 | 350 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_FFVC>]> 0.0554978847504 | 352 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_FFVC>]> 0.0554978847504 |
3334 | 351 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_setget_channel>]> 0.227739095688 | 353 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_setget_channel>]> 0.227739095688 |
3335 | 352 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py6_analyse>]> 0.000179052352905 | 354 | <__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 | 363 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_getsetvertexlist_exceptions>]> 0.110853910446 | 365 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_getsetvertexlist_exceptions>]> 0.110853910446 |
3338 | 364 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_generate_events_nlo_py6pt_fsr>]> 40.1788899899 | 366 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_generate_events_nlo_py6pt_fsr>]> 40.1788899899 |
3339 | 365 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_make_valid>]> 0.00246596336365 | 367 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_make_valid>]> 0.00246596336365 |
3340 | 366 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00015115737915 | ||
3341 | 367 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFV2C1>]> 0.00976991653442 | 368 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFV2C1>]> 0.00976991653442 |
3342 | 368 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_standalone_cpp_output_consistency>]> 16.2466862202 | 369 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_standalone_cpp_output_consistency>]> 16.2466862202 |
3343 | 369 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_uuxa_QCD_QED>]> 0.00129103660583 | 370 | <__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 | 373 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.TestDiagramTag testMethod=test_diagram_tag_to_diagram_uux_nglue>]> 0.129276990891 | 374 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.TestDiagramTag testMethod=test_diagram_tag_to_diagram_uux_nglue>]> 0.129276990891 |
3346 | 374 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_jet_veto_xsec>]> 61.7360379696 | 375 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_jet_veto_xsec>]> 61.7360379696 |
3347 | 375 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_epem_aaa>]> 0.317636966705 | 376 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_epem_aaa>]> 0.317636966705 |
3349 | 376 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_generating_dict_to_0>]> 0.000486850738525 | 377 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_change_number_format_python>]> 0.000586986541748 |
3350 | 377 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.HelasModelTest testMethod=test_set_wavefunctions>]> 0.00166797637939 | 378 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.HelasModelTest testMethod=test_set_wavefunctions>]> 0.00166797637939 |
3351 | 378 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T6_simplify>]> 0.00021505355835 | 379 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T6_simplify>]> 0.00021505355835 |
3352 | 379 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=test_short_obj_are_not_modified>]> 0.000195980072021 | 380 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=test_short_obj_are_not_modified>]> 0.000195980072021 |
3353 | @@ -383,9 +384,11 @@ | |||
3354 | 383 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_config_iadd>]> 9.70363616943e-05 | 384 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_config_iadd>]> 9.70363616943e-05 |
3355 | 384 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasintersection>]> 0.00135803222656 | 385 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasintersection>]> 0.00135803222656 |
3356 | 385 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hhh_EW>]> 179.770503998 | 386 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hhh_EW>]> 179.770503998 |
3357 | 387 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_zzz>]> 28.6060318947 | ||
3358 | 386 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_load_feynman>]> 0.416143894196 | 388 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_load_feynman>]> 0.416143894196 |
3359 | 387 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_handling_list_of_values>]> 0.000817060470581 | 389 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_handling_list_of_values>]> 0.000817060470581 |
3360 | 388 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_check_eejjj_lo_lhapdf>]> 63.6095659733 | 390 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_check_eejjj_lo_lhapdf>]> 63.6095659733 |
3361 | 391 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000134944915771 | ||
3362 | 389 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_4_e500>]> 21.2130401134 | 392 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_4_e500>]> 21.2130401134 |
3363 | 390 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestBenchmarkModel testMethod=test_model_name>]> 0.19921207428 | 393 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestBenchmarkModel testMethod=test_model_name>]> 0.19921207428 |
3364 | 391 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000181913375854 | 394 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000181913375854 |
3365 | @@ -406,7 +409,6 @@ | |||
3366 | 406 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_findchannels>]> 8.38987207413 | 409 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_findchannels>]> 8.38987207413 |
3367 | 407 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummulvar>]> 0.000131845474243 | 410 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummulvar>]> 0.000131845474243 |
3368 | 408 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_singletop_fastjet>]> 140.989368916 | 411 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_singletop_fastjet>]> 140.989368916 |
3369 | 409 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_find_symmetry_uu_tt_with_subprocess_group>]> 0.0958831310272 | ||
3370 | 410 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection_failure>]> 0.000155925750732 | 412 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection_failure>]> 0.000155925750732 |
3371 | 411 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_mssm_subset_creation>]> 0.190835952759 | 413 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_mssm_subset_creation>]> 0.190835952759 |
3372 | 412 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_process>]> 1.05374503136 | 414 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_comparison_for_process>]> 1.05374503136 |
3373 | @@ -424,7 +426,7 @@ | |||
3374 | 424 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_VVS1>]> 0.028205871582 | 426 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_VVS1>]> 0.028205871582 |
3375 | 425 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_restrict_from_a_param_card>]> 0.106390953064 | 427 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_restrict_from_a_param_card>]> 0.106390953064 |
3376 | 426 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.TestFKSOutput testMethod=test_w_nlo_gen>]> 0.38791513443 | 428 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.TestFKSOutput testMethod=test_w_nlo_gen>]> 0.38791513443 |
3378 | 427 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_multidiagram_decay_chains>]> 0.431716918945 | 429 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_heft>]> 10.1859381199 |
3379 | 428 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_color_links>]> 0.00164699554443 | 430 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_color_links>]> 0.00164699554443 |
3380 | 429 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testdealingwithpower3>]> 0.0140371322632 | 431 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testdealingwithpower3>]> 0.0140371322632 |
3381 | 430 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_hh_hh_QED>]> 0.00143194198608 | 432 | <__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 | 468 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=test_power>]> 0.000131845474243 | 470 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=test_power>]> 0.000131845474243 |
3384 | 469 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarmult>]> 9.3936920166e-05 | 471 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarmult>]> 9.3936920166e-05 |
3385 | 470 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_aa_ttxa_QED>]> 0.00152993202209 | 472 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_aa_ttxa_QED>]> 0.00152993202209 |
3386 | 473 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_loop_induced>]> 50.1276230812 | ||
3387 | 471 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_VVS>]> 0.0257358551025 | 474 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_VVS>]> 0.0257358551025 |
3388 | 472 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domainintersection>]> 0.000596046447754 | 475 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domainintersection>]> 0.000596046447754 |
3389 | 473 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_group_subprocs_and_get_diagram_maps>]> 0.33548283577 | 476 | <__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 | 491 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_timing_epem_ttx>]> 14.4036149979 | 494 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_timing_epem_ttx>]> 14.4036149979 |
3392 | 492 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.LoopDiagramDrawerTest testMethod=test_fuse_line>]> 0.00980591773987 | 495 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.LoopDiagramDrawerTest testMethod=test_fuse_line>]> 0.00980591773987 |
3393 | 493 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_dxuhuuuxdx_guhuuux>]> 1.06607508659 | 496 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_dxuhuuuxdx_guhuuux>]> 1.06607508659 |
3395 | 494 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_histograms.IOHistogramTest testMethod=testIO_DJR_histograms>]> 6.34016513824 | 497 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.000133991241455 |
3396 | 495 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_den_factor_lines_EW>]> 2.82828497887 | 498 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_den_factor_lines_EW>]> 2.82828497887 |
3397 | 496 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell1 testMethod=test_import_model>]> 0.106930971146 | 499 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell1 testMethod=test_import_model>]> 0.106930971146 |
3398 | 497 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testgetrepresentation>]> 0.002366065979 | 500 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testgetrepresentation>]> 0.002366065979 |
3399 | @@ -507,6 +510,7 @@ | |||
3400 | 507 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_ij_lines>]> 0.0146369934082 | 510 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_ij_lines>]> 0.0146369934082 |
3401 | 508 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testmultvarMult>]> 0.000117063522339 | 511 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testmultvarMult>]> 0.000117063522339 |
3402 | 509 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_oneloop_reweighting>]> 0.519333124161 | 512 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_oneloop_reweighting>]> 0.519333124161 |
3403 | 513 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_integer_handling>]> 0.00176501274109 | ||
3404 | 510 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_find_reals>]> 0.0384328365326 | 514 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_find_reals>]> 0.0384328365326 |
3405 | 511 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.security_issue.TestSecurity testMethod=test_security_scan>]> 0.276997804642 | 515 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.security_issue.TestSecurity testMethod=test_security_scan>]> 0.276997804642 |
3406 | 512 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.010556936264 | 516 | <__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 | 518 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testbasicoperation>]> 0.000247955322266 | 522 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testbasicoperation>]> 0.000247955322266 |
3409 | 519 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_get_proc_with_decay_NLO>]> 0.584362983704 | 523 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_get_proc_with_decay_NLO>]> 0.584362983704 |
3410 | 520 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm2>]> 23.508852005 | 524 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm2>]> 23.508852005 |
3411 | 521 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_delta6_simplify>]> 8.51154327393e-05 | ||
3412 | 522 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_sign_flips_to_order>]> 8.08238983154e-05 | 525 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_sign_flips_to_order>]> 8.08238983154e-05 |
3413 | 523 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_Fortranwriter_spin3half>]> 0.154531002045 | 526 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_Fortranwriter_spin3half>]> 0.154531002045 |
3414 | 524 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_wa_refine>]> 11.0905270576 | 527 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_wa_refine>]> 11.0905270576 |
3415 | 525 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_cpp>]> 0.000547170639038 | 528 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_cpp>]> 0.000547170639038 |
3417 | 526 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fksreal>]> 13.9149849415 | 529 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00015115737915 |
3418 | 527 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_nfksconfigs_file>]> 0.0158369541168 | 530 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_nfksconfigs_file>]> 0.0158369541168 |
3419 | 528 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_ref_dict_multiple_interactions>]> 0.000741004943848 | 531 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_ref_dict_multiple_interactions>]> 0.000741004943848 |
3420 | 529 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=test_short_power>]> 0.000148057937622 | 532 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=test_short_power>]> 0.000148057937622 |
3421 | 530 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_generate_helas_diagrams_uux_gepem_no_optimization>]> 0.0189230442047 | 533 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_generate_helas_diagrams_uux_gepem_no_optimization>]> 0.0189230442047 |
3422 | 531 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_fks_real_process_get_leg_i_j>]> 0.0138988494873 | 534 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_fks_real_process_get_leg_i_j>]> 0.0138988494873 |
3423 | 532 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_photons>]> 0.107678890228 | 535 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_photons>]> 0.107678890228 |
3424 | 536 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_dxd_gz>]> 2.18089485168 | ||
3425 | 533 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummultmul>]> 0.000133991241455 | 537 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummultmul>]> 0.000133991241455 |
3426 | 534 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hh_EW>]> 13.6150200367 | 538 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hh_EW>]> 13.6150200367 |
3427 | 535 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_amcantlo_script>]> 46.4756779671 | 539 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_amcantlo_script>]> 46.4756779671 |
3428 | 536 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_enu_enu>]> 0.008131980896 | 540 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_enu_enu>]> 0.008131980896 |
3429 | 537 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_coeff_string>]> 0.028568983078 | 541 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_coeff_string>]> 0.028568983078 |
3432 | 538 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464 | 542 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct_MP>]> 0.0654561519623 |
3431 | 539 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_mssm>]> 11.2124068737 | ||
3433 | 540 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_short_gauge_loop>]> 37.5182161331 | 543 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_short_gauge_loop>]> 37.5182161331 |
3434 | 541 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_base_amplitude>]> 0.140361070633 | 544 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_base_amplitude>]> 0.140361070633 |
3435 | 542 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_sum_object>]> 0.000658988952637 | 545 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_sum_object>]> 0.000658988952637 |
3436 | 543 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_standard>]> 3.79085540771e-05 | 546 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_standard>]> 3.79085540771e-05 |
3437 | 544 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_semi>]> 125.299013853 | 547 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_semi>]> 125.299013853 |
3438 | 545 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833 | ||
3439 | 546 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportMatchBox testMethod=test_write_match_go_process_cc_file>]> 0.0377099514008 | 548 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportMatchBox testMethod=test_write_match_go_process_cc_file>]> 0.0377099514008 |
3440 | 547 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_cpp>]> 0.0238170623779 | 549 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_cpp>]> 0.0238170623779 |
3441 | 548 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_4g_decay_chain_process>]> 0.395421028137 | 550 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_4g_decay_chain_process>]> 0.395421028137 |
3442 | 549 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_error_particle_save>]> 4.19616699219e-05 | 551 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_error_particle_save>]> 4.19616699219e-05 |
3443 | 550 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uu_susug>]> 0.0533299446106 | 552 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uu_susug>]> 0.0533299446106 |
3444 | 553 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604 | ||
3445 | 551 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_madspin_ON_and_onshell_atNLO>]> 0.381196022034 | 554 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_madspin_ON_and_onshell_atNLO>]> 0.381196022034 |
3446 | 552 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_define_order>]> 0.214026927948 | 555 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_define_order>]> 0.214026927948 |
3447 | 553 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_python_routine_are_exec>]> 0.00516891479492 | 556 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_python_routine_are_exec>]> 0.00516891479492 |
3449 | 554 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_gg_ggg>]> 0.128249883652 | 557 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection>]> 0.000416040420532 |
3450 | 555 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_histograms.IOTest_Histogram testMethod=testIO_gnuplot_histo_output>]> 0.224948883057 | 558 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_histograms.IOTest_Histogram testMethod=testIO_gnuplot_histo_output>]> 0.224948883057 |
3451 | 556 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF3>]> 0.325031042099 | 559 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF3>]> 0.325031042099 |
3452 | 557 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_reweighting_comb>]> 7.06551980972 | 560 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_reweighting_comb>]> 7.06551980972 |
3453 | 558 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_get_max_level>]> 0.132587909698 | 561 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_get_max_level>]> 0.132587909698 |
3455 | 559 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_isexternal>]> 0.000101089477539 | 562 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_fermion_flow>]> 0.00178098678589 |
3456 | 560 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hwpp>]> 0.000180959701538 | 563 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hwpp>]> 0.000180959701538 |
3457 | 561 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj>]> 0.145397901535 | 564 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj>]> 0.145397901535 |
3459 | 562 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_nogroup>]> 0.109572172165 | 565 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_ga_EW>]> 15.2475500107 |
3460 | 563 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.IOImportV4Test testMethod=test_read_particles>]> 0.000508069992065 | 566 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.IOImportV4Test testMethod=test_read_particles>]> 0.000508069992065 |
3461 | 564 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest2 testMethod=test_change_to_complex_mass_scheme>]> 0.152688980103 | 567 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest2 testMethod=test_change_to_complex_mass_scheme>]> 0.152688980103 |
3462 | 565 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_cms_aem_emvevex>]> 0.289308071136 | 568 | <__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 | 582 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_epem_ddx>]> 0.67814207077 | 585 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_epem_ddx>]> 0.67814207077 |
3465 | 583 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madevent.test_combine_runs.TestCombineRuns testMethod=test_get_fortran_str>]> 0.000144004821777 | 586 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madevent.test_combine_runs.TestCombineRuns testMethod=test_get_fortran_str>]> 0.000144004821777 |
3466 | 584 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_udx_htbx>]> 12.6998720169 | 587 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_udx_htbx>]> 12.6998720169 |
3468 | 585 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_link_gghgg_gghg>]> 0.115737915039 | 588 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_ppgogo_amcatnlo_nlo>]> 56.4734661579 |
3469 | 586 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWWW>]> 0.0192968845367 | 589 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWWW>]> 0.0192968845367 |
3471 | 587 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_reweighting>]> 15.5831661224 | 590 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116 |
3472 | 588 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_for_loop>]> 0.000102043151855 | 591 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_for_loop>]> 0.000102043151855 |
3473 | 589 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator4>]> 0.025171995163 | 592 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator4>]> 0.025171995163 |
3474 | 590 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_FO_analyse_card.TestFOAnalyseCard testMethod=test_analyse_card_analyse>]> 0.000509977340698 | 593 | <__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 | 609 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_uuddg_uudd>]> 0.0242109298706 | 612 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_uuddg_uudd>]> 0.0242109298706 |
3477 | 610 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_representation>]> 0.00148892402649 | 613 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_representation>]> 0.00148892402649 |
3478 | 611 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF>]> 0.00619888305664 | 614 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF>]> 0.00619888305664 |
3480 | 612 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_gg_gogog_QCD>]> 258.932424068 | 615 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_complex_equality>]> 0.453453063965 |
3481 | 613 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_gg_ggg>]> 0.137652873993 | 616 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_gg_ggg>]> 0.137652873993 |
3482 | 614 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization4>]> 0.000862836837769 | 617 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization4>]> 0.000862836837769 |
3483 | 615 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_expand_list>]> 0.00167798995972 | 618 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_expand_list>]> 0.00167798995972 |
3484 | @@ -617,7 +620,7 @@ | |||
3485 | 617 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testEinsteinsum>]> 0.00415802001953 | 620 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=testEinsteinsum>]> 0.00415802001953 |
3486 | 618 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_epem_EW>]> 7.10565686226 | 621 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_epem_EW>]> 7.10565686226 |
3487 | 619 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_histograms.TestHistograms testMethod=test_histograms_operations>]> 0.181525945663 | 622 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_histograms.TestHistograms testMethod=test_histograms_operations>]> 0.181525945663 |
3489 | 620 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00219416618347 | 623 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419 |
3490 | 621 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sqso1>]> 0.000553131103516 | 624 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sqso1>]> 0.000553131103516 |
3491 | 622 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testtensorialproductspin>]> 0.070338010788 | 625 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testtensorialproductspin>]> 0.070338010788 |
3492 | 623 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_shower_scripts>]> 107.744693995 | 626 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_shower_scripts>]> 107.744693995 |
3493 | @@ -634,13 +637,13 @@ | |||
3494 | 634 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_setget_process_exceptions>]> 0.000452041625977 | 637 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_setget_process_exceptions>]> 0.000452041625977 |
3495 | 635 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.ExportUFOModelPythia8Test testMethod=test_write_pythia8_parameter_files>]> 0.082643032074 | 638 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.ExportUFOModelPythia8Test testMethod=test_write_pythia8_parameter_files>]> 0.082643032074 |
3496 | 636 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasordinate>]> 0.00022292137146 | 639 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasordinate>]> 0.00022292137146 |
3498 | 637 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_change_number_format_python>]> 0.000586986541748 | 640 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_generating_dict_to_0>]> 0.000486850738525 |
3499 | 638 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvaradd>]> 9.3936920166e-05 | 641 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvaradd>]> 9.3936920166e-05 |
3500 | 639 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator3>]> 0.0580358505249 | 642 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator3>]> 0.0580358505249 |
3501 | 640 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_model_initialization>]> 0.000297069549561 | 643 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_model_initialization>]> 0.000297069549561 |
3502 | 641 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_has_symmetries>]> 0.000720024108887 | 644 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_has_symmetries>]> 0.000720024108887 |
3503 | 642 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testlistindices>]> 0.00581979751587 | 645 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testlistindices>]> 0.00581979751587 |
3505 | 643 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322 | 646 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestSchannelModels testMethod=test_find_symmetry_uu_tt_with_subprocess_group>]> 0.0958831310272 |
3506 | 644 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_ufo_aloha>]> 1.4953649044 | 647 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_ufo_aloha>]> 1.4953649044 |
3507 | 645 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_py6_stdhep>]> 107.259223938 | 648 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_py6_stdhep>]> 107.259223938 |
3508 | 646 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_decaytable_string>]> 0.357012033463 | 649 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_decaytable_string>]> 0.357012033463 |
3509 | @@ -655,7 +658,6 @@ | |||
3510 | 655 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_power>]> 0.000319957733154 | 658 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_power>]> 0.000319957733154 |
3511 | 656 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_set>]> 45.5628159046 | 659 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_set>]> 45.5628159046 |
3512 | 657 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0103709697723 | 660 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0103709697723 |
3513 | 658 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116 | ||
3514 | 659 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_born_fks>]> 0.057590007782 | 661 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_born_fks>]> 0.057590007782 |
3515 | 660 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups>]> 7.51800894737 | 662 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups>]> 7.51800894737 |
3516 | 661 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_uux_ddx>]> 2.72820210457 | 663 | <__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 | 679 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_ML5EW_gg_ttxh_QCD>]> 0.000695943832397 | 681 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_ML5EW_gg_ttxh_QCD>]> 0.000695943832397 |
3519 | 680 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hwpp_analyse>]> 0.000179052352905 | 682 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hwpp_analyse>]> 0.000179052352905 |
3520 | 681 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSProcess_gggg>]> 0.369121789932 | 683 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSProcess_gggg>]> 0.369121789932 |
3522 | 682 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_Fortranwriter_spin3half>]> 0.141327142715 | 684 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_gg_gogog_QCD>]> 258.932424068 |
3523 | 683 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_calculate_xsect_script>]> 54.8990449905 | 685 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_calculate_xsect_script>]> 54.8990449905 |
3524 | 684 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_add_std_diagram>]> 0.336571931839 | 686 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_add_std_diagram>]> 0.336571931839 |
3525 | 685 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_non_integer_external>]> 0.000808000564575 | 687 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_non_integer_external>]> 0.000808000564575 |
3526 | @@ -690,10 +692,10 @@ | |||
3527 | 690 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_hw6_set>]> 102.896171808 | 692 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_hw6_set>]> 102.896171808 |
3528 | 691 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_helas_diagrams_gg_gogo_go_tt1x_t_wpb>]> 0.0463981628418 | 693 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_helas_diagrams_gg_gogo_go_tt1x_t_wpb>]> 0.0463981628418 |
3529 | 692 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_find_vertexlist>]> 0.113565921783 | 694 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_find_vertexlist>]> 0.113565921783 |
3531 | 693 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_heft_multiparticle_pp_hnj>]> 0.326533079147 | 695 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_ga_QCD_QED>]> 0.00132417678833 |
3532 | 694 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_save_load>]> 1.68547606468 | 696 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_save_load>]> 1.68547606468 |
3533 | 695 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testemptyisFalse>]> 6.60419464111e-05 | 697 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testemptyisFalse>]> 6.60419464111e-05 |
3535 | 696 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604 | 698 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_special_parameters>]> 0.0848360061646 |
3536 | 697 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_coeff_string>]> 0.0342230796814 | 699 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_coeff_string>]> 0.0342230796814 |
3537 | 698 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_script>]> 30.6620099545 | 700 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_script>]> 30.6620099545 |
3538 | 699 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_13>]> 41.2373769283 | 701 | <__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 | 701 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_attx>]> 40.257420063 | 703 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_attx>]> 40.257420063 |
3541 | 702 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.HelasModelTest testMethod=test_setget_helas_model_error>]> 0.00156712532043 | 704 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.HelasModelTest testMethod=test_setget_helas_model_error>]> 0.00156712532043 |
3542 | 703 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testsetrepresentation>]> 0.00262403488159 | 705 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testsetrepresentation>]> 0.00262403488159 |
3543 | 704 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_export_v4.TestMadWeight testMethod=test_modification_to_cuts>]> 0.0898389816284 | ||
3544 | 705 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_no_cutting_line>]> 0.0152459144592 | 706 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_no_cutting_line>]> 0.0152459144592 |
3545 | 706 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_group_decay_chains>]> 0.305987119675 | 707 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_group_decay_chains>]> 0.305987119675 |
3546 | 707 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_regular_expression_propa>]> 0.000612020492554 | 708 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_regular_expression_propa>]> 0.000612020492554 |
3547 | 708 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_sort_proc>]> 0.0744910240173 | 709 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_sort_proc>]> 0.0744910240173 |
3549 | 709 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_full_sm_aloha>]> 1.30430817604 | 710 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_mssm>]> 11.2124068737 |
3550 | 710 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_setget_interaction_exceptions>]> 0.000231027603149 | 711 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_setget_interaction_exceptions>]> 0.000231027603149 |
3551 | 712 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_multistage_decay_chain_process>]> 0.127142906189 | ||
3552 | 711 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_launch_amcatnlo_name>]> 68.1794371605 | 713 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_launch_amcatnlo_name>]> 68.1794371605 |
3553 | 712 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_auto_handling>]> 0.000450134277344 | 714 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_auto_handling>]> 0.000450134277344 |
3554 | 713 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_za_QED>]> 0.0014591217041 | 715 | <__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 | 717 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4IOTest testMethod=testIO_export_matrix_element_v4_madevent_group>]> 0.124577045441 | 719 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4IOTest testMethod=testIO_export_matrix_element_v4_madevent_group>]> 0.124577045441 |
3557 | 718 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_wpwmbbx>]> 61.837485075 | 720 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_wpwmbbx>]> 61.837485075 |
3558 | 719 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_export_matrix_element_python_madevent_group>]> 0.0395710468292 | 721 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_export_matrix_element_python_madevent_group>]> 0.0395710468292 |
3559 | 720 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.AlohaFortranWriterTest testMethod=test_header>]> 0.0467920303345 | ||
3560 | 721 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj_with_required_s_channel>]> 0.195080041885 | 722 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj_with_required_s_channel>]> 0.195080041885 |
3561 | 722 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFT2>]> 0.0807220935822 | 723 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFT2>]> 0.0807220935822 |
3562 | 723 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm_nomasses>]> 0.0792789459229 | 724 | <__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 | 735 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_fct>]> 0.220015048981 | 736 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_fct>]> 0.220015048981 |
3565 | 736 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=test_split>]> 0.00737619400024 | 737 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=test_split>]> 0.00737619400024 |
3566 | 737 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pdf_file_EW>]> 5.29289245605e-05 | 738 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pdf_file_EW>]> 5.29289245605e-05 |
3570 | 738 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF3>]> 0.317361831665 | 739 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000127792358398 |
3571 | 739 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_write>]> 7.00950622559e-05 | 740 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024 |
3572 | 740 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups_modified_mssm_general>]> 8.70347595215 | 741 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_delta6_simplify>]> 8.51154327393e-05 |
3573 | 741 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_def_position>]> 0.000124931335449 | 742 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_def_position>]> 0.000124931335449 |
3574 | 742 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_sum_object>]> 0.000125885009766 | 743 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_sum_object>]> 0.000125885009766 |
3575 | 743 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_F77writer_feynman>]> 0.027764081955 | 744 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_F77writer_feynman>]> 0.027764081955 |
3576 | @@ -745,26 +746,27 @@ | |||
3577 | 745 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_sborn_sf>]> 0.00146198272705 | 746 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_sborn_sf>]> 0.00146198272705 |
3578 | 746 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_subproc_group>]> 9.28846502304 | 747 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_subproc_group>]> 9.28846502304 |
3579 | 747 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_setget_process_definition_correct>]> 0.000485897064209 | 748 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_setget_process_definition_correct>]> 0.000485897064209 |
3580 | 748 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_ga_QCD_QED>]> 0.00132417678833 | ||
3581 | 749 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_madevent_directory>]> 16.0076999664 | 749 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_madevent_directory>]> 16.0076999664 |
3582 | 750 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_get_name>]> 0.030855178833 | 750 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_get_name>]> 0.030855178833 |
3583 | 751 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator3>]> 0.0653259754181 | 751 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator3>]> 0.0653259754181 |
3584 | 752 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_vertexlist>]> 1.92569303513 | 752 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_vertexlist>]> 1.92569303513 |
3585 | 753 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_values_for_prop>]> 8.10623168945e-05 | 753 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_values_for_prop>]> 8.10623168945e-05 |
3586 | 754 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_zccx>]> 41.9109280109 | 754 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_zccx>]> 41.9109280109 |
3587 | 755 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805 | ||
3588 | 755 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_loop_convert_diagram>]> 0.000792026519775 | 756 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_loop_convert_diagram>]> 0.000792026519775 |
3589 | 757 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_heft_multiparticle_pp_hnj>]> 0.326533079147 | ||
3590 | 756 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_ug_ttxz>]> 0.11712884903 | 758 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_ug_ttxz>]> 0.11712884903 |
3591 | 757 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_equality>]> 0.000420093536377 | 759 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_equality>]> 0.000420093536377 |
3592 | 758 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddint>]> 9.20295715332e-05 | 760 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddint>]> 9.20295715332e-05 |
3593 | 759 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0104720592499 | 761 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0104720592499 |
3594 | 760 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_real_process_init>]> 0.16713809967 | 762 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_real_process_init>]> 0.16713809967 |
3596 | 761 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_zzz>]> 28.6060318947 | 763 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_epem_ttxg_QED>]> 0.00109791755676 |
3597 | 762 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testequality>]> 0.000127077102661 | 764 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testequality>]> 0.000127077102661 |
3598 | 763 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdMatchBox testMethod=testIO_MatchBoxOutput>]> 3.16356706619 | 765 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdMatchBox testMethod=testIO_MatchBoxOutput>]> 3.16356706619 |
3599 | 764 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_get_fks_j_from_i_lines_EW>]> 7.70092010498e-05 | 766 | <__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 | 765 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_replace_make_opt_f_compiler>]> 0.0348589420319 | 767 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_replace_make_opt_f_compiler>]> 0.0348589420319 |
3601 | 766 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_onshell_s_channel_uux_uuxng>]> 0.0812060832977 | 768 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_onshell_s_channel_uux_uuxng>]> 0.0812060832977 |
3603 | 767 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCallWriterTest testMethod=test_UFO_CPP_helas_call_writer>]> 0.0117120742798 | 769 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF3>]> 0.317361831665 |
3604 | 768 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_singletop_fastjet>]> 152.502398014 | 770 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_singletop_fastjet>]> 152.502398014 |
3605 | 769 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_majorana_decay_chain_process>]> 0.136888980865 | 771 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_majorana_decay_chain_process>]> 0.136888980865 |
3606 | 770 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_madevent_ptj_bias>]> 75.3821110725 | 772 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_madevent_ptj_bias>]> 75.3821110725 |
3607 | @@ -778,10 +780,10 @@ | |||
3608 | 778 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_multi_gluons>]> 0.251565933228 | 780 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_multi_gluons>]> 0.251565933228 |
3609 | 779 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_equal_decay_chains>]> 0.134434938431 | 781 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_equal_decay_chains>]> 0.134434938431 |
3610 | 780 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_name>]> 66.2333741188 | 782 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_name>]> 66.2333741188 |
3611 | 783 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p2>]> 750.973557949 | ||
3612 | 781 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_full_epem_ttx>]> 42.7599339485 | 784 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_full_epem_ttx>]> 42.7599339485 |
3613 | 782 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_helper_lcm_functions>]> 0.000735998153687 | 785 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_helper_lcm_functions>]> 0.000735998153687 |
3614 | 783 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarint>]> 6.48498535156e-05 | 786 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarint>]> 6.48498535156e-05 |
3615 | 784 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_ML5EW_sm_vs_stored_ML5EW_sqso>]> 0.00940799713135 | ||
3616 | 785 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_representation>]> 0.000728130340576 | 787 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_representation>]> 0.000728130340576 |
3617 | 786 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_forbidden_s_channel_decay_chain>]> 0.0207369327545 | 788 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_forbidden_s_channel_decay_chain>]> 0.0207369327545 |
3618 | 787 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_sqso_ddx_ddx_WEIGHTEDgt6>]> 20.8691658974 | 789 | <__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 | 806 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_mass_overmass>]> 0.00144410133362 | 808 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_mass_overmass>]> 0.00144410133362 |
3621 | 807 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_rambo_validity_check>]> 0.000271081924438 | 809 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_rambo_validity_check>]> 0.000271081924438 |
3622 | 808 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_get_final_ids_after_decay>]> 0.000993013381958 | 810 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_get_final_ids_after_decay>]> 0.000993013381958 |
3624 | 809 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_particle_list>]> 0.000241994857788 | 811 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_Fortranwriter_spin3half>]> 0.141327142715 |
3625 | 810 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultmult>]> 0.000176906585693 | 812 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestMultVariable testMethod=testmultmultmult>]> 0.000176906585693 |
3626 | 811 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_ddxng>]> 0.179573059082 | 813 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_ddxng>]> 0.179573059082 |
3627 | 812 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_mssm_22>]> 561.371481895 | 814 | <__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 | 824 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_get_rank>]> 0.103627204895 | 826 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_get_rank>]> 0.103627204895 |
3630 | 825 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uux_gepem_no_optimization>]> 0.0196721553802 | 827 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uux_gepem_no_optimization>]> 0.0196721553802 |
3631 | 826 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_VVS1>]> 0.0284140110016 | 828 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_VVS1>]> 0.0284140110016 |
3633 | 827 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_heft>]> 10.1859381199 | 829 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_multidiagram_decay_chains>]> 0.431716918945 |
3634 | 828 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_cpp_go_process_cc_file>]> 0.0690608024597 | 830 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_cpp_go_process_cc_file>]> 0.0690608024597 |
3635 | 829 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_split_evt_gen_zeroev>]> 67.6156620979 | 831 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_split_evt_gen_zeroev>]> 67.6156620979 |
3637 | 830 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testTraceofObject>]> 0.000325918197632 | 832 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_generate_reals_no_combine>]> 0.184464216232 |
3638 | 831 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_process_h_file>]> 0.0427629947662 | 833 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_process_h_file>]> 0.0427629947662 |
3639 | 832 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_leshouche_sextet_diquarks>]> 2.94189381599 | 834 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_leshouche_sextet_diquarks>]> 2.94189381599 |
3640 | 833 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_FO_analyse_card.TestFOAnalyseCard testMethod=test_analyse_card_default>]> 0.000207901000977 | 835 | <__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 | 850 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_C>]> 0.0504019260406 | 852 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_C>]> 0.0504019260406 |
3643 | 851 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_ttx_wpwm_EW>]> 20.03905797 | 853 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_ttx_wpwm_EW>]> 20.03905797 |
3644 | 852 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel2 testMethod=test_read_param_card>]> 1.23990178108 | 854 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel2 testMethod=test_read_param_card>]> 1.23990178108 |
3645 | 853 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_read_madgraph4_proc_card>]> 0.877720832825 | ||
3646 | 854 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_couplings>]> 0.000503063201904 | 855 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_couplings>]> 0.000503063201904 |
3647 | 855 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWrappedWithReturnPath>]> 0.00258612632751 | 856 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWrappedWithReturnPath>]> 0.00258612632751 |
3648 | 856 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct>]> 0.000214099884033 | 857 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct>]> 0.000214099884033 |
3649 | @@ -878,7 +879,7 @@ | |||
3650 | 878 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_multiple_lorentz>]> 0.000393867492676 | 879 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_multiple_lorentz>]> 0.000393867492676 |
3651 | 879 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_values_for_prop>]> 0.110687971115 | 880 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_values_for_prop>]> 0.110687971115 |
3652 | 880 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_get_fks_info_list>]> 0.993493080139 | 881 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_get_fks_info_list>]> 0.993493080139 |
3654 | 881 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_fermion_flow>]> 0.00178098678589 | 882 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_isexternal>]> 0.000101089477539 |
3655 | 882 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_launch_amcatnlo_name>]> 49.5285630226 | 883 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_launch_amcatnlo_name>]> 49.5285630226 |
3656 | 883 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_fortran>]> 0.000572919845581 | 884 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_fortran>]> 0.000572919845581 |
3657 | 884 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_decay_width_nlo_model>]> 14.2313911915 | 885 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_decay_width_nlo_model>]> 14.2313911915 |
3658 | @@ -894,7 +895,7 @@ | |||
3659 | 894 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_dxd_zgg>]> 39.1508870125 | 895 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_dxd_zgg>]> 39.1508870125 |
3660 | 895 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess>]> 0.970643043518 | 896 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess>]> 0.970643043518 |
3661 | 896 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_modifparameter>]> 0.000886917114258 | 897 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_modifparameter>]> 0.000886917114258 |
3663 | 897 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_multistage_decay_chain_process>]> 0.127142906189 | 898 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_link_gghgg_gghg>]> 0.115737915039 |
3664 | 898 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_get_s_and_t_channels.TestGetSandTchannels testMethod=test_get_s_and_t_ub_tdg>]> 0.11679315567 | 899 | <__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 | 899 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorTripletModel testMethod=test_ut_to_antitrip_g>]> 0.187545776367 | 900 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorTripletModel testMethod=test_ut_to_antitrip_g>]> 0.187545776367 |
3666 | 900 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_wpwm_hh_QED>]> 0.00102114677429 | 901 | <__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 | 904 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_projector>]> 0.00699806213379 | 905 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_projector>]> 0.00699806213379 |
3669 | 905 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWritting testMethod=test_write_block>]> 0.0758440494537 | 906 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWritting testMethod=test_write_block>]> 0.0758440494537 |
3670 | 906 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_output2>]> 43.6411170959 | 907 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_output2>]> 43.6411170959 |
3672 | 907 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.TestIdentifyMETag testMethod=test_identify_me_tag_qq_qqg>]> 0.144216060638 | 908 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=testEpsilonProperty>]> 0.054888010025 |
3673 | 908 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorTripletModel testMethod=test_triplet_color_flow_output>]> 0.139855146408 | 909 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorTripletModel testMethod=test_triplet_color_flow_output>]> 0.139855146408 |
3674 | 909 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestMadAnalysis5Card testMethod=test_MadAnalysis5Card>]> 0.000823974609375 | 910 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestMadAnalysis5Card testMethod=test_MadAnalysis5Card>]> 0.000823974609375 |
3675 | 910 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_generate_reals_combine>]> 0.221959114075 | 911 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_generate_reals_combine>]> 0.221959114075 |
3676 | @@ -926,6 +927,7 @@ | |||
3677 | 926 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_stdhep>]> 50.4594700336 | 927 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_stdhep>]> 50.4594700336 |
3678 | 927 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_fuse_vertex>]> 0.000200033187866 | 928 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_fuse_vertex>]> 0.000200033187866 |
3679 | 928 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_uux_t1t1x_QCD>]> 69.1381390095 | 929 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_uux_t1t1x_QCD>]> 69.1381390095 |
3680 | 930 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madspin.TestMadSpin testMethod=test_hepmc_decay>]> 0.65887594223 | ||
3681 | 929 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_def_begin_end_point>]> 9.89437103271e-05 | 931 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_def_begin_end_point>]> 9.89437103271e-05 |
3682 | 930 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator>]> 0.128522157669 | 932 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator>]> 0.128522157669 |
3683 | 931 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestMadSpinFCT_in_interface testMethod=test_get_final_part>]> 0.12849187851 | 933 | <__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 | 934 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_cross_gauge_p2>]> 26775.4375861 | 936 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_cross_gauge_p2>]> 26775.4375861 |
3686 | 935 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess_no_isr>]> 0.035425901413 | 937 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess_no_isr>]> 0.035425901413 |
3687 | 936 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_uux_QCD_QED>]> 0.00138115882874 | 938 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_uux_QCD_QED>]> 0.00138115882874 |
3688 | 937 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_ppgogo_amcatnlo_nlo>]> 56.4734661579 | ||
3689 | 938 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_decayBW_file>]> 0.00429511070251 | 939 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_decayBW_file>]> 0.00429511070251 |
3690 | 939 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_stdhep>]> 10.500576973 | 940 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_stdhep>]> 10.500576973 |
3691 | 940 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8_analyse>]> 0.000602960586548 | 941 | <__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 | 942 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_butdg_butd>]> 0.0965809822083 | 943 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_butdg_butd>]> 0.0965809822083 |
3694 | 943 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_full_lept>]> 29.0376198292 | 944 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_full_lept>]> 29.0376198292 |
3695 | 944 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_IdentifyHelasTag testMethod=test_helas_comparison>]> 0.225214958191 | 945 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_IdentifyHelasTag testMethod=test_helas_comparison>]> 0.225214958191 |
3697 | 945 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p2>]> 750.973557949 | 946 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_define_not_dep_param>]> 0.0751221179962 |
3698 | 946 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_interaction>]> 0.000797033309937 | 947 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_interaction>]> 0.000797033309937 |
3699 | 947 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_aloha_get_name>]> 0.0285120010376 | 948 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_aloha_get_name>]> 0.0285120010376 |
3700 | 948 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_b_sf_fks>]> 2.02799201012 | 949 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_b_sf_fks>]> 2.02799201012 |
3701 | 949 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_wpwm_QCD>]> 0.00233387947083 | ||
3702 | 950 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_representation>]> 0.00421714782715 | 950 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_representation>]> 0.00421714782715 |
3703 | 951 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_info_file>]> 0.0922110080719 | 951 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_info_file>]> 0.0922110080719 |
3704 | 952 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm>]> 0.0441629886627 | 952 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm>]> 0.0441629886627 |
3706 | 953 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_particles_type>]> 1.96593403816 | 953 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_help_category>]> 0.00062894821167 |
3707 | 954 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_uux_ga>]> 1.02916789055 | 954 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_uux_ga>]> 1.02916789055 |
3708 | 955 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_setget_wavefunction_exceptions>]> 0.000231027603149 | 955 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_setget_wavefunction_exceptions>]> 0.000231027603149 |
3710 | 956 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_generate_events_nlo_py6_stdhep>]> 90.5052030087 | 956 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_check_generate_optimize>]> 0.301462173462 |
3711 | 957 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_zttx>]> 42.488312006 | 957 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_zttx>]> 42.488312006 |
3713 | 958 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_values_for_prop>]> 0.000379085540771 | 958 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_read_madgraph4_proc_card>]> 0.877720832825 |
3714 | 959 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_zz_QCD>]> 0.0014021396637 | 959 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_zz_QCD>]> 0.0014021396637 |
3715 | 960 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF>]> 0.00574803352356 | 960 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF>]> 0.00574803352356 |
3716 | 961 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestLorentzInvariance testMethod=test_boost_momenta_gluino>]> 5.42973899841 | 961 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestLorentzInvariance testMethod=test_boost_momenta_gluino>]> 5.42973899841 |
3717 | @@ -963,39 +963,39 @@ | |||
3718 | 963 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_multiple_lorentz_subset>]> 0.0536549091339 | 963 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_multiple_lorentz_subset>]> 0.0536549091339 |
3719 | 964 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_wrong_multiparticle>]> 0.00848388671875 | 964 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_wrong_multiparticle>]> 0.00848388671875 |
3720 | 965 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWZA>]> 0.0144498348236 | 965 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWZA>]> 0.0144498348236 |
3722 | 966 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000127792358398 | 966 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_export_v4.TestMadWeight testMethod=test_modification_to_cuts>]> 0.0898389816284 |
3723 | 967 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_den_factor_lines>]> 2.02332401276 | 967 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_den_factor_lines>]> 2.02332401276 |
3724 | 968 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_flipping>]> 0.0031681060791 | 968 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_flipping>]> 0.0031681060791 |
3725 | 969 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator2>]> 0.152077913284 | ||
3726 | 970 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_generate_eventsnlo_py6pt_fsr>]> 16.2141349316 | 969 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_generate_eventsnlo_py6pt_fsr>]> 16.2141349316 |
3727 | 971 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_leshouche_file_EW>]> 0.000738143920898 | 970 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_leshouche_file_EW>]> 0.000738143920898 |
3728 | 972 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.000211000442505 | 971 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.000211000442505 |
3729 | 973 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_MP_mode>]> 0.0349721908569 | 972 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_MP_mode>]> 0.0349721908569 |
3730 | 974 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin32propagator>]> 0.208134174347 | 973 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin32propagator>]> 0.208134174347 |
3732 | 975 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_setget_matrix_element_exceptions>]> 0.00100207328796 | 974 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups_modified_mssm_general>]> 8.70347595215 |
3733 | 976 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_configs_file_born_EW>]> 5.07831573486e-05 | 975 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_configs_file_born_EW>]> 5.07831573486e-05 |
3734 | 977 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testmultvarAdd>]> 0.00016713142395 | 976 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testmultvarAdd>]> 0.00016713142395 |
3735 | 978 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_calculate_xsect_script>]> 58.7567720413 | 977 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_calculate_xsect_script>]> 58.7567720413 |
3737 | 979 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_identify_particle>]> 0.0015971660614 | 978 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_setget_multi_leg_correct>]> 6.60419464111e-05 |
3738 | 980 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_complicated_majorana_process>]> 0.110619068146 | 979 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_complicated_majorana_process>]> 0.110619068146 |
3739 | 981 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uxu_wpwm_QED>]> 0.000982999801636 | 980 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uxu_wpwm_QED>]> 0.000982999801636 |
3740 | 982 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower1>]> 0.000165939331055 | 981 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower1>]> 0.000165939331055 |
3741 | 983 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_permutation.TestPermutation testMethod=test_permutation_from_id>]> 0.0379128456116 | 982 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_permutation.TestPermutation testMethod=test_permutation_from_id>]> 0.0379128456116 |
3742 | 984 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_identical_interactions>]> 0.0405609607697 | 983 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_identical_interactions>]> 0.0405609607697 |
3744 | 985 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_help_category>]> 0.00062894821167 | 984 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_particles_type>]> 1.96593403816 |
3745 | 986 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestPythia8Card testMethod=test_PY8Card_with_subruns>]> 0.0171630382538 | 985 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestPythia8Card testMethod=test_PY8Card_with_subruns>]> 0.0171630382538 |
3746 | 987 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8>]> 0.000524997711182 | 986 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8>]> 0.000524997711182 |
3747 | 988 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_aa_QED>]> 0.00227403640747 | 987 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_aa_QED>]> 0.00227403640747 |
3748 | 989 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_add_time_of_flight>]> 19.5163040161 | 988 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_add_time_of_flight>]> 19.5163040161 |
3749 | 990 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_nfksconfigs_file_EW>]> 0.0351588726044 | 989 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_nfksconfigs_file_EW>]> 0.0351588726044 |
3751 | 991 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419 | 990 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sqso>]> 4.5599489212 |
3752 | 992 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_output>]> 0.0474369525909 | 991 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_output>]> 0.0474369525909 |
3753 | 993 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_get_anti_pdg_code>]> 0.000168085098267 | 992 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_get_anti_pdg_code>]> 0.000168085098267 |
3754 | 994 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_add_particle>]> 0.000631093978882 | 993 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_add_particle>]> 0.000631093978882 |
3756 | 995 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_check_generate_optimize>]> 0.301462173462 | 994 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_generate_events_nlo_py6_stdhep>]> 90.5052030087 |
3757 | 996 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_file>]> 0.00247812271118 | 995 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_file>]> 0.00247812271118 |
3758 | 997 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testsumaddmult>]> 0.000146865844727 | 996 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testsumaddmult>]> 0.000146865844727 |
3759 | 998 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hwpp_set>]> 29.2329268456 | 997 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hwpp_set>]> 29.2329268456 |
3760 | 998 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_extract_info>]> 0.00151705741882 | ||
3761 | 999 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_add_ab_particle>]> 0.127122163773 | 999 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_add_ab_particle>]> 0.127122163773 |
3762 | 1000 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestImportUFONoSideEffect testMethod=test_ImportUFOcheckgoldstone>]> 0.0369899272919 | 1000 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestImportUFONoSideEffect testMethod=test_ImportUFOcheckgoldstone>]> 0.0369899272919 |
3763 | 1001 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madspin.TestMadSpin testMethod=test_lhe_none_decay>]> 7.61337804794 | 1001 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madspin.TestMadSpin testMethod=test_lhe_none_decay>]> 7.61337804794 |
3764 | @@ -1029,6 +1029,7 @@ | |||
3765 | 1029 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testrsumvarvar>]> 7.60555267334e-05 | 1029 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testrsumvarvar>]> 7.60555267334e-05 |
3766 | 1030 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_complex_conjugate>]> 8.20159912109e-05 | 1030 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_complex_conjugate>]> 8.20159912109e-05 |
3767 | 1031 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_VVS>]> 0.0273261070251 | 1031 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_VVS>]> 0.0273261070251 |
3768 | 1032 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_4_fermion>]> 0.0415799617767 | ||
3769 | 1032 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_special_group_decay_chain>]> 0.162132024765 | 1033 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_special_group_decay_chain>]> 0.162132024765 |
3770 | 1033 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_multi_process_ppz>]> 1.70217895508 | 1034 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_multi_process_ppz>]> 1.70217895508 |
3771 | 1034 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_wavefunctions testMethod=test_short_OR>]> 0.00101685523987 | 1035 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_wavefunctions testMethod=test_short_OR>]> 0.00101685523987 |
3772 | @@ -1036,6 +1037,7 @@ | |||
3773 | 1036 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_raise_invalid_path_py8>]> 74.8001401424 | 1037 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_raise_invalid_path_py8>]> 74.8001401424 |
3774 | 1037 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_wpwm_QED>]> 0.0013861656189 | 1038 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_wpwm_QED>]> 0.0013861656189 |
3775 | 1038 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T_pair_simplify>]> 0.000263929367065 | 1039 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T_pair_simplify>]> 0.000263929367065 |
3776 | 1040 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_output_files.IOExportMadLoopAcceptanceTest testMethod=testIO_ProcOutputIOTests>]> 28.318707943 | ||
3777 | 1039 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_ppzz_in_RS>]> 5.40944194794 | 1041 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_ppzz_in_RS>]> 5.40944194794 |
3778 | 1040 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_lh_order_EW>]> 0.000322818756104 | 1042 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_lh_order_EW>]> 0.000322818756104 |
3779 | 1041 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarint>]> 8.79764556885e-05 | 1043 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=testsumvarint>]> 8.79764556885e-05 |
3780 | @@ -1045,7 +1047,6 @@ | |||
3781 | 1045 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_gluons>]> 0.0548150539398 | 1047 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_gluons>]> 0.0548150539398 |
3782 | 1046 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_complex_mass_SA>]> 1.51796483994 | 1048 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_complex_mass_SA>]> 1.51796483994 |
3783 | 1047 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=test_short_sumofLorentzObj>]> 0.00596499443054 | 1049 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=test_short_sumofLorentzObj>]> 0.00596499443054 |
3784 | 1048 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_get_python_matrix_methods>]> 0.0204730033875 | ||
3785 | 1049 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_fks_EW>]> 4.79221343994e-05 | 1050 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_fks_EW>]> 4.79221343994e-05 |
3786 | 1050 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_python_routine_are_exec>]> 0.00470900535583 | 1051 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_python_routine_are_exec>]> 0.00470900535583 |
3787 | 1051 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin32propagator>]> 0.232930898666 | 1052 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin32propagator>]> 0.232930898666 |
3788 | @@ -1057,7 +1058,7 @@ | |||
3789 | 1057 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_FFT2>]> 0.0686628818512 | 1058 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_FFT2>]> 0.0686628818512 |
3790 | 1058 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.TestFKSOutput testMethod=test_wj_loonly_gen>]> 8.72703194618 | 1059 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.TestFKSOutput testMethod=test_wj_loonly_gen>]> 8.72703194618 |
3791 | 1059 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_model_reader.TestModelReader testMethod=test_set_parameters_and_couplings>]> 0.0923321247101 | 1060 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_model_reader.TestModelReader testMethod=test_set_parameters_and_couplings>]> 0.0923321247101 |
3793 | 1060 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_4_fermion>]> 0.0415799617767 | 1061 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_to_immutable>]> 5.88893890381e-05 |
3794 | 1061 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_setget_model_correct>]> 0.00034499168396 | 1062 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_setget_model_correct>]> 0.00034499168396 |
3795 | 1062 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_ddx_wpwmg>]> 26.4144010544 | 1063 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_ddx_wpwmg>]> 26.4144010544 |
3796 | 1063 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_CT_vertices_generation_gg_gg>]> 1.53292918205 | 1064 | <__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 | 1095 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_parity_for_epsilon>]> 0.000339031219482 | 1096 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_parity_for_epsilon>]> 0.000339031219482 |
3799 | 1096 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_coloramps_file>]> 0.00445699691772 | 1097 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_coloramps_file>]> 0.00445699691772 |
3800 | 1097 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_t_channel_vertex>]> 0.000336170196533 | 1098 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_t_channel_vertex>]> 0.000336170196533 |
3802 | 1098 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000134944915771 | 1099 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_setget_matrix_element_exceptions>]> 0.00100207328796 |
3803 | 1099 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_four_fermion_vertex_strange_fermion_flow>]> 0.0298500061035 | 1100 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_four_fermion_vertex_strange_fermion_flow>]> 0.0298500061035 |
3805 | 1100 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_to_immutable>]> 5.88893890381e-05 | 1101 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_reweight.TestMECmdRWGT testMethod=test_nlo_reweighting>]> 15.5831661224 |
3806 | 1101 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testIdentityMatrix>]> 0.0287408828735 | 1102 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testIdentityMatrix>]> 0.0287408828735 |
3807 | 1102 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_madspin_gridpack>]> 31.1755411625 | 1103 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_madspin_gridpack>]> 31.1755411625 |
3808 | 1103 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_get_particles_type>]> 0.128159046173 | 1104 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_get_particles_type>]> 0.128159046173 |
3809 | 1104 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestMadLoopParam testMethod=test_modifparameter>]> 0.000784873962402 | 1105 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestMadLoopParam testMethod=test_modifparameter>]> 0.000784873962402 |
3810 | 1105 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator4>]> 0.0218019485474 | 1106 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator4>]> 0.0218019485474 |
3812 | 1106 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_generate_reals_no_combine>]> 0.184464216232 | 1107 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_wpwm_QCD>]> 0.00233387947083 |
3813 | 1107 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_group>]> 0.119250059128 | 1108 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_group>]> 0.119250059128 |
3814 | 1108 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_group_multidiagram_decay_chains>]> 0.331767082214 | 1109 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_group_multidiagram_decay_chains>]> 0.331767082214 |
3815 | 1109 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_nlo_hw6_stdhep>]> 106.459758997 | 1110 | <__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 | 1117 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_complex_mass_scheme>]> 0.02272605896 | 1118 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_complex_mass_scheme>]> 0.02272605896 |
3818 | 1118 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massless>]> 0.000313997268677 | 1119 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massless>]> 0.000313997268677 |
3819 | 1119 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_insert_legs>]> 0.000980854034424 | 1120 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_insert_legs>]> 0.000980854034424 |
3821 | 1120 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection>]> 0.000416040420532 | 1121 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_gg_ggg>]> 0.128249883652 |
3822 | 1121 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_uux_uuxuux>]> 0.00294399261475 | 1122 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_uux_uuxuux>]> 0.00294399261475 |
3823 | 1122 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_help_generate_ab_amplitude>]> 0.233986139297 | 1123 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_help_generate_ab_amplitude>]> 0.233986139297 |
3824 | 1123 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticleList testMethod=test_convert>]> 0.000968933105469 | 1124 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticleList testMethod=test_convert>]> 0.000968933105469 |
3825 | @@ -1125,13 +1126,13 @@ | |||
3826 | 1125 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_level_with_flipping_triangle>]> 0.00130605697632 | 1126 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_level_with_flipping_triangle>]> 0.00130605697632 |
3827 | 1126 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_mssm_equivalence>]> 4.6789290905 | 1127 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_mssm_equivalence>]> 4.6789290905 |
3828 | 1127 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower3>]> 0.0128040313721 | 1128 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower3>]> 0.0128040313721 |
3830 | 1128 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_epem_ttxg_QED>]> 0.00109791755676 | 1129 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.AlohaFortranWriterTest testMethod=test_header>]> 0.0467920303345 |
3831 | 1129 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_reorder_permutation>]> 5.41210174561e-05 | 1130 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_reorder_permutation>]> 5.41210174561e-05 |
3832 | 1130 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_html_long_process_strings>]> 20.4391908646 | 1131 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_html_long_process_strings>]> 20.4391908646 |
3833 | 1131 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000126123428345 | 1132 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000126123428345 |
3834 | 1132 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00191402435303 | 1133 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00191402435303 |
3835 | 1133 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_nodiag>]> 0.00244688987732 | 1134 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_nodiag>]> 0.00244688987732 |
3837 | 1134 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_define_not_dep_param>]> 0.0751221179962 | 1135 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=test_obj_are_not_modified>]> 0.000224113464355 |
3838 | 1135 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_check_generate>]> 0.00097393989563 | 1136 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_check_generate>]> 0.00097393989563 |
3839 | 1136 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_aa_ttx_QED>]> 0.00158500671387 | 1137 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_aa_ttx_QED>]> 0.00158500671387 |
3840 | 1137 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_symmetries_and_get_info>]> 0.212943077087 | 1138 | <__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 | 1140 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_legs_to_color_link_string>]> 0.00512909889221 | 1141 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_legs_to_color_link_string>]> 0.00512909889221 |
3843 | 1141 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_sort_fksleglist>]> 0.00221490859985 | 1142 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_sort_fksleglist>]> 0.00221490859985 |
3844 | 1142 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_wavefunctions testMethod=test_I>]> 0.000235080718994 | 1143 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_wavefunctions testMethod=test_I>]> 0.000235080718994 |
3846 | 1143 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805 | 1144 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833 |
3847 | 1144 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_representation>]> 7.29560852051e-05 | 1145 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_representation>]> 7.29560852051e-05 |
3848 | 1145 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_real_me_wrapper_EW>]> 5.69820404053e-05 | 1146 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_real_me_wrapper_EW>]> 5.69820404053e-05 |
3849 | 1146 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_files.TestFilesGestion testMethod=test_is_uptodate>]> 1.0137488842 | 1147 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_files.TestFilesGestion testMethod=test_is_uptodate>]> 1.0137488842 |
3850 | 1147 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization5>]> 0.00028395652771 | 1148 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization5>]> 0.00028395652771 |
3851 | 1148 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_particles_uux_uuxng>]> 0.0401759147644 | 1149 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_particles_uux_uuxng>]> 0.0401759147644 |
3852 | 1149 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_initial_vertex_position>]> 0.000370979309082 | 1150 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_initial_vertex_position>]> 0.000370979309082 |
3855 | 1150 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madspin.TestMadSpin testMethod=test_hepmc_decay>]> 0.65887594223 | 1151 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testTraceofObject>]> 0.000325918197632 |
3856 | 1151 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_loop_induced>]> 50.1276230812 | 1152 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fksreal>]> 13.9149849415 |
3857 | 1152 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_duxhuduxux_guxhuuxux>]> 1.03614902496 | 1153 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_duxhuduxux_guxhuuxux>]> 1.03614902496 |
3858 | 1153 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hw6_analyse>]> 0.000184059143066 | 1154 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hw6_analyse>]> 0.000184059143066 |
3859 | 1154 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_get_helicity_states>]> 0.000174045562744 | 1155 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_get_helicity_states>]> 0.000174045562744 |
3860 | @@ -1157,21 +1158,22 @@ | |||
3861 | 1157 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputIOTest testMethod=testIO_sqso_uux_uuxuuxx>]> 1.1301419735 | 1158 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputIOTest testMethod=testIO_sqso_uux_uuxuuxx>]> 1.1301419735 |
3862 | 1158 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestBlock testMethod=test_block_append_remove>]> 0.000144958496094 | 1159 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestBlock testMethod=test_block_append_remove>]> 0.000144958496094 |
3863 | 1159 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000118970870972 | 1160 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar>]> 0.000118970870972 |
3865 | 1160 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_special_parameters>]> 0.0848360061646 | 1161 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_Plorentz>]> 0.0777571201324 |
3866 | 1161 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCard testMethod=test_mod_param>]> 0.000418901443481 | 1162 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCard testMethod=test_mod_param>]> 0.000418901443481 |
3867 | 1162 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_paralel_cross_sm>]> 865.433312893 | 1163 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_paralel_cross_sm>]> 865.433312893 |
3868 | 1163 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_nice_string>]> 0.000377178192139 | 1164 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_nice_string>]> 0.000377178192139 |
3869 | 1164 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_qq_qqg_with_subprocess_group>]> 0.406945943832 | 1165 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_qq_qqg_with_subprocess_group>]> 0.406945943832 |
3870 | 1165 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_initMadLoopParam>]> 0.00100302696228 | 1166 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_initMadLoopParam>]> 0.00100302696228 |
3871 | 1167 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00219416618347 | ||
3872 | 1166 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_fortranwriter_CFF>]> 0.0698010921478 | 1168 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_fortranwriter_CFF>]> 0.0698010921478 |
3873 | 1167 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_other>]> 4.31537628174e-05 | 1169 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_other>]> 4.31537628174e-05 |
3874 | 1168 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_run_card>]> 0.0163931846619 | 1170 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_run_card>]> 0.0163931846619 |
3875 | 1169 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_card_type_recognition>]> 0.0509171485901 | 1171 | <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_card_type_recognition>]> 0.0509171485901 |
3876 | 1170 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_nhel_file_EW>]> 0.125450849533 | 1172 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_nhel_file_EW>]> 0.125450849533 |
3878 | 1171 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_ga_EW>]> 15.2475500107 | 1173 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_nogroup>]> 0.109572172165 |
3879 | 1172 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_dxd_zzg>]> 32.0563452244 | 1174 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_dxd_zzg>]> 32.0563452244 |
3880 | 1173 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_full_sm_decay_groups>]> 5.82679080963 | 1175 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_full_sm_decay_groups>]> 5.82679080963 |
3882 | 1174 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_output_files.IOExportMadLoopAcceptanceTest testMethod=testIO_ProcOutputIOTests>]> 28.318707943 | 1176 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCallWriterTest testMethod=test_UFO_CPP_helas_call_writer>]> 0.0117120742798 |
3883 | 1175 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_correct>]> 9.48905944824e-05 | 1177 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_correct>]> 9.48905944824e-05 |
3884 | 1176 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOTestMadLoopOutputFromInterface testMethod=testIO_TIR_output>]> 190.159698009 | 1178 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOTestMadLoopOutputFromInterface testMethod=testIO_TIR_output>]> 190.159698009 |
3885 | 1177 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_required_s_channel_uux_uuxng>]> 0.146993160248 | 1179 | <__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 | 1187 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_udxwpg_udxwp>]> 0.0118889808655 | 1189 | <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_udxwpg_udxwp>]> 0.0118889808655 |
3888 | 1188 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestBanner testMethod=test_banner>]> 0.0151350498199 | 1190 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestBanner testMethod=test_banner>]> 0.0151350498199 |
3889 | 1189 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_values_for_prop>]> 0.000183820724487 | 1191 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_values_for_prop>]> 0.000183820724487 |
3891 | 1190 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_extract_info>]> 0.00151705741882 | 1192 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_ML5EW_sm_vs_stored_ML5EW_sqso>]> 0.00940799713135 |
3892 | 1191 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_get_color_data_lines_from_color_matrix>]> 1.95838093758 | 1193 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_get_color_data_lines_from_color_matrix>]> 1.95838093758 |
3893 | 1192 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_epem_ddx>]> 25.6196660995 | 1194 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_epem_ddx>]> 25.6196660995 |
3894 | 1193 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_diagram_list_nice_string>]> 0.00311493873596 | 1195 | <__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 | 1196 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py6>]> 0.000173807144165 | 1198 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py6>]> 0.000173807144165 |
3897 | 1197 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_expand_veto>]> 0.00168204307556 | 1199 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_expand_veto>]> 0.00168204307556 |
3898 | 1198 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarvar>]> 6.89029693604e-05 | 1200 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarvar>]> 6.89029693604e-05 |
3900 | 1199 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sqso>]> 4.5599489212 | 1201 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_get_python_matrix_methods>]> 0.0204730033875 |
3901 | 1200 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestEvent testMethod=test_madspin_event>]> 0.00227999687195 | 1202 | <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestEvent testMethod=test_madspin_event>]> 0.00227999687195 |
3902 | 1201 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_epem_sepsemepem>]> 0.074609041214 | 1203 | <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_epem_sepsemepem>]> 0.074609041214 |
3903 | 1202 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_hhttx>]> 141.341906071 | 1204 | <__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 | 1219 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_nexternal_file>]> 0.000472784042358 | 1221 | <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_nexternal_file>]> 0.000472784042358 |
3906 | 1220 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_ppzjj>]> 59.9299731255 | 1222 | <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_ppzjj>]> 59.9299731255 |
3907 | 1221 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_check_generate_events_nlo_py6pt_fsr>]> 34.7858700752 | 1223 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_short_check_generate_events_nlo_py6pt_fsr>]> 34.7858700752 |
3909 | 1222 | <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_dxd_gz>]> 2.18089485168 | 1224 | <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator2>]> 0.152077913284 |
3910 | 1223 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_aloha_MP_mode>]> 0.0324759483337 | 1225 | <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_aloha_MP_mode>]> 0.0324759483337 |
3911 | 1224 | \ No newline at end of file | 1226 | \ No newline at end of file |
3912 | 1225 | 1227 | ||
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 | 1386 | 1386 | ||
3918 | 1387 | using namespace std; | 1387 | using namespace std; |
3919 | 1388 | 1388 | ||
3921 | 1389 | namespace Pythia8 { | 1389 | using namespace Pythia8; |
3922 | 1390 | 1390 | ||
3923 | 1391 | class Parameters_sm | 1391 | class Parameters_sm |
3924 | 1392 | { | 1392 | { |
3925 | @@ -1410,6 +1410,10 @@ | |||
3926 | 1410 | void setIndependentCouplings(); | 1410 | void setIndependentCouplings(); |
3927 | 1411 | // Set parameters that are changed event by event | 1411 | // Set parameters that are changed event by event |
3928 | 1412 | void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS); | 1412 | void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS); |
3929 | 1413 | // TMP: hardcoded bogus implementation with no arguments since this | ||
3930 | 1414 | // is being called from within the matrix elements. | ||
3931 | 1415 | void setDependentParameters() {}; | ||
3932 | 1416 | |||
3933 | 1413 | // Set couplings that are changed event by event | 1417 | // Set couplings that are changed event by event |
3934 | 1414 | void setDependentCouplings(); | 1418 | void setDependentCouplings(); |
3935 | 1415 | 1419 | ||
3936 | @@ -1422,12 +1426,10 @@ | |||
3937 | 1422 | // Print couplings that are changed event by event | 1426 | // Print couplings that are changed event by event |
3938 | 1423 | void printDependentCouplings(); | 1427 | void printDependentCouplings(); |
3939 | 1424 | 1428 | ||
3940 | 1425 | |||
3941 | 1426 | private: | 1429 | private: |
3942 | 1427 | static Parameters_sm* instance; | 1430 | static Parameters_sm* instance; |
3943 | 1428 | }; | 1431 | }; |
3944 | 1429 | 1432 | ||
3945 | 1430 | } // end namespace Pythia8 | ||
3946 | 1431 | #endif // Pythia8_parameters_sm_H | 1433 | #endif // Pythia8_parameters_sm_H |
3947 | 1432 | """% misc.get_pkg_info() | 1434 | """% misc.get_pkg_info() |
3948 | 1433 | 1435 | ||
3949 | @@ -1444,21 +1446,21 @@ | |||
3950 | 1444 | #include "Parameters_sm.h" | 1446 | #include "Parameters_sm.h" |
3951 | 1445 | #include "Pythia8/PythiaStdlib.h" | 1447 | #include "Pythia8/PythiaStdlib.h" |
3952 | 1446 | 1448 | ||
3968 | 1447 | namespace Pythia8 { | 1449 | using namespace Pythia8; |
3969 | 1448 | 1450 | ||
3970 | 1449 | // Initialize static instance | 1451 | // Initialize static instance |
3971 | 1450 | Parameters_sm* Parameters_sm::instance = 0; | 1452 | Parameters_sm* Parameters_sm::instance = 0; |
3972 | 1451 | 1453 | ||
3973 | 1452 | // Function to get static instance - only one instance per program | 1454 | // Function to get static instance - only one instance per program |
3974 | 1453 | Parameters_sm* Parameters_sm::getInstance(){ | 1455 | Parameters_sm* Parameters_sm::getInstance(){ |
3975 | 1454 | if (instance == 0) | 1456 | if (instance == 0) |
3976 | 1455 | instance = new Parameters_sm(); | 1457 | instance = new Parameters_sm(); |
3977 | 1456 | 1458 | ||
3978 | 1457 | return instance; | 1459 | return instance; |
3979 | 1458 | } | 1460 | } |
3980 | 1459 | 1461 | ||
3981 | 1460 | void Parameters_sm::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){ | 1462 | void Parameters_sm::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){ |
3982 | 1461 | mdl_WTau=pd->mWidth(15); | 1463 | mdl_WTau=pd->mWidth(15); |
3983 | 1462 | mdl_WH=pd->mWidth(25); | 1464 | mdl_WH=pd->mWidth(25); |
3984 | 1463 | mdl_WT=pd->mWidth(6); | 1465 | mdl_WT=pd->mWidth(6); |
3985 | 1464 | mdl_WW=pd->mWidth(24); | 1466 | mdl_WW=pd->mWidth(24); |
3986 | @@ -1559,9 +1561,9 @@ | |||
3987 | 1559 | mdl_ee__exp__2 = ((mdl_ee)*(mdl_ee)); | 1561 | mdl_ee__exp__2 = ((mdl_ee)*(mdl_ee)); |
3988 | 1560 | mdl_sw__exp__2 = ((mdl_sw)*(mdl_sw)); | 1562 | mdl_sw__exp__2 = ((mdl_sw)*(mdl_sw)); |
3989 | 1561 | mdl_cw__exp__2 = ((mdl_cw)*(mdl_cw)); | 1563 | mdl_cw__exp__2 = ((mdl_cw)*(mdl_cw)); |
3993 | 1562 | } | 1564 | } |
3994 | 1563 | void Parameters_sm::setIndependentCouplings(){ | 1565 | void Parameters_sm::setIndependentCouplings(){ |
3995 | 1564 | GC_1 = -(mdl_ee*mdl_complexi)/3.; | 1566 | GC_1 = -(mdl_ee*mdl_complexi)/3.; |
3996 | 1565 | GC_2 = (2.*mdl_ee*mdl_complexi)/3.; | 1567 | GC_2 = (2.*mdl_ee*mdl_complexi)/3.; |
3997 | 1566 | GC_3 = -(mdl_ee*mdl_complexi); | 1568 | GC_3 = -(mdl_ee*mdl_complexi); |
3998 | 1567 | GC_4 = mdl_ee*mdl_complexi; | 1569 | GC_4 = mdl_ee*mdl_complexi; |
3999 | @@ -1666,23 +1668,26 @@ | |||
4000 | 1666 | GC_106 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x1)/(mdl_sw*mdl_sqrt__2); | 1668 | GC_106 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x1)/(mdl_sw*mdl_sqrt__2); |
4001 | 1667 | GC_107 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x2)/(mdl_sw*mdl_sqrt__2); | 1669 | GC_107 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x2)/(mdl_sw*mdl_sqrt__2); |
4002 | 1668 | GC_108 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x3)/(mdl_sw*mdl_sqrt__2); | 1670 | GC_108 = (mdl_ee*mdl_complexi*mdl_conjg__CKM3x3)/(mdl_sw*mdl_sqrt__2); |
4006 | 1669 | } | 1671 | } |
4007 | 1670 | void Parameters_sm::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){ | 1672 | |
4008 | 1671 | aS = alpS; | 1673 | void Parameters_sm::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){ |
4009 | 1674 | aS = alpS; | ||
4010 | 1672 | mdl_sqrt__aS = sqrt(aS); | 1675 | mdl_sqrt__aS = sqrt(aS); |
4011 | 1673 | G = 2.*mdl_sqrt__aS*sqrt(M_PI); | 1676 | G = 2.*mdl_sqrt__aS*sqrt(M_PI); |
4012 | 1674 | mdl_G__exp__2 = ((G)*(G)); | 1677 | mdl_G__exp__2 = ((G)*(G)); |
4016 | 1675 | } | 1678 | } |
4017 | 1676 | void Parameters_sm::setDependentCouplings(){ | 1679 | |
4018 | 1677 | GC_12 = mdl_complexi*mdl_G__exp__2; | 1680 | |
4019 | 1681 | void Parameters_sm::setDependentCouplings(){ | ||
4020 | 1682 | GC_12 = mdl_complexi*mdl_G__exp__2; | ||
4021 | 1678 | GC_11 = mdl_complexi*G; | 1683 | GC_11 = mdl_complexi*G; |
4022 | 1679 | GC_10 = -G; | 1684 | GC_10 = -G; |
4024 | 1680 | } | 1685 | } |
4025 | 1681 | 1686 | ||
4030 | 1682 | // Routines for printing out parameters | 1687 | // Routines for printing out parameters |
4031 | 1683 | void Parameters_sm::printIndependentParameters(){ | 1688 | void Parameters_sm::printIndependentParameters(){ |
4032 | 1684 | cout << "sm model parameters independent of event kinematics:" << endl; | 1689 | cout << "sm model parameters independent of event kinematics:" << endl; |
4033 | 1685 | cout << setw(20) << "mdl_WTau " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WTau << endl; | 1690 | cout << setw(20) << "mdl_WTau " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WTau << endl; |
4034 | 1686 | cout << setw(20) << "mdl_WH " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WH << endl; | 1691 | cout << setw(20) << "mdl_WH " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WH << endl; |
4035 | 1687 | cout << setw(20) << "mdl_WT " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WT << endl; | 1692 | cout << setw(20) << "mdl_WT " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WT << endl; |
4036 | 1688 | cout << setw(20) << "mdl_WW " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WW << endl; | 1693 | cout << setw(20) << "mdl_WW " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_WW << endl; |
4037 | @@ -1775,10 +1780,10 @@ | |||
4038 | 1775 | cout << setw(20) << "mdl_ee__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_ee__exp__2 << endl; | 1780 | cout << setw(20) << "mdl_ee__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_ee__exp__2 << endl; |
4039 | 1776 | cout << setw(20) << "mdl_sw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_sw__exp__2 << endl; | 1781 | cout << setw(20) << "mdl_sw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_sw__exp__2 << endl; |
4040 | 1777 | cout << setw(20) << "mdl_cw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_cw__exp__2 << endl; | 1782 | cout << setw(20) << "mdl_cw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_cw__exp__2 << endl; |
4045 | 1778 | } | 1783 | } |
4046 | 1779 | void Parameters_sm::printIndependentCouplings(){ | 1784 | void Parameters_sm::printIndependentCouplings(){ |
4047 | 1780 | cout << "sm model couplings independent of event kinematics:" << endl; | 1785 | cout << "sm model couplings independent of event kinematics:" << endl; |
4048 | 1781 | cout << setw(20) << "GC_1 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_1 << endl; | 1786 | cout << setw(20) << "GC_1 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_1 << endl; |
4049 | 1782 | cout << setw(20) << "GC_2 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_2 << endl; | 1787 | cout << setw(20) << "GC_2 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_2 << endl; |
4050 | 1783 | cout << setw(20) << "GC_3 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_3 << endl; | 1788 | cout << setw(20) << "GC_3 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_3 << endl; |
4051 | 1784 | cout << setw(20) << "GC_4 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_4 << endl; | 1789 | cout << setw(20) << "GC_4 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_4 << endl; |
4052 | @@ -1883,22 +1888,21 @@ | |||
4053 | 1883 | cout << setw(20) << "GC_106 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_106 << endl; | 1888 | cout << setw(20) << "GC_106 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_106 << endl; |
4054 | 1884 | cout << setw(20) << "GC_107 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_107 << endl; | 1889 | cout << setw(20) << "GC_107 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_107 << endl; |
4055 | 1885 | cout << setw(20) << "GC_108 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_108 << endl; | 1890 | cout << setw(20) << "GC_108 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_108 << endl; |
4060 | 1886 | } | 1891 | } |
4061 | 1887 | void Parameters_sm::printDependentParameters(){ | 1892 | void Parameters_sm::printDependentParameters(){ |
4062 | 1888 | cout << "sm model parameters dependent on event kinematics:" << endl; | 1893 | cout << "sm model parameters dependent on event kinematics:" << endl; |
4063 | 1889 | cout << setw(20) << "aS " << "= " << setiosflags(ios::scientific) << setw(10) << aS << endl; | 1894 | cout << setw(20) << "aS " << "= " << setiosflags(ios::scientific) << setw(10) << aS << endl; |
4064 | 1890 | cout << setw(20) << "mdl_sqrt__aS " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_sqrt__aS << endl; | 1895 | cout << setw(20) << "mdl_sqrt__aS " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_sqrt__aS << endl; |
4065 | 1891 | cout << setw(20) << "G " << "= " << setiosflags(ios::scientific) << setw(10) << G << endl; | 1896 | cout << setw(20) << "G " << "= " << setiosflags(ios::scientific) << setw(10) << G << endl; |
4066 | 1892 | cout << setw(20) << "mdl_G__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_G__exp__2 << endl; | 1897 | cout << setw(20) << "mdl_G__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << mdl_G__exp__2 << endl; |
4071 | 1893 | } | 1898 | } |
4072 | 1894 | void Parameters_sm::printDependentCouplings(){ | 1899 | void Parameters_sm::printDependentCouplings(){ |
4073 | 1895 | cout << "sm model couplings dependent on event kinematics:" << endl; | 1900 | cout << "sm model couplings dependent on event kinematics:" << endl; |
4074 | 1896 | cout << setw(20) << "GC_12 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_12 << endl; | 1901 | cout << setw(20) << "GC_12 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_12 << endl; |
4075 | 1897 | cout << setw(20) << "GC_11 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_11 << endl; | 1902 | cout << setw(20) << "GC_11 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_11 << endl; |
4076 | 1898 | cout << setw(20) << "GC_10 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_10 << endl; | 1903 | cout << setw(20) << "GC_10 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_10 << endl; |
4078 | 1899 | } | 1904 | } |
4079 | 1900 | 1905 | ||
4080 | 1901 | } // end namespace Pythia8 | ||
4081 | 1902 | """ % misc.get_pkg_info() | 1906 | """ % misc.get_pkg_info() |
4082 | 1903 | 1907 | ||
4083 | 1904 | file_h, file_cc = self.model_builder.generate_parameters_class_files() | 1908 | file_h, file_cc = self.model_builder.generate_parameters_class_files() |
4084 | 1905 | 1909 | ||
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 | 203 | self.assertRaises(Exception, self.config.__setitem__, 'dict', {'test':'test'}) | 203 | self.assertRaises(Exception, self.config.__setitem__, 'dict', {'test':'test'}) |
4090 | 204 | self.assertRaises(Exception, self.config.__setitem__, 'dict', "22") | 204 | self.assertRaises(Exception, self.config.__setitem__, 'dict', "22") |
4091 | 205 | 205 | ||
4092 | 206 | def test_integer_handling(self): | ||
4093 | 207 | |||
4094 | 208 | self.config.add_param("int", 1) | ||
4095 | 209 | self.config['int'] = '30*2' | ||
4096 | 210 | self.assertEqual(self.config['int'] ,30*2) | ||
4097 | 211 | |||
4098 | 212 | self.config['int'] = 3.0 | ||
4099 | 213 | self.assertEqual(self.config['int'] ,3) | ||
4100 | 214 | |||
4101 | 215 | self.config['int'] = '3k' | ||
4102 | 216 | self.assertEqual(self.config['int'] ,3000) | ||
4103 | 217 | |||
4104 | 218 | self.config['int'] = '3M' | ||
4105 | 219 | self.assertEqual(self.config['int'] ,3000000) | ||
4106 | 220 | |||
4107 | 221 | self.config['int'] = '4d1' | ||
4108 | 222 | self.assertEqual(self.config['int'] ,40) | ||
4109 | 223 | |||
4110 | 224 | self.config['int'] = '30/2' | ||
4111 | 225 | self.assertEqual(self.config['int'] , 15) | ||
4112 | 226 | |||
4113 | 227 | def test_float_handling(self): | ||
4114 | 228 | |||
4115 | 229 | self.config.add_param("int", 1.0) | ||
4116 | 230 | self.config['int'] = '30*2' | ||
4117 | 231 | self.assertEqual(self.config['int'] ,30*2) | ||
4118 | 232 | |||
4119 | 233 | self.config['int'] = 3.0 | ||
4120 | 234 | self.assertEqual(self.config['int'] ,3) | ||
4121 | 235 | |||
4122 | 236 | self.config['int'] = '3k' | ||
4123 | 237 | self.assertEqual(self.config['int'] ,3000) | ||
4124 | 238 | |||
4125 | 239 | self.config['int'] = '3M' | ||
4126 | 240 | self.assertEqual(self.config['int'] ,3000000) | ||
4127 | 241 | |||
4128 | 242 | self.config['int'] = '4d1' | ||
4129 | 243 | self.assertEqual(self.config['int'] ,40) | ||
4130 | 244 | |||
4131 | 245 | self.config['int'] = '30/4' | ||
4132 | 246 | self.assertEqual(self.config['int'] , 15/2.) | ||
4133 | 247 | |||
4134 | 206 | def test_auto_handling(self): | 248 | def test_auto_handling(self): |
4135 | 207 | """check that any parameter can be set on auto and recover""" | 249 | """check that any parameter can be set on auto and recover""" |
4136 | 208 | 250 | ||
4137 | 209 | 251 | ||
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 | 17 | import tests.unit_tests as unittest | 17 | import tests.unit_tests as unittest |
4143 | 18 | 18 | ||
4144 | 19 | import madgraph.various.shower_card as shower_card | 19 | import madgraph.various.shower_card as shower_card |
4146 | 20 | 20 | import madgraph.various.misc as misc | |
4147 | 21 | pjoin = os.path.join | ||
4148 | 21 | 22 | ||
4149 | 22 | class TestShowerCard(unittest.TestCase): | 23 | class TestShowerCard(unittest.TestCase): |
4150 | 23 | """Check the class linked to a block of the param_card""" | 24 | """Check the class linked to a block of the param_card""" |
4151 | @@ -519,3 +520,17 @@ | |||
4152 | 519 | for a, b in zip(text.split('\n'), goal.split('\n')): | 520 | for a, b in zip(text.split('\n'), goal.split('\n')): |
4153 | 520 | self.assertEqual(a,b) | 521 | self.assertEqual(a,b) |
4154 | 521 | self.assertEqual(text, goal) | 522 | self.assertEqual(text, goal) |
4155 | 523 | |||
4156 | 524 | def test_shower_card_edit(self): | ||
4157 | 525 | |||
4158 | 526 | self.card.testing = True | ||
4159 | 527 | new_text = self.card.text | ||
4160 | 528 | old_card = shower_card.ShowerCard(new_text, testing=True) | ||
4161 | 529 | new_text = old_card.set_param('ue_enabled', '.false.', write_to=True) | ||
4162 | 530 | new_card = shower_card.ShowerCard(new_text, testing=True) | ||
4163 | 531 | self.assertFalse(new_card['ue_enabled']) | ||
4164 | 532 | |||
4165 | 533 | new_text = old_card.set_param('ue_enabled', '1', write_to=True) | ||
4166 | 534 | new_card = shower_card.ShowerCard(new_text, testing=True) | ||
4167 | 535 | self.assertTrue(new_card['ue_enabled']) | ||
4168 | 536 | |||
4169 | 522 | 537 | ||
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 | 259 | ## analytical expression. MG5 ignores those values | 259 | ## analytical expression. MG5 ignores those values |
4175 | 260 | ## but they are important for interfacing the output of MG5 | 260 | ## but they are important for interfacing the output of MG5 |
4176 | 261 | ## to external program such as Pythia. | 261 | ## to external program such as Pythia. |
4191 | 262 | 1 0.000000 # d : 0.0 | 262 | 1 0.000000e+00 # d : 0.0 |
4192 | 263 | 2 0.000000 # u : 0.0 | 263 | 2 0.000000e+00 # u : 0.0 |
4193 | 264 | 3 0.000000 # s : 0.0 | 264 | 3 0.000000e+00 # s : 0.0 |
4194 | 265 | 4 0.000000 # c : 0.0 | 265 | 4 0.000000e+00 # c : 0.0 |
4195 | 266 | 5 0.000000 # b : 0.0 | 266 | 5 0.000000e+00 # b : 0.0 |
4196 | 267 | 11 0.000000 # e- : 0.0 | 267 | 11 0.000000e+00 # e- : 0.0 |
4197 | 268 | 12 0.000000 # ve : 0.0 | 268 | 12 0.000000e+00 # ve : 0.0 |
4198 | 269 | 13 0.000000 # mu- : 0.0 | 269 | 13 0.000000e+00 # mu- : 0.0 |
4199 | 270 | 14 0.000000 # vm : 0.0 | 270 | 14 0.000000e+00 # vm : 0.0 |
4200 | 271 | 16 0.000000 # vt : 0.0 | 271 | 16 0.000000e+00 # vt : 0.0 |
4201 | 272 | 21 0.000000 # g : 0.0 | 272 | 21 0.000000e+00 # g : 0.0 |
4202 | 273 | 22 0.000000 # a : 0.0 | 273 | 22 0.000000e+00 # a : 0.0 |
4203 | 274 | 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))) | 274 | 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 | 275 | 25 91.188000 # h : MZ | 275 | 25 9.118800e+01 # h : MZ |
4205 | 276 | 276 | ||
4206 | 277 | ################################### | 277 | ################################### |
4207 | 278 | ## INFORMATION FOR SMINPUTS | 278 | ## INFORMATION FOR SMINPUTS |
4208 | @@ -300,20 +300,20 @@ | |||
4209 | 300 | ## analytical expression. MG5 ignores those values | 300 | ## analytical expression. MG5 ignores those values |
4210 | 301 | ## but they are important for interfacing the output of MG5 | 301 | ## but they are important for interfacing the output of MG5 |
4211 | 302 | ## to external program such as Pythia. | 302 | ## to external program such as Pythia. |
4226 | 303 | DECAY 1 0.000000 # d : 0.0 | 303 | DECAY 1 0.000000e+00 # d : 0.0 |
4227 | 304 | DECAY 2 0.000000 # u : 0.0 | 304 | DECAY 2 0.000000e+00 # u : 0.0 |
4228 | 305 | DECAY 3 0.000000 # s : 0.0 | 305 | DECAY 3 0.000000e+00 # s : 0.0 |
4229 | 306 | DECAY 4 0.000000 # c : 0.0 | 306 | DECAY 4 0.000000e+00 # c : 0.0 |
4230 | 307 | DECAY 5 0.000000 # b : 0.0 | 307 | DECAY 5 0.000000e+00 # b : 0.0 |
4231 | 308 | DECAY 6 0.000000 # t : 0.0 | 308 | DECAY 6 0.000000e+00 # t : 0.0 |
4232 | 309 | DECAY 11 0.000000 # e- : 0.0 | 309 | DECAY 11 0.000000e+00 # e- : 0.0 |
4233 | 310 | DECAY 12 0.000000 # ve : 0.0 | 310 | DECAY 12 0.000000e+00 # ve : 0.0 |
4234 | 311 | DECAY 13 0.000000 # mu- : 0.0 | 311 | DECAY 13 0.000000e+00 # mu- : 0.0 |
4235 | 312 | DECAY 14 0.000000 # vm : 0.0 | 312 | DECAY 14 0.000000e+00 # vm : 0.0 |
4236 | 313 | DECAY 15 0.000000 # ta- : 0.0 | 313 | DECAY 15 0.000000e+00 # ta- : 0.0 |
4237 | 314 | DECAY 16 0.000000 # vt : 0.0 | 314 | DECAY 16 0.000000e+00 # vt : 0.0 |
4238 | 315 | DECAY 21 0.000000 # g : 0.0 | 315 | DECAY 21 0.000000e+00 # g : 0.0 |
4239 | 316 | DECAY 22 0.000000 # a : 0.0 | 316 | DECAY 22 0.000000e+00 # a : 0.0 |
4240 | 317 | """.split('\n') | 317 | """.split('\n') |
4241 | 318 | 318 | ||
4242 | 319 | self.assertEqual(self.content.getvalue().split('\n'), goal) | 319 | self.assertEqual(self.content.getvalue().split('\n'), goal) |
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