Merge lp:~maddevelopers/mg5amcnlo/improved_survey into lp:~madteam/mg5amcnlo/trunk

[Johan Alwall]

- Improved precision of "survey" by allowing 4th iteration if accuracy after 3 iterations < 10%
- Subdivide BW in phase space integration for conflicting BWs also for forced decays, to improve generation with large bwcutoff in e.g. W+ W- production with decays.

[lp:~maddevelopers/mg5amcnlo/improved_survey]

166. By Johan Alwall on 2011-08-10

Take into account BW also when there is no minimum, and modify transpole to allow shat below xo. Doesn't seem to work very well however, so will remove this commit.

167. By Johan Alwall on 2011-08-10

Reverted the setting based on BW also in general case, since it doesn't seem to work well

[Olivier Mattelaer (olivier-mattelaer)]

You can merge.

The only point that need to be change, is the parralel test which is not working anymore.
(I think that this is due to a previous version modification)

review: Approve

[lp:~maddevelopers/mg5amcnlo/improved_survey]

168. By Johan Alwall on 2011-08-19

Use luminocity instead of number of events for refine (to allow for changing cross sections during run). Don't allow using stored events from previous iteration. Allow up to 5 iterations in survey.

169. By Johan Alwall on 2011-08-24

Fixed some typos in myamp.f (xe->xm) and added some printouts in scripts

170. By Johan Alwall on 2011-08-25

Improve treatment of heavy resonances >> s, so that BW is used only if peak available

171. By Johan Alwall on 2011-08-25

Simplified expression for shat BW check, updated UpdateNotes.

172. By Johan Alwall on 2011-08-25

Fixed insertion of colors for octet resonances decaying to octet+singlet

173. By Johan Alwall on 2011-08-25

Updated UpdateNotes and VERSION since Olivier has an intermediate version 1.3.10

=== modified file 'Template/Source/dsample.f'
--- Template/Source/dsample.f	2011-05-29 17:34:09 +0000
+++ Template/Source/dsample.f	2011-08-26 14:32:33 +0000
@@ -227,9 +227,9 @@
       if (accur .ge. 0d0 .or. cur_it .gt. itmax+3) then
         return
       endif
-c     Check for neventswritten and chi2
-      if (neventswritten .gt. -accur .and. chi2 .lt. 10d0) then
-         write(*,*) "We found enough events",neventswritten, -accur*1000*tmean
+c     Check for neventswritten and chi2 (JA 8/17/11 lumi*mean xsec)
+      if (neventswritten .gt. -accur*tmean .and. chi2 .lt. 10d0) then
+         write(*,*) "We found enough events",neventswritten, -accur*tmean
          return
       endif
       
@@ -1888,18 +1888,19 @@
 c     Update weights in dsig (needed for subprocess group mode)
             xdum=dsig(0,0,2)
 c
-c     Add test to see if we have achieved desired accuracy
+c     Add test to see if we have achieved desired accuracy 
+c     JA 8/17/2011 allow minimum 3 iterations instead of 5
 c
-            if (tsigma .gt. 0d0 .and. cur_it .gt. 5 .and. accur .gt. 0d0) then
+            if (tsigma .gt. 0d0 .and. cur_it .gt. 3 .and. accur .gt. 0d0) then
 
                xmean = tmean/tsigma
                xchi2 = (chi2/xmean/xmean-tsigma)/dble(cur_it-2)               
-               write(*,'(a,4f8.3)') 'We got it',sqrt(xchi2/tsigma),
+               write(*,'(a,4f8.3)') ' Accuracy: ',sqrt(xchi2/tsigma),
      &              accur,1/sqrt(tsigma),xchi2
 c               write(*,*) 'We got it',1d0/sqrt(tsigma), accur
 c               if (1d0/sqrt(tsigma) .lt. accur) then
                if (sqrt(xchi2/tsigma) .lt. accur) then
-                  write(*,*) 'Finished due to accuracy',sqrt(xchi2/tsigma), accur
+                  write(*,*) 'Finished due to accuracy ',sqrt(xchi2/tsigma), accur
                   tmean = tmean / tsigma
                   if (cur_it .gt. 2) then
                      chi2 = (chi2/tmean/tmean-tsigma)/dble(cur_it-2)
@@ -1929,7 +1930,7 @@
 c
 c New check to see if we need to keep integrating this one or not.
 c
