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

[Johan Alwall]

- Fixed diagram symmetry for processes with no pure-3-vertex diagrams (e.g., pure 4-particle vertex processes)

[Johan Alwall (johan-alwall)]

Olivier, please feel free to add also other modifications to this branch.
Thanks,
Johan

[lp:~maddevelopers/mg5amcnlo/symfact4vertex]

147. By Johan Alwall on 2011-06-03

Moved debug writeout in cuts.f into debug

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

I'm working on the problem of the restriction model on the format of
the param_card.
(I'm adding a check of coherence of the card to ensure that all pythia
parameter are coherent
with the mg5 model)

This is also smtg important for the card translation to SLAH1

So What is the time scale for this merge? in order to see if I include
it inside that one or not?

Cheers,

Olivier

On 03-juin-11, at 06:45, Johan Alwall wrote:

> Olivier, please feel free to add also other modifications to this
> branch.
> Thanks,
> Johan
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/symfact4vertex/
> +merge/63329
> You are requested to review the proposed merge of lp:~maddevelopers/
> madgraph5/symfact4vertex into lp:madgraph5.

=== modified file 'Template/SubProcesses/cuts.f'
--- Template/SubProcesses/cuts.f	2011-06-01 21:40:33 +0000
+++ Template/SubProcesses/cuts.f	2011-06-03 05:01:17 +0000
@@ -517,7 +517,7 @@
       endif !if there are heavyjets
 
       if(inclht.lt.inclHtmin.or.inclht.gt.inclHtmax)then
-         write (*,*) ' inclhtmin=',inclHtmin,' -> fails'
+         if(debug) write (*,*) ' inclhtmin=',inclHtmin,' -> fails'
          passcuts=.false.
          return
       endif
 
=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2011-06-02 20:40:32 +0000
+++ UpdateNotes.txt	2011-06-03 05:01:17 +0000
@@ -1,5 +1,8 @@
 Update notes for MadGraph 5 (in reverse time order)
 
+1.3.2 (03/06/11): JA: Fixed diagram symmetry for case when there are
+                      no 3-vertex-only diagrams
+
 1.3.1 (02/06/11): JA: Fixed missing file bug with the introduction of
                       inclusive HT cut
 
 
=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2011-06-02 20:40:32 +0000
+++ madgraph/VERSION	2011-06-03 05:01:17 +0000
@@ -1,2 +1,2 @@
-version = 1.3.1
-date = 2011-06-02
+version = 1.3.2
+date = 2011-06-03
 
=== modified file 'madgraph/various/diagram_symmetry.py'
--- madgraph/various/diagram_symmetry.py	2011-06-01 21:18:40 +0000
+++ madgraph/various/diagram_symmetry.py	2011-06-03 05:01:17 +0000
@@ -87,10 +87,15 @@
     symmetry = []
     permutations = []
     ident_perms = []
+    process = matrix_element.get('processes')[0]
+    base_model = process.get('model')
+    diagrams = matrix_element.get('diagrams')
+    base_diagrams = matrix_element.get_base_amplitude().get('diagrams')
+    min_vert = min([max(diag.get_vertex_leg_numbers()) for diag in diagrams])
     for diag in matrix_element.get('diagrams'):
         diagram_numbers.append(diag.get('number'))
         permutations.append(range(nexternal))
-        if max(diag.get_vertex_leg_numbers()) > 3:
+        if max(diag.get_vertex_leg_numbers()) > min_vert:
             # Ignore any diagrams with 4-particle vertices
             symmetry.append(0)
         else:
@@ -106,11 +111,6 @@
                  matrix_element.get('processes')[0].nice_string().\
                  replace("Process: ", ""))
 
-    process = matrix_element.get('processes')[0]
-    base_model = process.get('model')
-    diagrams = matrix_element.get('diagrams')
-    base_diagrams = matrix_element.get_base_amplitude().get('diagrams')
-    min_vert = min([max(diag.get_vertex_leg_numbers()) for diag in diagrams])
     # diagram_tags is a list of unique tags
     diagram_tags = []
     # diagram_classes is a list of lists of diagram numbers belonging
@@ -358,10 +358,12 @@
                subproc_group.get('matrix_elements')[0].get_nexternal_ninitial()
     model = subproc_group.get('matrix_elements')[0].get('processes')[0].\
             get('model')
+    min_vert = min([max(diag.get_vertex_leg_numbers()) for diag in diagrams])
+
     for idiag,diag in enumerate(diagrams):
         diagram_numbers.append(idiag+1)
         permutations.append(range(nexternal))
-        if max(diag.get_vertex_leg_numbers()) > 3:
+        if max(diag.get_vertex_leg_numbers()) > min_vert:
             # Ignore any diagrams with 4-particle vertices
             symmetry.append(0)
         else:
@@ -370,7 +372,6 @@
     logger.info("Finding symmetric diagrams for subprocess group %s" % \
                 subproc_group.get('name'))
 
-    min_vert = min([max(diag.get_vertex_leg_numbers()) for diag in diagrams])
     # diagram_tags is a list of unique tags
     diagram_tags = []
     # diagram_classes is a list of lists of diagram numbers belonging
 
=== modified file 'tests/unit_tests/various/test_4fermion_models.py'
--- tests/unit_tests/various/test_4fermion_models.py	2011-04-20 22:34:17 +0000
+++ tests/unit_tests/various/test_4fermion_models.py	2011-06-03 05:01:17 +0000
@@ -26,7 +26,9 @@
 import madgraph.core.diagram_generation as diagram_generation
 import madgraph.core.helas_objects as helas_objects
 import madgraph.iolibs.helas_call_writers as helas_call_writers
+import madgraph.iolibs.group_subprocs as group_subprocs
 import madgraph.various.process_checks as process_checks
+import madgraph.various.diagram_symmetry as diagram_symmetry
 import models.import_ufo as import_ufo
 import models.model_reader as model_reader
 
@@ -104,6 +106,83 @@
     def test_uu_to_ttg_sch(self):
         """Test the process u u > t t g between s-channel and 4fermion vertex"""
         self.uu_to_ttng_test(1)
+
+
+    def test_find_symmetry_uu_tt(self):
+        """Test the find_symmetry function"""
+
+        myleglist = base_objects.LegList()
+
+        myleglist.append(base_objects.Leg({'id':2,
+                                           'state':False}))
+        myleglist.append(base_objects.Leg({'id':2,
+                                           'state':False}))
+        myleglist.append(base_objects.Leg({'id':6,
+                                           'state':True}))
+        myleglist.append(base_objects.Leg({'id':6,
+                                           'state':True}))
+
+        myproc = base_objects.Process({'legs':myleglist,
+                                       'model':self.base_model_4ferm})
+
+        myamplitude = diagram_generation.Amplitude(myproc)
+
+        matrix_element = helas_objects.HelasMatrixElement(myamplitude)
+
+        symmetry, perms, ident_perms = diagram_symmetry.find_symmetry(matrix_element)
+
+        self.assertEqual(symmetry, [1])
+
+        # Check that the momentum assignments work
+        process = matrix_element.get('processes')[0]
+
+        evaluator = process_checks.MatrixElementEvaluator(self.base_model_4ferm,
+                                                          auth_skipping = True,
+                                                          reuse = True)
+        
+        p, w_rambo = evaluator.get_momenta(process)
+        me_value, amp2_org = evaluator.evaluate_matrix_element(\
+                                          matrix_element, p)
+
+        for isym, (sym, perm) in enumerate(zip(symmetry, perms)):
+            new_p = [p[i] for i in perm]
+            if sym >= 0:
+                continue
+            me_value, amp2 = evaluator.evaluate_matrix_element(matrix_element,
+                                                               new_p)
+            self.assertAlmostEqual(amp2[isym], amp2_org[-sym-1])
+        
+    def test_find_symmetry_uu_tt_with_subprocess_group(self):
+        """Test the find_symmetry function for subprocess groups"""
+
+        procs = [[2,2,6,6]]
+        amplitudes = diagram_generation.AmplitudeList()
+
+        for proc in procs:
+            # Define the multiprocess
+            my_leglist = base_objects.LegList([\
+                base_objects.Leg({'id': id, 'state': True}) for id in proc])
+
+            my_leglist[0].set('state', False)
+            my_leglist[1].set('state', False)
+
+            my_process = base_objects.Process({'legs':my_leglist,
+                                               'model':self.base_model_4ferm})
+            my_amplitude = diagram_generation.Amplitude(my_process)
+            amplitudes.append(my_amplitude)
+
+        subproc_group = \
+                  group_subprocs.SubProcessGroup.group_amplitudes(amplitudes)[0]
+
+        symmetry, perms, ident_perms = diagram_symmetry.find_symmetry(\
+                                                subproc_group)
+
+        self.assertEqual(len([s for s in symmetry if s > 0]), 1)
+
+        self.assertEqual(symmetry,
+                         [1])
+
+        return
         
 #===============================================================================
 # TestTchannelModels