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

[Johan Alwall]

- Fixed critical bug 886091
- Fixed remaining problem in gridpacks (in gen_ximprove.f after moving to luminocity), as well as long-standing bugs in gridpacks that we hadn't found before, and optimized the flag min_gevents_wu. Alexis is testing this now, but even if we don't hear back from him, I'd suggest to include this in this release.
- I'm still checking another problem that Alexis complains about (with cut_decays). If I indeed find a problem in this tomorrow I might add another fix in this release - for now let's assume that it's nothing.

[lp:~maddevelopers/mg5amcnlo/fix_mirror_problem]

188. By Johan Alwall on 2011-11-04

Sorry I had left a debug printout

[Olivier Mattelaer (olivier-mattelaer)]

You said that Pierre reported the bug, but this is in fact Marco ;-)
Otherwise the modifications are fine, I'm running all the tests now to ensure that everything is fine, and in a couple of minuts, I'll approve this review

[Olivier Mattelaer (olivier-mattelaer)]

All tests passes. So it's fine.

review: Approve

[lp:~maddevelopers/mg5amcnlo/fix_mirror_problem]

189. By Johan Alwall on 2011-11-05

Whoops wrong acknowledgement in UpdateNotes

=== modified file 'Template/Source/gen_ximprove.f'
--- Template/Source/gen_ximprove.f	2011-10-22 08:33:03 +0000
+++ Template/Source/gen_ximprove.f	2011-11-05 00:51:24 +0000
@@ -41,7 +41,7 @@
       logical parallel, gen_events
       character*20 param(maxpara),value(maxpara)
       integer npara, nreq, ngran, nhel_refine
-      integer ij, kl, iseed
+      integer ij, kl, iseed, ioffset
       logical Gridpack,gridrun
       logical split_channels
       common /to_split/split_channels
@@ -80,7 +80,7 @@
          gen_events=.true.
          split_channels=.false.
          call get_integer(npara,param,value," gevents "  ,nreq  ,2000   )
-         err_goal = 1.2*nreq
+         err_goal = 1.5*nreq ! extra factor to ensure works
          call get_integer(npara,param,value," gseed "  ,iseed  ,4321   )
          call get_integer(npara,param,value," ngran "  ,ngran  , -1)
          if (ngran.eq.-1) ngran = int(sqrt(real(nreq)))
@@ -91,9 +91,12 @@
 c     Modified to allow for more sequences
 c     iseed can be between 0 and 31328*30081
 c     before patern repeats
+c     JA 11/2/2011: Check for ioffset, as in ntuple (ranmar.f)
 c
+         call get_offset(ioffset)
+         iseed = iseed * 31300       
          ij=1802 + mod(iseed,30081)
-         kl=9373 + (iseed/31328)
+         kl=9373 + (iseed/31328) + ioffset
 c         write(*,'($a,i6,a3,i6)') 'Using random seed offsets',jconfig," : ",ioffset
 c         write(*,*) ' with seed', iseed
          do while (ij .gt. 31328)
@@ -799,8 +802,8 @@
                np = 1
             endif
             ip = index(gn(i),'/')
-            write(*,*) 'Channel ',gn(i)(2:ip-1),
-     $           yerr, jpoints(i),npoints
+            write(*,*) 'Channel ',gn(i)(2:ip-1), goal_lum * xsec(i) / xtot,
+     $           npoints
 
             ip = index(gn(i),'/')
             write(26,'(2a)') 'j=',gn(i)(1:ip-1)
@@ -830,7 +833,7 @@
 c     tjs 8/7/2007  Allow stop when have enough events
 c
             write(*,*) "Cross section",i,xsec(i),mfact(i)
-            write(26,'(9x,a,e13.5,a)') 'echo "',-goal_lum/xtot,
+            write(26,'(9x,a,e13.5,a)') 'echo "',-npoints/xsec(i),
      $        '" >> 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
@@ -852,7 +855,7 @@
 c
 c tjs 8/7/2007    Change to request events not accuracy
 c
-            write(26,'(9x,a,e13.5,a)') 'echo "',-goal_lum / xtot,
+            write(26,'(9x,a,e13.5,a)') 'echo "',-npoints / xsec(i),
      $           '" >> input_sg.txt' ! Luminocity
             write(26,'(9x,a)') 'echo "0" >> input_sg.txt'
             write(26,'(9x,a)') 'echo "1" >> input_sg.txt'

=== modified file 'Template/Source/run_config.inc'
--- Template/Source/run_config.inc	2011-08-19 00:06:00 +0000
+++ Template/Source/run_config.inc	2011-11-05 00:51:24 +0000
@@ -52,4 +52,4 @@
       integer      npoints_wu,        itmax_wu !warmup # points/iterations
       parameter   (npoints_wu = 2000, itmax_wu = 8)
       integer      min_gevents_wu