-            if (cur_it .gt. 3 .and. accur .lt. 0d0) then  !Check # unweighted
+            if (cur_it .gt. 3 .and. accur .lt. 0d0) then  !Check luminocity
 c
 c             Lets get the actual number instead 
 c             tjs 5/22/2007
@@ -1953,9 +1954,10 @@
                   chi2tmp = chi2tmp+(ymean(i)-tmeant)**2/ysigma(i)**2
                enddo
                chi2tmp = chi2tmp/2d0  !Since using only last 3, n-1=2
-               write(*,*) "Checking number of events",accur,nun,' chi2: ',chi2tmp
+c     JA 8/17/2011 Redefined -accur as lumi, so nevents is -accur*cross section
+               write(*,*) "Checking number of events",-accur*tmeant,nun,' chi2: ',chi2tmp
 c     Check nun and chi2 (ja 03/11)
-               if (nun .gt. -accur .and. chi2tmp .lt. 10d0)then   
+               if (nun .gt. -accur*tmeant .and. chi2tmp .lt. 10d0)then   
                   tmean = tmean / tsigma
                   if (cur_it .gt. 2) then
                      chi2 = (chi2/tmean/tmean-tsigma)/dble(cur_it-2)

=== modified file 'Template/Source/gen_ximprove.f'
--- Template/Source/gen_ximprove.f	2011-06-01 21:18:40 +0000
+++ Template/Source/gen_ximprove.f	2011-08-26 14:32:33 +0000
@@ -658,11 +658,11 @@
          write(26,'(9x,a,2i8,a)') 'echo "',npoints,max_iter,
      $        '" >& input_sg.txt' 
 c
-c     tjs 8/7/2007  Allow stop when have enough events
+c     tjs 8/7/2007-JA 8/17/11 Allow stop when have enough luminocity
 c
          write(*,*) "Cross section",i,io(np),xsec(io(np)),mfact(io(np))
-         write(26,'(9x,a,f11.3,a)') 'echo "',-goal_lum*xsec(io(np))*1000/mjobs,
-     $        '" >> input_sg.txt'                       !Accuracy
+         write(26,'(9x,a,e13.5,a)') 'echo "',-goal_lum*1000/mjobs,
+     $        '" >> input_sg.txt'                       !Luminocity
          write(26,'(9x,a)') 'echo "2" >> input_sg.txt'  !Grid Adjustment
          write(26,'(9x,a)') 'echo "1" >> input_sg.txt'  !Suppression
          write(26,'(9x,a,i4,a)') 'echo "',nhel_refine,
@@ -681,10 +681,10 @@
          write(26,'(9x,a,2i8,a)') 'echo "',npoints,max_iter,
      $        '" >& input_sg.txt' 
 c
-c tjs 8/7/2007    Change to request events not accuracy
+c tjs 8/7/2007-JA 8/17/11    Change to request luminocity not accuracy
 c
-         write(26,'(9x,a,f11.3,a)') 'echo "',-goal_lum*xsec(io(np))*1000/mjobs,
-     $        '" >> input_sg.txt'                       !Accuracy
+         write(26,'(9x,a,e13.5,a)') 'echo "',-goal_lum*1000/mjobs,
+     $        '" >> input_sg.txt'                       !Luminocity
 c         write(26,'(9x,a,e12.3,a)') 'echo "',-goal_lum*mfact(io(np)),
 c     $        '" >> input_sg.txt'
          write(26,'(9x,a)') 'echo "0" >> input_sg.txt'

=== modified file 'Template/Source/run_config.inc'
--- Template/Source/run_config.inc	2011-05-27 23:49:50 +0000
+++ Template/Source/run_config.inc	2011-08-26 14:32:33 +0000
@@ -13,7 +13,7 @@
       integer    min_events_channel         !Minimum number of events
       parameter (min_events_channel = 1000) !per iteration in each channel
       integer    iter_survey                !Number of iterations for survey
-      parameter (iter_survey=3)
+      parameter (iter_survey=5)             ! JA 8/17/11
 c     The following sets the maximum number of parameters in the run_card.dat
       integer maxpara
       parameter (maxpara=1000)

=== modified file 'Template/SubProcesses/addmothers.f'
--- Template/SubProcesses/addmothers.f	2011-04-03 22:06:00 +0000
+++ Template/SubProcesses/addmothers.f	2011-08-26 14:32:33 +0000
@@ -214,12 +214,18 @@
      $       icolalt(2,ida(1))-icolalt(2,ida(2)).eq.0) then ! color singlet
             icolalt(1,i) = 0
             icolalt(2,i) = 0            
