Merge lp:~maddevelopers/mg5amcnlo/enhance_factor_fix into lp:~maddevelopers/mg5amcnlo/3.0.2

Proposed by Rikkert Frederix on 2019-08-07
Status: Merged
Merged at revision: 972
Proposed branch: lp:~maddevelopers/mg5amcnlo/enhance_factor_fix
Merge into: lp:~maddevelopers/mg5amcnlo/3.0.2
Diff against target: 453 lines (+158/-85) (has conflicts)
3 files modified
Template/NLO/SubProcesses/driver_mintFO.f (+3/-0)
Template/NLO/SubProcesses/driver_mintMC.f (+4/-0)
Template/NLO/SubProcesses/fks_singular.f (+151/-85)
Text conflict in Template/NLO/SubProcesses/fks_singular.f
To merge this branch: bzr merge lp:~maddevelopers/mg5amcnlo/enhance_factor_fix
Reviewer Review Type Date Requested Status
marco zaro 2019-08-07 Approve on 2019-09-12
Hua-Sheng Shao 2019-08-07 Approve on 2019-08-29
Review via email: mp+371041@code.launchpad.net

Description of the change

Fix for the wrong renormalisation scale in the multi-channel enhancement factor.

To post a comment you must log in.
969. By Rikkert Frederix on 2019-08-29

small fix

Hua-Sheng Shao (erdissshaw) wrote :

The fix is good for me and the previous problematic process was tested to be correct both at LO and NLO.

review: Approve
marco zaro (marco-zaro) wrote :