-      parameter   (min_gevents_wu=1000)   !Minumum # unweighted events to generate from channel
+      parameter   (min_gevents_wu=200)   !Minumum # unweighted events to generate from channel

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2011-10-31 13:53:47 +0000
+++ UpdateNotes.txt	2011-11-05 00:51:24 +0000
@@ -1,5 +1,13 @@
 Update notes for MadGraph 5 (in reverse time order)
 
+1.3.27 (05/11/11) JA: Fix bug in mirrored amplitudes (sometimes
+                      amplitudes that should not be flagged as
+                      mirrored were flagged as mirrored). Thanks
+                      Marco Zaro for reporting this!
+                  JA: Fix another problem getting enough events in
+                      gridpack mode (it was not completely fixed in
+                      v. 1.3.24). Thanks Alexis!
+ 
 1.3.26 (31/10/11) JA: Fix color setting in MadEvent event file for
                       multiparticle vertices, which was not taken into
                       account in the upgrade in v. 1.3.18

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2011-10-31 13:53:47 +0000
+++ madgraph/VERSION	2011-11-05 00:51:24 +0000
@@ -1,2 +1,2 @@
-version = 1.3.26
-date = 2011-10-31
+version = 1.3.27
+date = 2011-11-04

=== modified file 'madgraph/core/diagram_generation.py'
--- madgraph/core/diagram_generation.py	2011-10-10 11:50:58 +0000
+++ madgraph/core/diagram_generation.py	2011-11-05 00:51:24 +0000
@@ -1566,6 +1566,10 @@
                                              d in new_amp.get('diagrams')])
         new_amp.set('diagrams', diagrams)
         new_amp.trim_diagrams()
+
+        # Make sure to reset mirror process
+        new_amp.set('has_mirror_process', False)
+        
         return new_amp
         
 #===============================================================================

=== modified file 'tests/unit_tests/core/test_diagram_generation.py'
--- tests/unit_tests/core/test_diagram_generation.py	2011-10-04 04:15:47 +0000
+++ tests/unit_tests/core/test_diagram_generation.py	2011-11-05 00:51:24 +0000
@@ -3033,6 +3033,71 @@
             #    print amplitude.get('process').nice_string()
             #print 'valid_procs = ',valid_procs
 
+    def test_multiparticle_mirror_pp_3j(self):
+        """Setting up and testing pp > 3j mirror process functionality
+        """
+
+        max_fs = 3
+
+        p = [21, 1, 2, -1, -2]
+
+        my_multi_leg = base_objects.MultiLeg({'ids': p, 'state': True});
+
+        goal_number_processes = 29
+
+        goal_legs_mirror = [\
+            ([21, 21, 21, 21, 21], False),
+            ([21, 21, 21, 1, -1], False),
+            ([21, 21, 21, 2, -2], False),
+            ([21, 1, 21, 21, 1], True),
+            ([21, 1, 1, 1, -1], True),
+            ([21, 1, 1, 2, -2], True),
+            ([21, 2, 21, 21, 2], True),
+            ([21, 2, 1, 2, -1], True),
+            ([21, 2, 2, 2, -2], True),
+            ([21, -1, 21, 21, -1], True),
+            ([21, -1, 1, -1, -1], True),
+            ([21, -1, 2, -1, -2], True),
+            ([21, -2, 21, 21, -2], True),
+            ([21, -2, 1, -1, -2], True),
+            ([21, -2, 2, -2, -2], True),
+            ([1, 1, 21, 1, 1], False),
+            ([1, 2, 21, 1, 2], True),
+            ([1, -1, 21, 21, 21], True),
+            ([1, -1, 21, 1, -1], True),
+            ([1, -1, 21, 2, -2], True),
+            ([1, -2, 21, 1, -2], True),
+            ([2, 2, 21, 2, 2], False),
+            ([2, -1, 21, 2, -1], True),
+            ([2, -2, 21, 21, 21], True),
+            ([2, -2, 21, 1, -1], True),
+            ([2, -2, 21, 2, -2], True),
+            ([-1, -1, 21, -1, -1], False),
+            ([-1, -2, 21, -1, -2], True),
+            ([-2, -2, 21, -2, -2], False)]
+
+        # Define the multiprocess
+        my_multi_leglist = base_objects.MultiLegList([copy.copy(leg) for leg in [my_multi_leg] * 5])
+
+        my_multi_leglist[0].set('state', False)
+        my_multi_leglist[1].set('state', False)
+
+        my_process_definition = base_objects.ProcessDefinition({\
+                                                 'legs':my_multi_leglist,
+                                                 'model':self.mymodel,
+                                                 'orders': {'QED': 0}})
+
+        # Calculate diagrams for all processes
+        myproc = diagram_generation.MultiProcess(my_process_definition,
+                                      collect_mirror_procs = True)
+
+        amplitudes = myproc.get('amplitudes')
+
+        legs_mirror = [([l.get('id') for l in a.get('process').get('legs')],
+                        a.get('has_mirror_process')) for a in amplitudes]
+
+        self.assertEqual(legs_mirror, goal_legs_mirror)
+
     def test_find_maximal_non_qcd_order(self):
         """Test find_maximal_non_qcd_order for different configurations
         """