-          elseif(icolalt(1,ida(1))-icolalt(2,ida(2)).eq.0) then
-            icolalt(1,i) = icolalt(1,ida(2))
-            icolalt(2,i) = icolalt(2,ida(1))
-          else if(icolalt(1,ida(2))-icolalt(2,ida(1)).eq.0) then
-            icolalt(1,i) = icolalt(1,ida(1))
-            icolalt(2,i) = icolalt(2,ida(2))
+          elseif(icolalt(1,ida(1))-icolalt(2,ida(2)).eq.0) then ! 3bar 3 -> 8 or 8 8 -> 8
+            icolalt(1,i) = icolalt(1,ida(2))
+            icolalt(2,i) = icolalt(2,ida(1))
+          else if(icolalt(1,ida(2))-icolalt(2,ida(1)).eq.0) then ! 3 3bar -> 8 or 8 8 -> 8
+            icolalt(1,i) = icolalt(1,ida(1))
+            icolalt(2,i) = icolalt(2,ida(2))
+          else if(icolalt(1,ida(1)).eq.0.and.icolalt(2,ida(1)).eq.0) then ! 1 3/8 -> 3/8
+            icolalt(1,i) = icolalt(1,ida(2))
+            icolalt(2,i) = icolalt(2,ida(2))
+          else if(icolalt(1,ida(2)).eq.0.and.icolalt(2,ida(2)).eq.0) then ! 3/8 1 -> 3/8
+            icolalt(1,i) = icolalt(1,ida(1))
+            icolalt(2,i) = icolalt(2,ida(1))
           else if(icolalt(1,ida(2)).gt.0.and.icolalt(1,ida(1)).gt.0.and.
      $           icolalt(2,ida(2)).le.0.and.icolalt(2,ida(1)).le.0) then         ! sextet
             maxcolor=maxcolor+1

=== modified file 'Template/SubProcesses/cuts.f'
--- Template/SubProcesses/cuts.f	2011-06-29 09:34:40 +0000
+++ Template/SubProcesses/cuts.f	2011-08-26 14:32:33 +0000
@@ -402,11 +402,10 @@
 c     B.W. phase space cuts
 c     
       pass_bw=cut_bw(p)
-      if (lbw(0) .eq. 1) then
-         if ( pass_bw ) then
-            passcuts=.false.
-            return
-         endif
+c     JA 4/8/11 always check pass_bw
+      if ( pass_bw ) then
+         passcuts=.false.
+         return
       endif
 C     $E$DESACTIVATE_BW_CUT$E$ This is a Tag for MadWeight
 

=== modified file 'Template/SubProcesses/myamp.f'
--- Template/SubProcesses/myamp.f	2011-05-29 07:23:58 +0000
+++ Template/SubProcesses/myamp.f	2011-08-26 14:32:33 +0000
@@ -203,12 +203,11 @@
 c            write(*,*) 'Checking BW',nbw
             xmass = sqrt(dot(xp(0,i),xp(0,i)))
 c            write(*,*) 'xmass',xmass,pmass(i,iconfig)
+c
+c           Here we set if the BW is "on-shell" for LesHouches
+c
             onshell = (abs(xmass - pmass(i,iconfig)) .lt.
      $           bwcutoff*pwidth(i,iconfig))
-
-c
-c           Here we set if the BW is "on-shell" for LesHouches
-c
             if(onshell)then
 c           Only allow onshell if no "decay" to identical particle
               OnBW(i) = .true.
@@ -244,9 +243,25 @@
                  endif
               endif
             endif
-            if (onshell .and. (lbw(nbw).eq. 2) ) cut_bw=.true.
-            if (.not. onshell .and. (lbw(nbw).eq. 1)) cut_bw=.true.
+c
+c     Check if we are supposed to cut forced bw (JA 4/8/11)
+c
+            if (gForceBW(i, iconfig) .and. .not. onshell)then
+               cut_bw = .true.
+               return
+            endif
+c
+c     Here we set onshell for phase space integration (JA 4/8/11)
+c
+            onshell = (abs(xmass - pmass(i,iconfig)) .lt.
+     $           5d0*pwidth(i,iconfig))
+
+            if (onshell .and. (lbw(nbw).eq. 2) .or.
+     $          .not. onshell .and. (lbw(nbw).eq. 1)) then
+               cut_bw=.true.
 c            write(*,*) 'cut_bw: ',nbw,xmass,onshell,lbw(nbw),cut_bw
+               return
+            endif
          endif
 
       enddo
@@ -292,9 +307,6 @@
 
       logical gForceBW(-max_branch:-1,lmaxconfigs)  ! Forced BW
       include 'decayBW.inc'
-
-      double precision forced_mass
-      data forced_mass/0d0/
 c
 c     Global
 c
@@ -407,11 +419,19 @@
      &           sqrt(max(etmin(l2),0d0)*max(etmin(l1),0d0)*dr))
 c-JA 1/2009: Set grid also based on xqcut
               xm(i)=max(xm(i),max(xqcutij(l1,l2),0d0))
-              xe(i)=max(xe(i),xm(i))
             endif
 c            write(*,*) 'iconfig,i',iconfig,i
 c            write(*,*) pwidth(i,iconfig),pmass(i,iconfig)
-            if (pwidth(i,iconfig) .gt. 0 ) nbw=nbw+1
+            if (pwidth(i,iconfig) .gt. 0 ) then
+               nbw=nbw+1
+c              JA 6/8/2011 Set xe(i) for resonances
+               if (lbw(nbw).eq.1) then
+                  xm(i) = max(xm(i), pmass(i,iconfig)-5d0*pwidth(i,iconfig))
+               else if (gforcebw(i,iconfig)) then
+                  xm(i) = max(xm(i), pmass(i,iconfig)-bwcutoff*pwidth(i,iconfig))
+               endif
+            endif
+            xe(i)=max(xe(i),xm(i))
             if (pwidth(i,iconfig) .gt. 0 .and. lbw(nbw) .le. 1) then         !B.W.
 c               nbw = nbw +1
 
@@ -419,8 +439,10 @@
                   j = 3*(nexternal-2)-4+1    !set i to ndim+1
 c-----
 c tjs 11/2008 if require BW then force even if worried about energy
+c JA 8/2011 don't use BW if mass is > CM energy
 c----
-                  if(pmass(i,iconfig).ge.xe(i).and.iden_part(i).eq.0
+                  if(pmass(i,iconfig).ge.xm(i).and.iden_part(i).eq.0.and.
+     $                 pmass(i,iconfig).lt.sqrt(stot)
      $                 .or. lbw(nbw).eq.1) then
                      write(*,*) 'Setting PDF BW',j,nbw,pmass(i,iconfig)
                      spole(j)=pmass(i,iconfig)*pmass(i,iconfig)/stot
@@ -433,23 +455,18 @@
                   spole(-i)=pmass(i,iconfig)*pmass(i,iconfig)/stot
                   swidth(-i) = pwidth(i,iconfig)*pmass(i,iconfig)/stot
                   xm(i) = pmass(i,iconfig)
-c                 Remember largest BW mass for better grid setting
-                  forced_mass = max(forced_mass,
-     $                 pmass(i,iconfig)-bwcutoff*pwidth(i,iconfig))
-c RF & TJS, should start from final state particle masses, not only at resonance.
-c Therefore remove the next line.
-c                  xe(i) = max(xe(i),xm(i))
                endif
 c     JA 4/1/2011 Set grid in case there is no BW (radiation process)
-               if (swidth(-i) .eq. 0d0)then
+               if (swidth(-i) .eq. 0d0 .and.
+     $              i.ne.-(nexternal-(nincoming+1)))then
                   a=pmass(i,iconfig)**2/stot
-                  xo = xm(i)**2/stot
+                  xo = max(min(xm(i)**2/stot, 1-1d-8), 1d0/stot)
                   call setgrid(-i,xo,a,1)
                endif
             else                                  !1/x^pow
               a=pmass(i,iconfig)**2/stot
 c     JA 4/1/2011 always set grid
-              xo = max(xm(i)**2/stot, 1d-8)
+              xo = max(min(xm(i)**2/stot, 1-1d-8), 1d0/stot)
 c              if (pwidth(i, iconfig) .eq. 0d0.or.iden_part(i).gt.0) then 
               call setgrid(-i,xo,a,1)
 c              else 
@@ -458,7 +475,7 @@
 c              endif
             endif
             etot = etot+xe(i)
-            mtot=mtot+max(xm(i),xm(i))
+            mtot=mtot+xm(i)
 c            write(*,*) 'New mtot',i,mtot,xm(i)
          else                                        !t channel
 c
@@ -492,10 +509,10 @@
             xo = min(x1,x2)
 
 c           Use 1/10000 of sqrt(s) as minimum, to always get integration
-            xo = max(xo*xo/stot,1e-8)
-            if (xo.eq.1e-8)then
-               write(*,*) 'Warning: No good cutoff for shat integration found'
-               write(*,*) '         Minimum set to 1e-8*s'
+            xo = max(xo*xo/stot,1d0/stot)
+            if (xo.eq.1d0/stot)then
+               write(*,*) 'Warning: No cutoff for shat integral found'
+               write(*,*) '         Minimum set to ',1d0/stot
             endif
             a=-pmass(i,iconfig)**2/stot
 c            call setgrid(-i,xo,a,pow(i,iconfig))
@@ -507,16 +524,12 @@
       enddo
       if (abs(lpp(1)) .eq. 1 .or. abs(lpp(2)) .eq. 1) then
 c     Set minimum based on: 1) required energy 2) resonances 3) 1/10000 of sqrt(s)
-         if(forced_mass**2.lt.stot) then
-            xo = max(max(etot**2, forced_mass**2)/stot,1d-8)
-         else
-            xo = max(etot**2/stot,1d-8)
-         endif
-         if (xo.eq.1d-8) then
+         i = 3*(nexternal-2) - 4 + 1
+         xo = max(min(etot**2/stot, 1d0-1d-8),1d0/stot)
+         if (swidth(i).eq.0.and.xo.eq.1d0/stot) then
             write(*,*) 'Warning: No minimum found for integration'
-            write(*,*) '         Setting minimum to 1e-8*stot'
+            write(*,*) '         Setting minimum to ',1d0/stot
          endif
-         i = 3*(nexternal-2) - 4 + 1
 c-----------------------
 c     tjs  4/29/2008 use analytic transform for s-hat
 c-----------------------

=== modified file 'Template/SubProcesses/symmetry.f'
--- Template/SubProcesses/symmetry.f	2011-06-01 21:18:40 +0000
+++ Template/SubProcesses/symmetry.f	2011-08-26 14:32:33 +0000
@@ -135,7 +135,8 @@
       else
          write(26,*) npoints,iter_survey,
      &     '     !Number of events and iterations'      
-         write(26,*) ' 0.0    !Accuracy'
+c        JA 4/8/11 Set minimum accuracy 10%, to run 4th iteration if needed
+         write(26,*) ' 0.1    !Accuracy'
          write(26,*) ' 2       !Grid Adjustment 0=none, 2=adjust'
       endif
       write(26,*) ' 1       !Suppress Amplitude 1=yes'
@@ -254,9 +255,9 @@
                   nbw=nbw+1
                   if (pwidth(-j,i) .gt. 1d-20 .and. sprop(-j,i).ne.0) then
                      write(*,*) 'Got bw',-nbw,j
-                     if(lconflict(-j).or.gForceBW(-j,i)) then
-                        if(lconflict(-j)) write(*,*) 'Got conflict ',-nbw,j
-                        if(gForceBW(-j,i)) write(*,*) 'Got forced BW ',-nbw,j
+c                    JA 4/8/11 don't treat forced BW differently
+                     if(lconflict(-j)) then
+                        write(*,*) 'Got conflict ',-nbw,j
                         iarray(nbw)=1 !Cuts on BW
                         if (nbw .gt. imax) then
                            write(*,*) 'Too many BW w conflicts',nbw,imax
@@ -289,7 +290,7 @@
                   write(26,formstr) dconfig
                endif
                write(26,'(a$)') ' '
-               call bw_increment_array(iarray,imax,ibase,gForceBW(-imax,i),done)
+               call bw_increment_array(iarray,imax,ibase,done)
             enddo
          endif
       enddo
@@ -318,7 +319,8 @@
                   nbw=nbw+1
                   if (pwidth(-j,i) .gt. 1d-20  .and. sprop(-j,i).ne.0) then
                      write(*,*) 'Got bw',nbw,j