The changes in the code look all fine. I have not checked the results, as it has been already done by HuaSheng

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Template/NLO/SubProcesses/driver_mintFO.f'
2--- Template/NLO/SubProcesses/driver_mintFO.f 2019-08-15 13:15:21 +0000
3+++ Template/NLO/SubProcesses/driver_mintFO.f 2019-08-29 10:00:13 +0000
4@@ -427,6 +427,7 @@
5 pass_cuts_check=.true.
6 if (ickkw.eq.3) call set_FxFx_scale(1,p1_cnt(0,1,0))
7 call set_alphaS(p1_cnt(0,1,0))
8+ call include_multichannel_enhance(1)
9 if (abrv(1:2).ne.'vi') then
10 call compute_born
11 endif
12@@ -472,6 +473,7 @@
13 call set_cms_stuff(izero)
14 if (ickkw.eq.3) call set_FxFx_scale(2,p1_cnt(0,1,0))
15 call set_alphaS(p1_cnt(0,1,0))
16+ call include_multichannel_enhance(3)
17 call compute_soft_counter_term(0d0)
18 call set_cms_stuff(ione)
19 call compute_collinear_counter_term(0d0)
20@@ -483,6 +485,7 @@
21 call set_cms_stuff(mohdr)
22 if (ickkw.eq.3) call set_FxFx_scale(3,p)
23 call set_alphaS(p)
24+ call include_multichannel_enhance(2)
25 call compute_real_emission(p,1d0)
26 endif
27 enddo
28
29=== modified file 'Template/NLO/SubProcesses/driver_mintMC.f'
30--- Template/NLO/SubProcesses/driver_mintMC.f 2019-08-15 13:57:46 +0000
31+++ Template/NLO/SubProcesses/driver_mintMC.f 2019-08-29 10:00:13 +0000
32@@ -747,6 +747,7 @@
33 pass_cuts_check=.true.
34 if (ickkw.eq.3) call set_FxFx_scale(1,p1_cnt(0,1,0))
35 call set_alphaS(p1_cnt(0,1,0))
36+ call include_multichannel_enhance(1)
37 if (abrv(1:2).ne.'vi') then
38 call compute_born
39 endif
40@@ -827,6 +828,7 @@
41 call set_cms_stuff(mohdr)
42 if (ickkw.eq.3) call set_FxFx_scale(-3,p)
43 call set_alphaS(p)
44+ call include_multichannel_enhance(4)
45 call compute_MC_subt_term(p,gfactsf,gfactcl,probne)
46 else
47 c For UNLOPS all real-emission contributions need to be added to the
48@@ -841,6 +843,7 @@
49 call set_cms_stuff(izero)
50 if (ickkw.eq.3) call set_FxFx_scale(-2,p1_cnt(0,1,0))
51 call set_alphaS(p1_cnt(0,1,0))
52+ call include_multichannel_enhance(3)
53 replace_MC_subt=(1d0-gfactsf)*probne
54 call compute_soft_counter_term(replace_MC_subt)
55 call set_cms_stuff(ione)
56@@ -856,6 +859,7 @@
57 call set_cms_stuff(mohdr)
58 if (ickkw.eq.3) call set_FxFx_scale(-3,p)
59 call set_alphaS(p)
60+ call include_multichannel_enhance(2)
61 sudakov_damp=probne
62 call compute_real_emission(p,sudakov_damp)
63 endif
64
65=== modified file 'Template/NLO/SubProcesses/fks_singular.f'
66--- Template/NLO/SubProcesses/fks_singular.f 2019-08-28 11:29:57 +0000
67+++ Template/NLO/SubProcesses/fks_singular.f 2019-08-29 10:00:13 +0000
68@@ -979,18 +979,11 @@
69 include 'run.inc'
70 include 'genps.inc'
71 include 'timing_variables.inc'
72- double precision pi,vegas_wgt,enhance,xnoborn_cnt,xtot
73- $ ,bpower,cpower,tiny
74- data xnoborn_cnt /0d0/
75- integer inoborn_cnt,i
76- data inoborn_cnt /0/
77- double precision wgt_c
78+ double precision pi,vegas_wgt
79+ integer i
80 logical firsttime
81 data firsttime /.true./
82 parameter (pi=3.1415926535897932385d0)
83- parameter (tiny=1d-6)
84- double precision p_born(0:3,nexternal-1)
85- common/pborn/ p_born
86 double precision p1_cnt(0:3,nexternal,-2:2),wgt_cnt(-2:2)
87 $ ,pswgt_cnt(-2:2),jac_cnt(-2:2)
88 common/counterevnts/p1_cnt,wgt_cnt,pswgt_cnt,jac_cnt
89@@ -1007,12 +1000,15 @@
90 integer ngluons,nquarks(-6:6),nphotons
91 common/numberofparticles/fkssymmetryfactor,fkssymmetryfactorBorn,
92 & fkssymmetryfactorDeg,ngluons,nquarks,nphotons
93+<<<<<<< TREE
94 integer mapconfig(0:lmaxconfigs), this_config
95 common/to_mconfigs/mapconfig, this_config
96 Double Precision amp2(ngraphs), jamp2(0:ncolor)
97 common/to_amps/ amp2, jamp2
98 double precision diagramsymmetryfactor
99 common /dsymfactor/diagramsymmetryfactor
100+=======
101+>>>>>>> MERGE-SOURCE
102 double precision f_b,f_nb
103 common /factor_nbody/ f_b,f_nb
104 integer iappl
105@@ -1039,6 +1035,7 @@
106 if (fixed_order) call initplot
107 firsttime=.false.
108 endif
109+<<<<<<< TREE
110 c Compute the multi-channel enhancement factor 'enhance'.
111 enhance=1.d0
112 if (p_born(0,1).gt.0d0) then
113@@ -1072,105 +1069,72 @@
114 enhance=0d0
115 endif
116 endif
117+=======
118+>>>>>>> MERGE-SOURCE
119 call set_cms_stuff(0)
120 c f_* multiplication factors for Born and nbody
121 f_b=jac_cnt(0)*xinorm_ev/(min(xiimax_ev,xiBSVcut_used)*shat/(16
122- $ *pi**2))*enhance*fkssymmetryfactorBorn*vegas_wgt
123+ $ *pi**2))*fkssymmetryfactorBorn*vegas_wgt
124 f_nb=f_b
125 call cpu_time(tAfter)
126 tf_nb=tf_nb+(tAfter-tBefore)
127 return
128 end
129
130- subroutine compute_prefactors_n1body(vegas_wgt,jac_ev)
131-c Compute all relevant prefactors for the real emission and counter
132-c terms.
133+
134+ subroutine include_multichannel_enhance(imode)
135 implicit none
136 include 'nexternal.inc'
137 include 'run.inc'
138 include 'genps.inc'
139- include 'fks_powers.inc'
140- include 'coupl.inc'
141 include 'timing_variables.inc'
142- double precision vegas_wgt,enhance,xnoborn_cnt,xtot
143- & ,prefact,prefact_cnt_ssc,prefact_deg,prefact_c,prefact_coll
144- & ,jac_ev,pi,prefact_cnt_ssc_c,prefact_coll_c,prefact_deg_slxi
145- & ,prefact_deg_sxi,zero,enhance_real
146- parameter (pi=3.1415926535897932385d0, zero=0d0)
147+ double precision xnoborn_cnt,xtot,wgt_c,enhance,enhance_real
148+ $ ,pas(0:3,nexternal)
149 data xnoborn_cnt /0d0/
150- integer inoborn_cnt,i
151+ integer inoborn_cnt,i,imode
152 data inoborn_cnt /0/
153- double precision wgt_c
154 double precision p_born(0:3,nexternal-1)
155 common/pborn/ p_born
156 double precision p_born_ev(0:3,nexternal-1)
157- common/pborn_ev/p_born_ev
158+ common/pborn_ev/ p_born_ev
159+ double precision p_ev(0:3,nexternal)
160+ common/pev/ p_ev
161 double precision p1_cnt(0:3,nexternal,-2:2),wgt_cnt(-2:2)
162 $ ,pswgt_cnt(-2:2),jac_cnt(-2:2)
163 common/counterevnts/p1_cnt,wgt_cnt,pswgt_cnt,jac_cnt
164- double precision xi_i_fks_ev,y_ij_fks_ev
165- double precision p_i_fks_ev(0:3),p_i_fks_cnt(0:3,-2:2)
166- common/fksvariables/xi_i_fks_ev,y_ij_fks_ev,p_i_fks_ev,p_i_fks_cnt
167- integer i_fks,j_fks
168- common/fks_indices/i_fks,j_fks
169- double precision xi_i_fks_cnt(-2:2)
170- common /cxiifkscnt/xi_i_fks_cnt
171- double precision xinorm_ev
172- common /cxinormev/xinorm_ev
173- double precision xiimax_ev
174- common /cxiimaxev/xiimax_ev
175- double precision xiimax_cnt(-2:2)
176- common /cxiimaxcnt/xiimax_cnt
177- double precision xinorm_cnt(-2:2)
178- common /cxinormcnt/xinorm_cnt
179- double precision delta_used
180- common /cdelta_used/delta_used
181- double precision xicut_used
182- common /cxicut_used/xicut_used
183- double precision xiScut_used,xiBSVcut_used
184- common /cxiScut_used/xiScut_used,xiBSVcut_used
185- double precision ybst_til_tolab,ybst_til_tocm,sqrtshat,shat
186- common/parton_cms_stuff/ybst_til_tolab,ybst_til_tocm,sqrtshat,shat
187- double precision fkssymmetryfactor,fkssymmetryfactorBorn,
188- & fkssymmetryfactorDeg
189- integer ngluons,nquarks(-6:6),nphotons
190- common/numberofparticles/fkssymmetryfactor,fkssymmetryfactorBorn,
191- & fkssymmetryfactorDeg,ngluons,nquarks,nphotons
192 integer mapconfig(0:lmaxconfigs), iconfig
193 common/to_mconfigs/mapconfig, iconfig
194 Double Precision amp2(ngraphs), jamp2(0:ncolor)
195 common/to_amps/ amp2, jamp2
196 double precision diagramsymmetryfactor
197 common /dsymfactor/diagramsymmetryfactor
198- logical nocntevents
199- common/cnocntevents/nocntevents
200+ double precision f_b,f_nb
201+ common /factor_nbody/ f_b,f_nb
202+ double precision f_r,f_s,f_c,f_dc,f_sc,f_dsc(4)
203+ common/factor_n1body/f_r,f_s,f_c,f_dc,f_sc,f_dsc
204+ double precision f_s_MC_S,f_s_MC_H,f_c_MC_S,f_c_MC_H
205+ $ ,f_sc_MC_S,f_sc_MC_H,f_MC_S,f_MC_H
206+ common/factor_n1body_NLOPS/f_s_MC_S,f_s_MC_H,f_c_MC_S,f_c_MC_H
207+ $ ,f_sc_MC_S,f_sc_MC_H,f_MC_S,f_MC_H
208+ double precision f_dis_d,f_dis_p,f_dis_l
209+ common/factor_dis/f_dis_d,f_dis_p,f_dis_l
210 integer igranny,iaunt
211 logical granny_chain(-nexternal:nexternal),granny_is_res
212 & ,granny_chain_real_final(-nexternal:nexternal)
213 common /c_granny_res/igranny,iaunt,granny_is_res,granny_chain
214 & ,granny_chain_real_final
215- double precision f_r,f_s,f_c,f_dc,f_sc,f_dsc(4)
216- common/factor_n1body/f_r,f_s,f_c,f_dc,f_sc,f_dsc
217- double precision f_s_MC_S,f_s_MC_H,f_c_MC_S,f_c_MC_H
218- $ ,f_sc_MC_S,f_sc_MC_H,f_MC_S,f_MC_H
219- common/factor_n1body_NLOPS/f_s_MC_S,f_s_MC_H,f_c_MC_S,f_c_MC_H
220- $ ,f_sc_MC_S,f_sc_MC_H,f_MC_S,f_MC_H
221- ! prefactors for the DIS scheme
222- double precision prefact_dis_d,prefact_dis_p,prefact_dis_l
223- double precision f_dis_d,f_dis_p,f_dis_l
224- common/factor_dis/f_dis_d,f_dis_p,f_dis_l
225 logical calculatedBorn
226 common/ccalculatedBorn/calculatedBorn
227- double precision pmass(nexternal)
228- include 'pmass.inc'
229+
230 call cpu_time(tBefore)
231+
232+c Compute the multi-channel enhancement factor 'enhance'.
233 enhance=1.d0
234 if (p_born(0,1).gt.0d0) then
235 call sborn(p_born,wgt_c)
236 elseif(p_born(0,1).lt.0d0)then
237 enhance=0d0
238 endif
239-c Compute the multi-channel enhancement factor 'enhance'.
240 if (enhance.eq.0d0)then
241 xnoborn_cnt=xnoborn_cnt+1.d0
242 if(log10(xnoborn_cnt).gt.inoborn_cnt)then
243@@ -1181,9 +1145,9 @@
244 else
245 xtot=0d0
246 if (mapconfig(0).eq.0) then
247- write (*,*) 'Fatal error in compute_prefactor_n1body,'/
248- & /' no Born diagrams ',mapconfig
249- & ,'. Check bornfromreal.inc'
250+ write (*,*) 'Fatal error in compute_prefactor_nbody:'/
251+ & /' no Born diagrams ',mapconfig,
252+ & '. Check bornfromreal.inc'
253 write (*,*) 'Is fks_singular compiled correctly?'
254 stop 1
255 endif
256@@ -1198,11 +1162,17 @@
257 endif
258 endif
259
260+c In the case there is the special phase-space mapping for resonances,
261+c use the Born computed with those as the mapping.
262 enhance_real=1.d0
263- if (granny_is_res) then
264+ if (granny_is_res .and. imode.eq.2) then
265 if (p_born_ev(0,1).gt.0d0) then
266 calculatedBorn=.false.
267+ pas(0:3,nexternal)=0d0
268+ pas(0:3,1:nexternal-1)=p_born_ev(0:3,1:nexternal-1)
269+ call set_alphas(pas)
270 call sborn(p_born_ev,wgt_c)
271+ call set_alphas(p_ev)
272 calculatedBorn=.false.
273 elseif(p_born_ev(0,1).lt.0d0)then
274 if (enhance.ne.0d0) then
275@@ -1242,18 +1212,114 @@
276 enhance_real=enhance
277 endif
278
279+ if (imode.eq.1) then
280+ f_b= f_b *enhance
281+ f_nb= f_nb *enhance
282+ elseif(imode.eq.2) then
283+ f_r= f_r *enhance_real
284+ elseif(imode.eq.4) then
285+ f_MC_S= f_MC_S *enhance
286+ f_MC_H= f_MC_H *enhance
287+ elseif(imode.eq.3) then
288+ f_s= f_s *enhance
289+ f_s_MC_S= f_s_MC_S *enhance
290+ f_S_MC_H= f_S_MC_H *enhance
291+ f_c= f_c *enhance
292+ f_c_MC_S= f_c_MC_S *enhance
293+ f_c_MC_H= f_c_MC_H *enhance
294+ f_dc= f_dc *enhance
295+ f_sc= f_sc *enhance
296+ f_sc_MC_S=f_sc_MC_S*enhance
297+ f_sc_MC_H=f_sc_MC_H*enhance
298+ f_dsc(1)= f_dsc(1) *enhance
299+ f_dsc(2)= f_dsc(2) *enhance
300+ f_dsc(3)= f_dsc(3) *enhance
301+ f_dsc(4)= f_dsc(4) *enhance
302+ f_dis_d= f_dis_d *enhance
303+ f_dis_p= f_dis_p *enhance
304+ f_dis_l= f_dis_l *enhance
305+ endif
306+ call cpu_time(tAfter)
307+ tf_nb=tf_nb+(tAfter-tBefore)
308+
309+ return
310+ end
311+
312+
313+ subroutine compute_prefactors_n1body(vegas_wgt,jac_ev)
314+c Compute all relevant prefactors for the real emission and counter
315+c terms.
316+ implicit none
317+ include 'nexternal.inc'
318+ include 'run.inc'
319+ include 'genps.inc'
320+ include 'fks_powers.inc'
321+ include 'coupl.inc'
322+ include 'timing_variables.inc'
323+ double precision vegas_wgt,prefact,prefact_cnt_ssc,prefact_deg
324+ $ ,prefact_c,prefact_coll,jac_ev,pi,prefact_cnt_ssc_c
325+ $ ,prefact_coll_c,prefact_deg_slxi,prefact_deg_sxi,zero
326+ integer i
327+ parameter (pi=3.1415926535897932385d0, ZERO=0d0)
328+ double precision p1_cnt(0:3,nexternal,-2:2),wgt_cnt(-2:2)
329+ $ ,pswgt_cnt(-2:2),jac_cnt(-2:2)
330+ common/counterevnts/p1_cnt,wgt_cnt,pswgt_cnt,jac_cnt
331+ double precision xi_i_fks_ev,y_ij_fks_ev
332+ double precision p_i_fks_ev(0:3),p_i_fks_cnt(0:3,-2:2)
333+ common/fksvariables/xi_i_fks_ev,y_ij_fks_ev,p_i_fks_ev,p_i_fks_cnt
334+ integer i_fks,j_fks
335+ common/fks_indices/i_fks,j_fks
336+ double precision xi_i_fks_cnt(-2:2)
337+ common /cxiifkscnt/xi_i_fks_cnt
338+ double precision xinorm_ev
339+ common /cxinormev/xinorm_ev
340+ double precision xiimax_ev
341+ common /cxiimaxev/xiimax_ev
342+ double precision xiimax_cnt(-2:2)
343+ common /cxiimaxcnt/xiimax_cnt
344+ double precision xinorm_cnt(-2:2)
345+ common /cxinormcnt/xinorm_cnt
346+ double precision delta_used
347+ common /cdelta_used/delta_used
348+ double precision xicut_used
349+ common /cxicut_used/xicut_used
350+ double precision xiScut_used,xiBSVcut_used
351+ common /cxiScut_used/xiScut_used,xiBSVcut_used
352+ double precision ybst_til_tolab,ybst_til_tocm,sqrtshat,shat
353+ common/parton_cms_stuff/ybst_til_tolab,ybst_til_tocm,sqrtshat,shat
354+ double precision fkssymmetryfactor,fkssymmetryfactorBorn,
355+ & fkssymmetryfactorDeg
356+ integer ngluons,nquarks(-6:6),nphotons
357+ common/numberofparticles/fkssymmetryfactor,fkssymmetryfactorBorn,
358+ & fkssymmetryfactorDeg,ngluons,nquarks,nphotons
359+ logical nocntevents
360+ common/cnocntevents/nocntevents
361+ double precision f_r,f_s,f_c,f_dc,f_sc,f_dsc(4)
362+ common/factor_n1body/f_r,f_s,f_c,f_dc,f_sc,f_dsc
363+ double precision f_s_MC_S,f_s_MC_H,f_c_MC_S,f_c_MC_H
364+ $ ,f_sc_MC_S,f_sc_MC_H,f_MC_S,f_MC_H
365+ common/factor_n1body_NLOPS/f_s_MC_S,f_s_MC_H,f_c_MC_S,f_c_MC_H
366+ $ ,f_sc_MC_S,f_sc_MC_H,f_MC_S,f_MC_H
367+ ! prefactors for the DIS scheme
368+ double precision prefact_dis_d,prefact_dis_p,prefact_dis_l
369+ double precision f_dis_d,f_dis_p,f_dis_l
370+ common/factor_dis/f_dis_d,f_dis_p,f_dis_l
371+ double precision pmass(nexternal)
372+ include 'pmass.inc'
373+ call cpu_time(tBefore)
374+
375 c f_* multiplication factors for real-emission, soft counter, ... etc.
376 prefact=xinorm_ev/xi_i_fks_ev/(1-y_ij_fks_ev)
377- f_r=prefact*jac_ev*enhance_real*fkssymmetryfactor*vegas_wgt
378+ f_r=prefact*jac_ev*fkssymmetryfactor*vegas_wgt
379 f_MC_S=f_r
380 f_MC_H=f_r
381 if (.not.nocntevents) then
382 prefact_cnt_ssc=xinorm_ev/min(xiimax_ev,xiScut_used)*
383 $ log(xicut_used/min(xiimax_ev,xiScut_used))/(1
384 $ -y_ij_fks_ev)
385- f_s=(prefact+prefact_cnt_ssc)*jac_cnt(0)*enhance
386+ f_s=(prefact+prefact_cnt_ssc)*jac_cnt(0)
387 $ *fkssymmetryfactor*vegas_wgt
388- f_s_MC_S=prefact*jac_cnt(0)*enhance
389+ f_s_MC_S=prefact*jac_cnt(0)
390 $ *fkssymmetryfactor*vegas_wgt
391 f_s_MC_H=f_s_MC_S
392
393@@ -1264,9 +1330,9 @@
394 prefact_coll=xinorm_cnt(1)/xi_i_fks_cnt(1)*log(delta_used
395 $ /deltaS)/deltaS
396 f_c=(prefact_c+prefact_coll)*jac_cnt(1)
397- $ *enhance*fkssymmetryfactor*vegas_wgt
398+ $ *fkssymmetryfactor*vegas_wgt
399 f_c_MC_S=prefact_c*jac_cnt(1)
400- $ *enhance*fkssymmetryfactor*vegas_wgt
401+ $ *fkssymmetryfactor*vegas_wgt
402 f_c_MC_H=f_c_MC_S
403
404 call set_cms_stuff(1)
405@@ -1277,13 +1343,13 @@
406 prefact_coll_c=xinorm_cnt(1)/min(xiimax_cnt(1),xiScut_used)
407 $ *log(xicut_used/min(xiimax_cnt(1),xiScut_used))
408 $ *log(delta_used/deltaS)/deltaS
409- f_dc=jac_cnt(1)*prefact_deg/(shat/(32*pi**2))*enhance
410+ f_dc=jac_cnt(1)*prefact_deg/(shat/(32*pi**2))
411 $ *fkssymmetryfactorDeg*vegas_wgt
412 f_sc=(prefact_c+prefact_coll+prefact_cnt_ssc_c
413- & +prefact_coll_c)*jac_cnt(2)*enhance
414+ & +prefact_coll_c)*jac_cnt(2)
415 & *fkssymmetryfactorDeg*vegas_wgt
416 f_sc_MC_S=prefact_c*jac_cnt(2)
417- $ *enhance*fkssymmetryfactor*vegas_wgt
418+ $ *fkssymmetryfactor*vegas_wgt
419 f_sc_MC_H=f_sc_MC_S
420
421 call set_cms_stuff(2)
422@@ -1294,24 +1360,24 @@
423 & ,xiScut_used)*( log(xicut_used)**2
424 & -log(min(xiimax_cnt(1),xiScut_used))**2 )*1/(2.d0
425 & *deltaS)
426- f_dsc(1)=prefact_deg*jac_cnt(2)/(shat/(32*pi**2))*enhance
427+ f_dsc(1)=prefact_deg*jac_cnt(2)/(shat/(32*pi**2))
428 & *fkssymmetryfactorDeg*vegas_wgt
429 f_dsc(2)=prefact_deg_sxi*jac_cnt(2)/(shat/(32*pi**2))
430- & *enhance*fkssymmetryfactorDeg*vegas_wgt
431+ & *fkssymmetryfactorDeg*vegas_wgt
432 f_dsc(3)=prefact_deg_slxi*jac_cnt(2)/(shat/(32*pi**2))
433- & *enhance*fkssymmetryfactorDeg*vegas_wgt
434+ & *fkssymmetryfactorDeg*vegas_wgt
435 f_dsc(4)=( prefact_deg+prefact_deg_sxi )*jac_cnt(2)/(shat
436- & /(32*pi**2))*enhance*fkssymmetryfactorDeg
437+ & /(32*pi**2))*fkssymmetryfactorDeg
438 & *vegas_wgt
439 ! prefactor for the DIS scheme
440 prefact_dis_d=xinorm_cnt(1)/xiScut_used/deltaS
441- f_dis_d=prefact_dis_d*jac_cnt(2)/(shat/(32*pi**2))*enhance
442+ f_dis_d=prefact_dis_d*jac_cnt(2)/(shat/(32*pi**2))
443 & *fkssymmetryfactorDeg*vegas_wgt
444 prefact_dis_p=xinorm_cnt(1)*dlog(xiScut_used)/xiScut_used/deltaS
445- f_dis_p=prefact_dis_p*jac_cnt(2)/(shat/(32*pi**2))*enhance
446+ f_dis_p=prefact_dis_p*jac_cnt(2)/(shat/(32*pi**2))
447 & *fkssymmetryfactorDeg*vegas_wgt
448 prefact_dis_l=xinorm_cnt(1)*dlog(xiScut_used)**2/2d0/xiScut_used/deltaS
449- f_dis_l=prefact_dis_l*jac_cnt(2)/(shat/(32*pi**2))*enhance
450+ f_dis_l=prefact_dis_l*jac_cnt(2)/(shat/(32*pi**2))
451 & *fkssymmetryfactorDeg*vegas_wgt
452 else
453 f_c=0d0

Subscribers

People subscribed via source and target branches

to all changes: