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

[Olivier Mattelaer]

Few fixes and minor improvment (see Updates Notes)
So Johan, when you are ready with your fix, you can merge those one too.

[lp:~maddevelopers/mg5amcnlo/1.2.1]

130. By Johan Alwall on 2011-05-08

Fixed problem when s-channel mass > s_tot

[Johan Alwall (johan-alwall)]

Excellent! I have no complaints or changes :-)

I just fixed the problem that Gauthier found, so you can merge at any time.

Johan

review: Approve

=== modified file 'Template/SubProcesses/myamp.f'
--- Template/SubProcesses/myamp.f	2011-04-21 15:56:29 +0000
+++ Template/SubProcesses/myamp.f	2011-05-08 05:38:24 +0000
@@ -443,16 +443,15 @@
 c     JA 4/1/2011 Set grid in case there is no BW (radiation process)
                if (swidth(-i) .eq. 0d0)then
                   a=pmass(i,iconfig)**2/stot
-c              Ensure that xo > a
-                  xo = max(xm(i)**2/stot,a*1.01)
+                  xo = xm(i)**2/stot
                   call setgrid(-i,xo,a,1)
                endif
             else                                  !1/x^pow
               a=pmass(i,iconfig)**2/stot
-c     JA 4/1/2011 Ensure xo > a, always set grid
-              xo = max(xm(i)**2/stot,a*1.01)
+c     JA 4/1/2011 always set grid
+              xo = xm(i)**2/stot
 c              if (pwidth(i, iconfig) .eq. 0d0.or.iden_part(i).gt.0) then 
-                 call setgrid(-i,xo,a,1)
+              call setgrid(-i,xo,a,1)
 c              else 
 c                 write(*,*) 'Using flat grid for BW',i,nbw,
 c     $                pmass(i,iconfig)
@@ -499,13 +498,20 @@
 
 c               write(*,*) 'Enter minimum for ',-i, xo
 c               read(*,*) xo
-
              if (i .ne. -1 .or. .true.) call setgrid(-i,xo,a,1)
          endif
       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)
-         xo = max(max(etot**2, forced_mass**2)/stot,1e-8)
+         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
+            write(*,*) 'Warning: No minimum found for integration'
+            write(*,*) '         Setting minimum to 1e-8*stot'
+         endif
          i = 3*(nexternal-2) - 4 + 1
 c-----------------------
 c     tjs  4/29/2008 use analytic transform for s-hat

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2011-05-08 00:29:32 +0000
+++ UpdateNotes.txt	2011-05-08 05:38:24 +0000
@@ -1,5 +1,18 @@
 Update notes for MadGraph 5 (in reverse time order)
 
+<<<<<<< TREE
+=======
+
+1.2.1 (07/05/11)  OM: reduce the quantity of RAM use by matrix.f
+      	          OM: support speed of psyco if this python module is installed
+                  OM: fix a minor bug in the model parsing
+                  OM: add the check of valid model.pkl also for v4 model
+                  OM: add a check that UpdatesNotes is up-to-date when
+                      making a release
+                  JA: Fixed problem in phase space generation for
+                      s-channel mass > s_tot
+
+>>>>>>> MERGE-SOURCE
 1.2.0 (05/05/11): OM: minor fixes on check charge conjugation
                   OM: add a check on the path for the validity of the model.pkl
                   JA: Fixed problem with combine_runs on certain compilers