-                     if(lconflict(-j).or.gForceBW(-j,i)) then
+c                    JA 4/8/11 don't treat forced BW differently
+                     if(lconflict(-j)) then
                         iarray(nbw)=1 !Cuts on BW
                         if (nbw .gt. imax) then
                            write(*,*) 'Too many BW w conflicts',nbw,imax
@@ -339,7 +341,7 @@
                else
                   write(26,'(2i6)') mapconfig(i),use_config(i)
                endif
-               call bw_increment_array(iarray,imax,ibase,gForceBW(-imax,i),done)
+               call bw_increment_array(iarray,imax,ibase,done)
             enddo
          else
             write(26,'(2i6)') mapconfig(i), use_config(i)
@@ -368,7 +370,7 @@
       integer itree(2,-max_branch:-1),iconfig
       logical lconflict(-max_branch:nexternal)
       integer sprop(-max_branch:-1)  ! Propagator id
-      logical forcebw(-max_branch:-1)  ! Forced BW
+      logical forcebw(-max_branch:-1)  ! Forced BW, for identical particle conflicts
 c
 c     local
 c
@@ -533,7 +535,7 @@
 
 
 
-      subroutine bw_increment_array(iarray,imax,ibase,force,done)
+      subroutine bw_increment_array(iarray,imax,ibase,done)
 c************************************************************************
 c     Increments iarray     
 c************************************************************************
@@ -543,7 +545,6 @@
 c
       integer imax          !Input, number of elements in iarray
       integer ibase         !Base for incrementing, 0 is skipped
-      logical force(imax)   !Force onshell BW, counting from -imax to -1
       integer iarray(imax)  !Output:Array of values being incremented
       logical done          !Output:Set when no more incrementing
 
@@ -566,7 +567,7 @@
       do while (i .le. imax .and. .not. found)
          if (iarray(i) .eq. 0) then    !don't increment this
             i=i+1
-         elseif (iarray(i) .lt. ibase-1 .and. .not. force(imax+1-i)) then
+         elseif (iarray(i) .lt. ibase-1) then
             found = .true.
             iarray(i)=iarray(i)+1
          else

=== modified file 'Template/SubProcesses/unwgt.f'
--- Template/SubProcesses/unwgt.f	2011-04-20 23:22:29 +0000
+++ Template/SubProcesses/unwgt.f	2011-08-26 14:32:33 +0000
@@ -311,10 +311,11 @@
       xscale = xsec/xsum
       target_wgt = target_wgt*xscale
       rewind(lun)
-      if (nstore .le. neventswritten) then
-         write(*,*) 'No improvement in events',nstore, neventswritten
-         return
-      endif
+c     JA 8/17/2011 Don't check for previously stored events
+c      if (nstore .le. neventswritten) then
+c         write(*,*) 'No improvement in events',nstore, neventswritten
+c         return
+c      endif
       lunw = 25
       open(unit = lunw, file='events.lhe', status='unknown')
       done = .false.

=== modified file 'Template/bin/generate_events'
--- Template/bin/generate_events	2011-07-12 03:57:50 +0000
+++ Template/bin/generate_events	2011-08-26 14:32:33 +0000
@@ -136,7 +136,7 @@
     unset lhapdf
 fi
 # Compile everything in Source
-echo "Cleaning directories" > status
+echo "Compiling Source" > status
 cat status
 $dirbin/gen_crossxhtml-pl $t
 $dirbin/compile_Source
@@ -188,6 +188,7 @@
 
 touch survey
 echo "Starting jobs" > status
+cat status
 $dirbin/gen_crossxhtml-pl $t
 $dirbin/survey $mode $n $t
 error_exit
@@ -208,7 +209,7 @@
 #  Now collect the events
 #
 echo "Combining Events" >& status
-echo "Combining Events" 
+cat status
 $dirbin/gen_crossxhtml-pl $t
 pushd SubProcesses > /dev/null
 $dirbin/run_combine $mode
@@ -241,6 +242,7 @@
 
 if [[ (-x $ERAdir/ExRootLHEFConverter) && (-e unweighted_events.lhe) ]]; then
     echo "Creating Root File" >& ../status
+    cat ../status
     $dirbin/gen_crossxhtml-pl $t
     $ERAdir/ExRootLHEFConverter unweighted_events.lhe unweighted_events.root
 fi
@@ -256,8 +258,8 @@
 #    $dirbin/plot_page-pl $t
 #endif
 if [[ (-x $MAdir/plot_events) && (-e unweighted_events.lhe) && (-e ../Cards/plot_card.dat) ]]; then
-    echo "Creating Plots"
     echo "Creating Plots" >& ../status
+    cat ../status
     $dirbin/gen_crossxhtml-pl $t
     mkdir $t
     cd $t
@@ -299,9 +301,9 @@
 if [[ (-x $pydir/pythia) && (-e ../Cards/pythia_card.dat) ]]; then
     gunzip -c ${t}_unweighted_events.lhe.gz > unweighted_events.lhe
     echo "Running Pythia" >& ../status
+    cat ../status
     $dirbin/gen_crossxhtml-pl $t
 # shower and hadronize event through Pythia
-    echo "Running pythia..."
     $dirbin/run_pythia $pydir $mode  
 fi
 
@@ -314,12 +316,14 @@
 
 if [[ (-x $pydir/hep2lhe) && (-e ../Cards/pythia_card.dat) && (-e pythia_events.hep) ]]; then
     echo "Creating Pythia LHE File" >& ../status
+    cat ../status
     $dirbin/gen_crossxhtml-pl $t
     $dirbin/run_hep2lhe $pydir $mode  
 fi
 
 if [[ (-x $ERAdir/ExRootLHEFConverter) && (-e pythia_events.lhe) ]]; then
     echo "Creating Pythia LHE Root File" >& ../status
+    cat ../status
     $dirbin/gen_crossxhtml-pl $t
     $ERAdir/ExRootLHEFConverter pythia_events.lhe pythia_lhe_events.root
 fi
@@ -328,8 +332,8 @@
     $dirbin/create_matching_plots.sh $t
 fi
 if [[ (-x $MAdir/plot_events) && (-e pythia_events.lhe) && (-e ../Cards/plot_card.dat) ]]; then
-    echo "Creating Plots for Pythia"
     echo "Creating Plots for Pythia" >& ../status
+    cat ../status
     $dirbin/gen_crossxhtml-pl $t
     mkdir ${t}_pythia
     cd ${t}_pythia
@@ -353,15 +357,15 @@
 
 if [[ (-x $pgsdir/pgs) && (-e ../Cards/pgs_card.dat) ]]; then
     echo "Running PGS" >& ../status
+    cat ../status
     $dirbin/gen_crossxhtml-pl $t
     # now pass the event to a detector simulator and reconstruct objects
-    echo "Running PGS..."
 #    qsub -v pgsdir=$pgsdir $dirbin/run_pgs >> ../running_jobs
     $dirbin/run_pgs $pgsdir $mode
 else
     if [[ (-x $delphesdir/Delphes) && (-e ../Cards/delphes_card.dat) ]]; then
 	echo "Running Delphes" >& ../status
-	echo "Running Delphes..."
+	cat ../status
 	$dirbin/run_delphes $delphesdir $mode
     fi
 fi
@@ -369,13 +373,14 @@
 
 if [[ (-x $ERAdir/ExRootLHCOlympicsConverter) && (-e pgs_events.lhco) ]]; then
     echo "Creating PGS Root File" >& ../status
+    cat ../status
     $dirbin/gen_crossxhtml-pl $t
     $ERAdir/ExRootLHCOlympicsConverter pgs_events.lhco pgs_events.root
 fi
 
 if [[ (-x $MAdir/plot_events) && (-e pgs_events.lhco) && (-e ../Cards/plot_card.dat) ]]; then
-    echo "Creating Plots for PGS"
     echo "Creating Plots for PGS" >& ../status
+    cat ../status
     $dirbin/gen_crossxhtml-pl $t
     mkdir ${t}_pgs
     cd ${t}_pgs
@@ -387,8 +392,8 @@
 fi
 
 if [[ (-x $MAdir/plot_events) && (-e delphes_events.lhco) && (-e ../Cards/plot_card.dat) ]]; then
-    echo "Creating Plots for Delphes"
     echo "Creating Plots for Delphes" >& ../status
+    cat ../status
     $dirbin/gen_crossxhtml-pl $t
     mkdir ${t}_delphes
     cd ${t}_delphes
@@ -404,6 +409,7 @@
 #  Store Events
 #
 echo "Storing Events" >& status
+cat status
 $dirbin/gen_crossxhtml-pl $t
 $dirbin/store $t
 rm -f RunWeb

=== modified file 'Template/bin/refine'
--- Template/bin/refine	2011-07-06 22:40:17 +0000
+++ Template/bin/refine	2011-08-26 14:32:33 +0000
@@ -72,11 +72,12 @@
     exit
 fi
 if [[ -d SubProcesses ]]; then
-    if [[  $mode -gt 0 ]]; then    
+    if [[  $mode -eq 1 ]]; then    
 	echo "Creating Jobs" >& status
     else
-	echo " " >& status
+	echo "Running" >& status
     fi
+    $dirbin/gen_crossxhtml-pl $5
     cd SubProcesses
     r=0
     if [[ -e randinit ]]; then
@@ -109,6 +110,7 @@
 		../../bin/multicore $n $job
 		sleep 1
 	      else
+		echo "Launching job $job"
 		nice ./$job > /dev/null
 		../../bin/sum_html >/dev/null
 	      fi

=== modified file 'Template/bin/survey'
--- Template/bin/survey	2011-07-10 19:01:23 +0000
+++ Template/bin/survey	2011-08-26 14:32:33 +0000
@@ -64,11 +64,12 @@
 fi
 
 if [[ -d SubProcesses ]]; then
-    if [[  $mode -gt 0 ]]; then    
+    if [[  $mode -eq 1 ]]; then    
 	echo "Creating Jobs" >& status
     else
-	echo " " >& status
+	echo "Running" >& status
     fi
+    $dirbin/gen_crossxhtml-pl $3
     cd SubProcesses
     r=0
     if [[ -e randinit ]]; then
@@ -117,6 +118,7 @@
 		../../bin/multicore $n $job
 		sleep 1
 	    else
+		echo "Launching job $job"
 		time nice ./$job >/dev/null
 		../../bin/sum_html >/dev/null
 	    fi

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2011-08-23 12:34:44 +0000
+++ UpdateNotes.txt	2011-08-26 14:32:33 +0000
@@ -1,10 +1,27 @@
 Update notes for MadGraph 5 (in reverse time order)
 
+<<<<<<< TREE
 1.3.10 (23/08/11) OM: Update ALOHA version
                   OM: increase waiting time for jobs to write physically the results on the disks.
 		      (in ordre to reduce trouble on the cluster)
 
 1.3.9 (01/08/11)  OM: Add a new model DY_SM (arXiv:1107.5830). Thanks to Neil for the generation of the model 
+=======
+1.3.11 (26/08/11) JA: Improved precision of "survey" by allowing 4th and 5th 
+                      iteration if accuracy after 3 iterations < 10%.
+                  JA: Subdivide BW in phase space integration for conflicting BWs 
+                      also for forced decays, to improve generation with large
+                      bwcutoff in e.g. W+ W- production with decays.
+                  JA: Do refine using luminocity instead of number of events,
+                      to work with badly determined channels.
+                  JA: Don't use BW for shat if mass > sqrt(s).
+                  JA: Fixed insertion of colors for octet resonances decaying to 
+                      octet+singlet (thanks Bogdan for finding this)
+
+
+1.3.9 (01/08/11)  OM: Add a new model DY_SM (arXiv:1107.5830). Thanks to Neil
+                      for the generation of the model 
+>>>>>>> MERGE-SOURCE
 
 1.3.8 (25/07/11)  JA: Replace the SM and HEFT models with latest versions using
                       the Wolfenstein parameterization for the CKM matrix.

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2011-08-23 12:41:03 +0000
+++ madgraph/VERSION	2011-08-26 14:32:33 +0000
@@ -1,3 +1,8 @@
+<<<<<<< TREE
 version = 1.3.10
 date = 2011-08-23
+=======
+version = 1.3.11
+date = 2011-08-26
+>>>>>>> MERGE-SOURCE
 

=== modified file 'tests/acceptance_tests/test_cmd.py'
--- tests/acceptance_tests/test_cmd.py	2011-07-10 22:43:49 +0000
+++ tests/acceptance_tests/test_cmd.py	2011-08-26 14:32:33 +0000
@@ -741,15 +741,15 @@
                                            'SubProcesses',
                                            'P0_qq_gogo_go_qqn1_go_qqn1',
                                            'symfact.dat')).read(),
-                         """1.030     1
+                         """     1     1
      2    -1
      3    -1
      4    -1
-5.030     1
+     5     1
      6    -5
      7    -5
      8    -5
-9.030     1
+     9     1
     10    -9
     11    -9
     12    -9