MadGraph5_aMC@NLO

Merge lp:~maddevelopers/mg5amcnlo/2.0.0beta4 into lp:~maddevelopers/mg5amcnlo/2.0.0GoldenMaster

  1. 2.0.0beta4
  2. Merge into 2.0.0GoldenMaster
Proposed by Olivier Mattelaer
Status: Merged
Merged at revision: 356
Proposed branch: lp:~maddevelopers/mg5amcnlo/2.0.0beta4
Merge into: lp:~maddevelopers/mg5amcnlo/2.0.0GoldenMaster
Diff against target: 232 lines (+167/-12)
4 files modified
Template/LO/bin/internal/merge.pl (+6/-0)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_rates.f (+139/-0)
Template/NLO/Utilities/check_events.f (+19/-12)
UpdateNotes.txt (+3/-0)
To merge this branch: bzr merge lp:~maddevelopers/mg5amcnlo/2.0.0beta4
Reviewer Review Type Date Requested Status
Olivier Mattelaer Approve
Review via email: mp+198726@code.launchpad.net

Description of the change

changes reviewed by Paolo already (the changes were done By Stefano in fact) --but the last small fix (which is harmless and linked to MadEvent only)

To post a comment you must log in.
Revision history for this message
Olivier Mattelaer (olivier-mattelaer) wrote :

Sounds good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Template/LO/bin/internal/merge.pl'
--- Template/LO/bin/internal/merge.pl 2012-06-14 21:21:24 +0000
+++ Template/LO/bin/internal/merge.pl 2013-12-12 12:26:57 +0000
@@ -252,6 +252,12 @@
252 } elsif ($stage == 4) {252 } elsif ($stage == 4) {
253 $gzline =~ s/^\s+//;253 $gzline =~ s/^\s+//;
254 @gzparam = split(/\s+/, $gzline);254 @gzparam = split(/\s+/, $gzline);
255 # Keep weight sign from original LHE file
256 $signed_uwgt = $uwgt;
257 if ($gzparam[2] < 0) {
258 $signed_uwgt = -1 * $signed_uwgt;
259 }
260 $gzline = " $gzparam[0] $gzparam[1] $signed_uwgt $gzparam[3] $gzparam[4] $gzparam[5]\n";
255 if ($#gzparam != 5) { die "Not right number of param in first line of event"; }261 if ($#gzparam != 5) { die "Not right number of param in first line of event"; }
256 $gzline = " $gzparam[0] $gzparam[1] $uwgt $gzparam[3] $gzparam[4] $gzparam[5]\n";262 $gzline = " $gzparam[0] $gzparam[1] $uwgt $gzparam[3] $gzparam[4] $gzparam[5]\n";
257263
258264
=== added file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_rates.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_rates.f 1970-01-01 00:00:00 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_rates.f 2013-12-12 12:26:57 +0000
@@ -0,0 +1,139 @@
1C----------------------------------------------------------------------
2 SUBROUTINE RCLOS()
3C DUMMY IF HBOOK IS USED
4C----------------------------------------------------------------------
5 END
6
7
8C----------------------------------------------------------------------
9 SUBROUTINE HWABEG
10C USER'S ROUTINE FOR INITIALIZATION
11C----------------------------------------------------------------------
12 INCLUDE 'HERWIG65.INC'
13 include 'reweight0.inc'
14 integer i,kk,l
15 character*5 cc(2)
16 data cc/' ',' '/
17 integer nwgt,max_weight,nwgt_analysis
18 common/cnwgt/nwgt
19 common/c_analysis/nwgt_analysis
20 parameter (max_weight=maxscales*maxscales+maxpdfs+1)
21 character*15 weights_info(max_weight)
22 common/cwgtsinfo/weights_info
23c
24 call inihist
25 nwgt_analysis=nwgt
26 do i=1,1
27 do kk=1,nwgt_analysis
28 l=(kk-1)*2+(i-1)*1
29 call mbook(l+ 1,'total rate '//weights_info(kk)//cc(i)
30 & ,1.d0,0.d0,1.d0)
31 enddo
32 enddo
33 999 END
34C----------------------------------------------------------------------
35 SUBROUTINE HWAEND
36C USER'S ROUTINE FOR TERMINAL CALCULATIONS, HISTOGRAM OUTPUT, ETC
37C----------------------------------------------------------------------
38 INCLUDE 'HERWIG65.INC'
39 REAL*8 XNORM
40 INTEGER I,KK,l,nwgt_analysis
41 integer NPL
42 parameter(NPL=15000)
43 common/c_analysis/nwgt_analysis
44 OPEN(UNIT=99,FILE='HERWIG.TOP',STATUS='UNKNOWN')
45C XNORM IS SUCH THAT THE CROSS SECTION PER BIN IS IN PB, SINCE THE HERWIG
46C WEIGHT IS IN NB, AND CORRESPONDS TO THE AVERAGE CROSS SECTION
47 XNORM=1.D3/DFLOAT(NEVHEP)
48 DO I=1,NPL
49 CALL MFINAL3(I)
50 CALL MCOPY(I,I+NPL)
51 CALL MOPERA(I+NPL,'F',I+NPL,I+NPL,(XNORM),0.D0)
52 CALL MFINAL3(I+NPL)
53 ENDDO
54C
55 do i=1,1
56 do kk=1,nwgt_analysis
57 l=(kk-1)*2+(i-1)*1
58 call multitop(NPL+l+ 1,NPL-1,3,2,'total rate ',' ','LIN')
59 enddo
60 enddo
61 CLOSE(99)
62 END
63
64C----------------------------------------------------------------------
65 SUBROUTINE HWANAL
66C USER'S ROUTINE TO ANALYSE DATA FROM EVENT
67C----------------------------------------------------------------------
68 INCLUDE 'HERWIG65.INC'
69 include 'reweight0.inc'
70 INTEGER KK,i,l
71 real*8 tot
72 data tot/0.5d0/
73 integer nwgt_analysis,max_weight
74 common/c_analysis/nwgt_analysis
75 parameter (max_weight=maxscales*maxscales+maxpdfs+1)
76 double precision ww(max_weight),www(max_weight)
77 common/cww/ww
78c
79 IF (IERROR.NE.0) RETURN
80 IF (WW(1).EQ.0D0) THEN
81 WRITE(*,*)'WW(1) = 0. Stopping'
82 STOP
83 ENDIF
84c
85C INCOMING PARTONS MAY TRAVEL IN THE SAME DIRECTION: IT'S A POWER-SUPPRESSED
86C EFFECT, SO THROW THE EVENT AWAY
87 IF(SIGN(1.D0,PHEP(3,4)).EQ.SIGN(1.D0,PHEP(3,5)))THEN
88 CALL HWWARN('HWANAL',111)
89 GOTO 999
90 ENDIF
91 DO I=1,nwgt_analysis
92 WWW(I)=EVWGT*ww(i)/ww(1)
93 ENDDO
94C
95 do i=1,1
96 do kk=1,nwgt_analysis
97 l=(kk-1)*2+(i-1)*1
98 call mfill(l+1,tot,WWW(kk))
99 enddo
100 enddo
101C
102 999 END
103
104
105 function getrapidity(en,pl)
106 implicit none
107 real*8 getrapidity,en,pl,tiny,xplus,xminus,y
108 parameter (tiny=1.d-5)
109c
110 xplus=en+pl
111 xminus=en-pl
112 if(xplus.gt.tiny.and.xminus.gt.tiny)then
113 if( (xplus/xminus).gt.tiny )then
114 y=0.5d0*log( xplus/xminus )
115 else
116 y=sign(1.d0,pl)*1.d8
117 endif
118 else
119 y=sign(1.d0,pl)*1.d8
120 endif
121 getrapidity=y
122 return
123 end
124
125 function getpseudorap(en,ptx,pty,pl)
126 implicit none
127 real*8 getpseudorap,en,ptx,pty,pl,tiny,pt,eta,th
128 parameter (tiny=1.d-5)
129c
130 pt=sqrt(ptx**2+pty**2)
131 if(pt.lt.tiny.and.abs(pl).lt.tiny)then
132 eta=sign(1.d0,pl)*1.d8
133 else
134 th=atan2(pt,pl)
135 eta=-log(tan(th/2.d0))
136 endif
137 getpseudorap=eta
138 return
139 end
0140
=== modified file 'Template/NLO/Utilities/check_events.f'
--- Template/NLO/Utilities/check_events.f 2013-12-12 05:47:22 +0000
+++ Template/NLO/Utilities/check_events.f 2013-12-12 12:26:57 +0000
@@ -104,7 +104,7 @@
104 endif104 endif
105105
106 write (*,*) 'Enter 0 to study decays'106 write (*,*) 'Enter 0 to study decays'
107 write (*,*) ' 1 othewise'107 write (*,*) ' 1 otherwise'
108 read (*,*) idec108 read (*,*) idec
109 if(idec.eq.0)call setdecmat()109 if(idec.eq.0)call setdecmat()
110110
@@ -496,8 +496,8 @@
496 err_wgt=sum_abs_wgt/sqrt(dfloat(maxevt))496 err_wgt=sum_abs_wgt/sqrt(dfloat(maxevt))
497 write(*,*)' '497 write(*,*)' '
498 write (*,*) 'The total number of events is:',i498 write (*,*) 'The total number of events is:',i
499 write (*,*) 'Sum of the weights is :',sum_wgt,' +-',err_wgt499 write (*,*) 'Sum of weights is :',sum_wgt,' +-',err_wgt
500 write (*,*) 'Sum of the abs weights is:',sum_abs_wgt,' +-',err_wgt500 write (*,*) 'Sum of abs weights is:',sum_abs_wgt,' +-',err_wgt
501501
502 if(iuseres_1.eq.0)then502 if(iuseres_1.eq.0)then
503 toterr=sqrt(xinterr**2+err_wgt**2)503 toterr=sqrt(xinterr**2+err_wgt**2)
@@ -510,17 +510,24 @@
510 write(44,*)'Integral:',xint,' +-',xinterr510 write(44,*)'Integral:',xint,' +-',xinterr
511 write(44,*)'Weights: ',sum_wgt,' +-',err_wgt511 write(44,*)'Weights: ',sum_wgt,' +-',err_wgt
512 write(44,*)' '512 write(44,*)' '
513 write(44,*)'Sigmas: ',abs(xint-sum_wgt)/sqrt(xinterr**2+err_wgt**2)513 write(44,*)'Sigmas: ',abs(xint-sum_wgt)/
514 # sqrt(xinterr**2+err_wgt**2)
514 endif515 endif
515 write (51,*) 'Xsec (check_events) = ',sum_wgt,' +-',err_wgt516 write (51,*)'Xsec (check_events) = ',
516 write (51,*) 'Xsec (res_1.txt) = ',xint ,' +-',xinterr517 # sum_wgt,' +-',err_wgt
517 write (51,*) ' '518 write (51,*)'Xsec (res_1.txt) = ',
518 write (51,*) 'Xsec ABS (check_events) = ',sum_abs_wgt,' +-',err_wgt519 # xint ,' +-',xinterr
519 write (51,*) 'Xsec ABS (res_1.txt) = ',xinta,' +-',xintaerr520 write (51,*)' '
521 write (51,*)'Xsec ABS (check_events) = ',
522 # sum_abs_wgt,' +-',err_wgt
523 write (51,*)'Xsec ABS (res_1.txt) = ',
524 # xinta,' +-',xintaerr
520 elseif(iuseres_1.eq.1)then525 elseif(iuseres_1.eq.1)then
521 write (51,*) 'Xsec (check_events) = ',sum_wgt,' +-',err_wgt526 write (51,*)'Xsec (check_events) = ',
522 write (51,*) ' '527 # sum_wgt,' +-',err_wgt
523 write (51,*) 'Xsec ABS (check_events) = ',sum_abs_wgt,' +-',err_wgt528 write (51,*)' '
529 write (51,*)'Xsec ABS (check_events) = ',
530 # sum_abs_wgt,' +-',err_wgt
524 else531 else
525 write(*,*)'No such option for iuseres_1'532 write(*,*)'No such option for iuseres_1'
526 stop533 stop
527534
=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt 2013-11-29 07:28:53 +0000
+++ UpdateNotes.txt 2013-12-12 12:26:57 +0000
@@ -48,6 +48,9 @@
48 OM: Improved check for unresponsive of PBS cluster (thanks J. Mc Fayden)48 OM: Improved check for unresponsive of PBS cluster (thanks J. Mc Fayden)
49 OM: implement a maximum number (2500) of jobs which can be submitted at the same time49 OM: implement a maximum number (2500) of jobs which can be submitted at the same time
50 by the PBS cluster. This number is currently not editable via configuration file.50 by the PBS cluster. This number is currently not editable via configuration file.
51 OM: Fix a bug for multi_run sample in presence of negative weights (possible if NLO pdf)
52 The negative weights were not propagated to the merge sample.
53 (thanks to Sebastien Brochet for the fix)
5154
522.0.0.beta3(13/02/13) OM: Merge with 1.5.7+1.5.8 (See information below)552.0.0.beta3(13/02/13) OM: Merge with 1.5.7+1.5.8 (See information below)
53 OM: Allow the customize_model to be scriptable in a 56 OM: Allow the customize_model to be scriptable in a

Subscribers

People subscribed via source and target branches

to all changes: