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

[Olivier Mattelaer]

[Olivier Mattelaer (olivier-mattelaer)]

Since this affects the matching,
It would be nice to release this version as soon as possible.

Thanks,

Olivier

[Johan Alwall (johan-alwall)]

Hello Olivier,

Let's include also the fix for the C++ output problem. I will remove my modifications to myamp.f, since they don't work very well and Tim still haven't had a chance to look at it. We'll include that in the next release instead.

Cheers,
Johan

[lp:~maddevelopers/mg5amcnlo/1.4.6]

225. By Olivier Mattelaer on 2012-05-11

fixed the problem in aloha pointed in question #196755

226. By Olivier Mattelaer on 2012-05-11

merge with Johan modifications

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

For me this is ok for the merge as soon as you have run the parralel test (at least for the mssm)
since you have change the call for the conjugate routines, it's better to cross-check that.

Cheers,

Olivier

review: Approve

[lp:~maddevelopers/mg5amcnlo/1.4.6]

227. By Olivier Mattelaer on 2012-05-14

change the SM to include the 4h (need to update the tests)

228. By mattelaer-olivier on 2012-05-14

fix the tests linked to the change of the SM model

229. By Olivier Mattelaer on 2012-05-15

fix aloha: fix the C++ output for conjugate routine (problem with the mass)

[Olivier Mattelaer (olivier-mattelaer)]

Ok I've runned the parralel test, and one test fails:
AssertionError: 'Failed for processes:\nh h > h h 1.2614627423e-01 2.2114578554e-02 7.0168013823e-01 ' != 'Failed for processes:'

So this sounds expected since the SM changed in order to include the 4h interactions.

So Everything is perfect on that side.

Just for your information the way to run the parralel test are only
./tests/test_manager.py -p P
some test_short fails when runned in that way (due to modification on the disk)
so you need to rerun those one to be sure:
./tests/test_manager.py -p P test_short.*

Cheers,

Olivier

[lp:~maddevelopers/mg5amcnlo/1.4.6]

230. By Olivier Mattelaer on 2012-05-16

add the cross-section/number of event in the banner
correct the parralel test for future used

[Olivier Mattelaer (olivier-mattelaer)]

Could I make the merge?

Cheers,

Olivier

[lp:~maddevelopers/mg5amcnlo/1.4.6]

231. By Johan Alwall on 2012-05-16

Fixed some language in UpdateNotes and Template/README file

[Johan Alwall (johan-alwall)]

Hello Olivier,

A comment: The possibility to give commands as command line arguments is very close to perfect, but not quite:
bin/madevent "set automatic_html_opening False;generate_events -f"
gives:
ERROR: set automatic_html_opening False;generate_events -f not a valid command. Please retry

The same line works perfectly when I give it using echo.

Shouldn't this work? It should be easy to make it work too right?

Cheers,
Johan

[lp:~maddevelopers/mg5amcnlo/1.4.6]

232. By Johan Alwall on 2012-05-16

Fixed spelling error in README file

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

I'm surprised about the error message, I was more expecting an error
of the type:
-bash: generate_events: command not found
since the ';' should be interpreted by bash as a end of line separator
by bash in itself.

I just test it on my computer and in fact I have the above error.

So if you want to implement test for your computer, please do it, but
very careful since this is not working
on all machine,

Cheers,

Olivier

PS: One solution (working on my computer)
  is to echap the ;

[PROC_sm_0]$ ./bin/madevent set automatic_html_opening False\;
generate_events -f
Running MG5 in debug mode
...

On 15-mai-12, at 22:58, Johan Alwall wrote:

> Hello Olivier,
>
> A comment: The possibility to give commands as command line
> arguments is very close to perfect, but not quite:
> bin/madevent "set automatic_html_opening False;generate_events -f"
> gives:
> ERROR: set automatic_html_opening False;generate_events -f not a
> valid command. Please retry
>
> The same line works perfectly when I give it using echo.
>
> Shouldn't this work? It should be easy to make it work too right?
>
> Cheers,
> Johan
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/1.4.6/+merge/
> 105385
> You proposed lp:~maddevelopers/madgraph5/1.4.6 for merging.

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

I just understand why I didn't produce the same error as you.
You add " " to the command which is indeed not a valid command,
those are automatically removed by the echo (explaining why this work
with echo)
The correct solution is to echap the semi-column.

Cheers,

Olivier

On 15-mai-12, at 23:34, Olivier Mattelaer wrote:

> Hi Johan,
>
> I'm surprised about the error message, I was more expecting an error
> of the type:
> -bash: generate_events: command not found
> since the ';' should be interpreted by bash as a end of line separator
> by bash in itself.
>
> I just test it on my computer and in fact I have the above error.
>
> So if you want to implement test for your computer, please do it, but
> very careful since this is not working
> on all machine,
>
> Cheers,
>
> Olivier
>
> PS: One solution (working on my computer)
> is to echap the ;
>
> [PROC_sm_0]$ ./bin/madevent set automatic_html_opening False\;
> generate_events -f
> Running MG5 in debug mode
> ...
>
>
> On 15-mai-12, at 22:58, Johan Alwall wrote:
>
>> Hello Olivier,
>>
>> A comment: The possibility to give commands as command line
>> arguments is very close to perfect, but not quite:
>> bin/madevent "set automatic_html_opening False;generate_events -f"
>> gives:
>> ERROR: set automatic_html_opening False;generate_events -f not a
>> valid command. Please retry
>>
>> The same line works perfectly when I give it using echo.
>>
>> Shouldn't this work? It should be easy to make it work too right?
>>
>> Cheers,
>> Johan
>> --
>> https://code.launchpad.net/~maddevelopers/madgraph5/1.4.6/+merge/
>> 105385
>> You proposed lp:~maddevelopers/madgraph5/1.4.6 for merging.
>
>
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/1.4.6/+merge/
> 105385
> You proposed lp:~maddevelopers/madgraph5/1.4.6 for merging.

=== modified file 'Template/Cards/run_card.dat'
--- Template/Cards/run_card.dat	2012-03-20 03:12:06 +0000
+++ Template/Cards/run_card.dat	2012-05-16 04:17:21 +0000
@@ -195,6 +195,17 @@
  1d5 = ptj4max ! maximum pt for the fourth jet in pt
  0   = cutuse  ! reject event if fails any (0) / all (1) jet pt cuts
 #*********************************************************************
+# Control the pt's of leptons sorted by pt                           *
+#*********************************************************************
+ 0   = ptl1min ! minimum pt for the leading lepton in pt
+ 0   = ptl2min ! minimum pt for the second lepton in pt
+ 0   = ptl3min ! minimum pt for the third lepton in pt
+ 0   = ptl4min ! minimum pt for the fourth lepton in pt
+ 1d5 = ptl1max ! maximum pt for the leading lepton in pt 
+ 1d5 = ptl2max ! maximum pt for the second lepton in pt
+ 1d5 = ptl3max ! maximum pt for the third lepton in pt
+ 1d5 = ptl4max ! maximum pt for the fourth lepton in pt
+#*********************************************************************
 # Control the Ht(k)=Sum of k leading jets                            *
 #*********************************************************************
  0   = htjmin ! minimum jet HT=Sum(jet pt)

=== modified file 'Template/README'
--- Template/README	2012-03-24 03:06:44 +0000
+++ Template/README	2012-05-16 04:17:21 +0000
@@ -1,9 +1,8 @@
 MadGraph/MadEvent 5
-By Fabio Maltoni, Tim Stelzer and the CP3 development team
+By Johan Alwall, Michel Herquet, Fabio Maltoni, Olivier Mattelaer and Tim Stelzer
 
 http://madgraph.phys.ucl.ac.be/
 http://madgraph.hep.uiuc.edu/
-http://madgraph.roma2.infn.it/
 
 Information on the process to be generated is found in the file
 index.html in this directory, which should be viewed using your web
@@ -11,8 +10,14 @@
 process. Please refer to the README file one directory above this
 (MadGraph5_vx_x_x/) for instructions on how to generate a process.
 
+This README includes information on how 
+A) generate events
+B) how to run in cluster/multi-core mode
+C) how to launch sequential run (called multi-run)
+D) How to launch Pythia/PGS/Delphes
+E) How to prevent automatic opening of html pages
 
-To generate events:
+A) To generate events:
 -------------------
 
 1) Specify the model parameters. The model parameters include masses
@@ -32,7 +37,7 @@
 example file.
 **Warning!** For several reasons, avoid running more than 100,000
 events per run. Instead perform several runs to reach the luminosity
-you need, e.g. using the bin/multi_run script. Subsequent runs
+you need, e.g. using the multi_run describe below. Subsequent runs
 automatically update the random seed, so the results from different
 runs are statistically independent.
 
@@ -42,17 +47,27 @@
 4) Follow the generation and look at the results in the file
 HTML/crossx.html, using your web browser.
 
-5) If you want to run Pythia and/or PGS/Delphes on the events,
-download the Pythia/PGS package (and Delphes) and untar one directory
-above this (the MadGraph5 directory) and run make. Make sure the cards
-pythia_card.dat and pgs_card.dat are present in the Cards/ directory.
-If this is the case, Pythia and PGS will automatically be run by
-generate_events, or, for an existing run, use bin/run_pythia and
-bin/run_pgs.
-
-
-Running in cluster or multicore mode:
--------------------------------------
+5) If you want to run Pythia and/or PGS/Delphes on the events.
+You first need to install it. For this launch MG5 ($MG5PATH/bin/mg5)
+and type `install pythia-pgs`/ `install Delphes`.
+If they are detected, the first question asked when launching ./bin/generate_events
+should be something like:
+Which programs do you want to run?
+  0 / auto    : running existing card
+  1 / parton  :  Madevent
+  2 / pythia  : MadEvent + Pythia.
+  3 / pgs     : MadEvent + Pythia + PGS.
+ [0, 1, 2, 3, auto, parton, pythia, pgs][20s to answer] 
+if this is not that means that you need to specify the path of the new program
+in the file Cards/me5_configuration.txt . By default they are 
+installed in the MG5 directory.
+
+If you need to run one of those programs on some events which are already generated
+please see instructions below.
+
+
+B) Running in cluster or multicore mode:
+----------------------------------------
 
 In order to automatically run in cluster or multicore mode, please set
 the flag run_mode in the Cards/me5_configuration.txt file (or in the
@@ -65,4 +80,55 @@
 You can also specify the cluster type (for cluster mode) or your
 preferred number of CPUs (for multicore mode - note that by default,
 the maximum number of cores is used) by setting cluster_type and
-nb_core.
\ No newline at end of file
+nb_core.
+
+
+C) Launch sequential runs for generation of large number of events:
+-------------------------------------------------------------------
+
+For various reason, we recommend not to generate more than 100k events
+per run. In order to simplify generating large numbers of events,
+we have created a special command 'multi_run', which is equivalent to
+running generate_events multiple times (ensuring that the random seed is
+different for each run), and also automatically combines the resulting
+lhe files into a single file.
+This command can be launched via the madevent user interface
+./bin/madevent using the following command:
+multi_run NBRUN [RUN_NAME] [options]
+For more information about this command (valid options), you can type
+`help multi_run` inside the interface.
+
+Note that you can also launch a command whithout entering the interactive mode:
+./bin/madevent multi_run NBRUN 
+
+
+D) Launching pythia/pgs/delphes on a (previously) generated sample:
+-------------------------------------------------------------------
+
+In this section, I will presupose that the corresponding package is
+already installed and configured properly. (See section how to generate 
+events if this is not the case)
+
+In order to launch pythia/pgs/delphes on a sample, you need first to
+launch the interactive session of madevent `./bin/madevent`
+and then you can enter of the following command
+pythia RUN [--run_options]
+pgs RUN [--run_options]
+delphes RUN [--run_options]
+where RUN is the run_name of the run. One of the convenient options is
+--tag=XXXX
+which allow to specify the tag name in case of multiple runs with
+the same program. Note that by default, a unique run tag is generated 
+for each time you run.
+
+E) How to prevent automatic opening of the crossx.html page:
+------------------------------------------------------------
+
+Edit the file ./Cards/me5_configuration.txt and set
+the option automatic_html_opening to `False`.
+You can also edit the MG5 configuration card
+input/mg5_configuration.txt
+in order to have this value on False by default for all subsequently 
+generated processes.
+
+

=== modified file 'Template/Source/cuts.inc'
--- Template/Source/cuts.inc	2011-06-02 20:40:32 +0000
+++ Template/Source/cuts.inc	2012-05-16 04:17:21 +0000
@@ -29,6 +29,8 @@
       REAL*8 cutuse
       REAL*8 ptj1min,ptj2min,ptj3min,ptj4min
       REAL*8 ptj1max,ptj2max,ptj3max,ptj4max
+      REAL*8 ptl1min,ptl2min,ptl3min,ptl4min
+      REAL*8 ptl1max,ptl2max,ptl3max,ptl4max
       REAL*8 ht2min,ht3min,ht4min
       REAL*8 ht2max,ht3max,ht4max
       REAL*8 htjmin,htjmax,ihtmin,ihtmax
@@ -48,6 +50,10 @@
      &     ptj2min,ptj2max,
      &     ptj3min,ptj3max,
      &     ptj4min,ptj4max,
+     &     ptl1min,ptl1max,
+     &     ptl2min,ptl2max,
+     &     ptl3min,ptl3max,
+     &     ptl4min,ptl4max,
      &     cutuse,
      &     ht2min,ht3min,ht4min,
      &     ht2max,ht3max,ht4max,

=== modified file 'Template/Source/setrun.f'
--- Template/Source/setrun.f	2011-10-05 16:27:00 +0000
+++ Template/Source/setrun.f	2012-05-16 04:17:21 +0000
@@ -264,6 +264,19 @@
 	call get_real   (npara,param,value,"cutuse",cutuse,0d0)
 
 c*********************************************************************
+c Check   the pt's of leptons sorted by pt                           *
+c*********************************************************************
+
+ 	call get_real   (npara,param,value,"ptl1min",ptl1min,0d0)
+ 	call get_real   (npara,param,value,"ptl1max",ptl1max,1d5)
+ 	call get_real   (npara,param,value,"ptl2min",ptl2min,0d0)
+ 	call get_real   (npara,param,value,"ptl2max",ptl2max,1d5)
+ 	call get_real   (npara,param,value,"ptl3min",ptl3min,0d0)
+ 	call get_real   (npara,param,value,"ptl3max",ptl3max,1d5)
+ 	call get_real   (npara,param,value,"ptl4min",ptl4min,0d0)
+ 	call get_real   (npara,param,value,"ptl4max",ptl4max,1d5)
+
+c*********************************************************************
 c Check  Ht                                                          *
 c*********************************************************************
 

=== modified file 'Template/SubProcesses/addmothers.f'
--- Template/SubProcesses/addmothers.f	2012-02-08 08:52:30 +0000
+++ Template/SubProcesses/addmothers.f	2012-05-16 04:17:21 +0000
@@ -29,7 +29,7 @@
 c     Variables for combination of color indices (including multipart. vert)
       integer maxcolmp
       parameter(maxcolmp=20)
-      integer ncolmp,icolmp(2,maxcolmp)
+      integer ncolmp,icolmp(2,maxcolmp),is_colors(2,nincoming)
 
       double precision ZERO
       parameter (ZERO=0d0)
@@ -145,7 +145,19 @@
 
 c     Store original maxcolor to know if we have epsilon vertices
         maxorg=maxcolor
-
+c     Keep track of IS colors that go through to final state
+c     (since we shouldn't replace pop-up indices with those)
+        do i=1,nincoming
+           do j=1,2
+              is_colors(j,i)=0
+              do k=3,nexternal
+                 if (iabs(icolalt(j,i)).eq.iabs(icolalt(j,k))) then
+c                This color is going through to FS
+                    is_colors(j,i)=iabs(icolalt(j,i))
+                 endif
+              enddo
+           enddo
+        enddo
 c     
 c     Get mother information from chosen graph
 c     
@@ -212,7 +224,7 @@
 c             print *,'t-channel: ',i,ida(1),ida(2),mo_color
 c             print *,'colors: ',((icolmp(j,k),j=1,2),k=1,ncolmp)
              maxcolor=fix_tchannel_color(mo_color,maxcolor,
-     $                                   ncolmp,icolmp,i,icolalt)
+     $                        ncolmp,icolmp,i,icolalt,is_colors)
              tchannel=.true.
              cycle
           else
@@ -264,17 +276,23 @@
 c          print *,'s-channel: ',i,mo_color,ida(1),ida(2)
 c          print *,'colors: ',((icolmp(j,k),j=1,2),k=1,ncolmp)
           if(mo_color.eq.1) then ! color singlet
-             maxcolor=elim_indices(0,0,ncolmp,icolmp,i,icolalt,maxcolor)
+             maxcolor=elim_indices(0,0,ncolmp,icolmp,i,icolalt,
+     $            is_colors,maxcolor)
           elseif(mo_color.eq.-3) then ! color anti-triplet
-             maxcolor=elim_indices(0,1,ncolmp,icolmp,i,icolalt,maxcolor)
+             maxcolor=elim_indices(0,1,ncolmp,icolmp,i,icolalt,
+     $            is_colors,maxcolor)
           elseif(mo_color.eq.3) then ! color triplet
-             maxcolor=elim_indices(1,0,ncolmp,icolmp,i,icolalt,maxcolor)
+             maxcolor=elim_indices(1,0,ncolmp,icolmp,i,icolalt,
+     $            is_colors,maxcolor)
           elseif(mo_color.eq.-6) then ! color anti-sextet
-             maxcolor=elim_indices(0,2,ncolmp,icolmp,i,icolalt,maxcolor)
+             maxcolor=elim_indices(0,2,ncolmp,icolmp,i,icolalt,
+     $            is_colors,maxcolor)
           elseif(mo_color.eq.6) then ! color sextet
-             maxcolor=elim_indices(2,0,ncolmp,icolmp,i,icolalt,maxcolor)
+             maxcolor=elim_indices(2,0,ncolmp,icolmp,i,icolalt,
+     $            is_colors,maxcolor)
           elseif(mo_color.eq.8) then ! color octet
-             maxcolor=elim_indices(1,1,ncolmp,icolmp,i,icolalt,maxcolor)
+             maxcolor=elim_indices(1,1,ncolmp,icolmp,i,icolalt,
+     $            is_colors,maxcolor)
           else ! 2 indicates multipart. vertex
              da_color(1) = get_color(jpart(1,ida(1)))
              da_color(2) = get_color(jpart(1,ida(2)))
@@ -450,7 +468,7 @@
 
 c********************************************************************
       function fix_tchannel_color(mo_color,maxcolor,ncolmp,icolmp,ires,
-     $                            icol)
+     $                            icol,is_colors)
 c********************************************************************
 c     Successively eliminate identical pairwise color indices from the
 c     icolmp list, until only (max) one triplet and one antitriplet remains
@@ -461,6 +479,7 @@
       integer fix_tchannel_color
       integer mo_color,maxcolor,ncolmp,icolmp(2,*)
       integer ires,icol(2,-nexternal+2:2*nexternal-3)
+      integer is_colors(2,nincoming)
       integer i,j,i3,i3bar,max3,max3bar,min3,min3bar,maxcol,mincol
 
 c     Successively eliminate color indices in pairs until only the wanted
@@ -478,26 +497,18 @@
       i3bar=0
       icol(1,ires)=0
       icol(2,ires)=0
-      min3=1000
-      max3=0
-      min3bar=1000
-      max3bar=0
       do i=1,ncolmp
          if(icolmp(1,i).gt.0)then
             i3=i3+1
 c           color for t-channels needs to be reversed
             if(i3.eq.1) icol(2,ires)=icolmp(1,i)
             if(i3.eq.2) icol(1,ires)=-icolmp(1,i)
-            if(icolmp(1,i).gt.max3) max3=icolmp(1,i)
-            if(icolmp(1,i).lt.min3) min3=icolmp(1,i)
          endif
          if(icolmp(2,i).gt.0)then
             i3bar=i3bar+1
 c           color for t-channels needs to be reversed
             if(i3bar.eq.1) icol(1,ires)=icolmp(2,i)
             if(i3bar.eq.2) icol(2,ires)=-icolmp(2,i)
-            if(icolmp(2,i).gt.max3bar) max3bar=icolmp(2,i)
-            if(icolmp(2,i).lt.min3bar) min3bar=icolmp(2,i)
          endif
       enddo
 
@@ -513,7 +524,10 @@
       if(mo_color.eq.8.and.i3.eq.1.and.i3bar.eq.1) return
 
 c     Make sure that max and min don't come from the same octet
-      call clean_max_min(icolmp,ncolmp,max3,min3,max3bar,min3bar,i3,i3bar)
+      call find_max_min(icolmp,ncolmp,max3,min3,max3bar,min3bar,
+     $     i3,i3bar,is_colors)
+c      print *,'After finding: ',ncolmp,((icolmp(j,i),j=1,2),i=1,ncolmp)
+c      print *,'mo_color = ',mo_color
 
       if(mo_color.le.1.and.i3-i3bar.eq.2.or.
      $   mo_color.le.1.and.i3bar-i3.eq.2.or.
@@ -533,6 +547,17 @@
          enddo
 c         print *,'Replaced ',maxcol,' by ',mincol
       elseif(mo_color.le.1.and.i3.eq.2.and.i3bar.eq.2) then
+c     Ensure that max > min
+         if(max3bar.lt.min3)then
+            i=min3
+            min3=max3bar
+            max3bar=i
+         endif
+         if(max3.lt.min3bar)then
+            i=min3bar
+            min3bar=max3
+            max3=i
+         endif
 c     Replace the maximum indices with the minimum ones everywhere
          do i=ires+1,-1
             do j=1,2
@@ -597,7 +622,8 @@
       end
 
 c*******************************************************************
-      function elim_indices(n3,n3bar,ncolmp,icolmp,ires,icol,maxcolor)
+      function elim_indices(n3,n3bar,ncolmp,icolmp,ires,icol,
+     $     is_colors,maxcolor)
 c*******************************************************************
 c     Successively eliminate identical pairwise color indices from the
 c     icolmp list, until only the wanted indices remain
@@ -614,6 +640,7 @@
       integer elim_indices
       integer n3,n3bar,ncolmp,icolmp(2,*),maxcolor
       integer ires,icol(2,-nexternal+2:2*nexternal-3)
+      integer is_colors(2,nincoming)
       integer i,j,i3,i3bar
 
 c     Successively eliminate color indices in pairs until only the wanted
@@ -669,7 +696,8 @@
      $          n3.eq.1.and.n3bar.eq.1.and.i3-i3bar.eq.0.or.
      $          n3.eq.0.and.n3bar.eq.0.and.i3-i3bar.eq.0)then
 c        We have a previous epsilon which gives the wrong pop-up index
-            call fix_s_color_indices(n3,n3bar,i3,i3bar,ncolmp,icolmp,ires,icol)
+            call fix_s_color_indices(n3,n3bar,i3,i3bar,ncolmp,icolmp,
+     $           ires,icol,is_colors)
          else
 c           Don't know how to deal with this
             call write_error(1001,n3,n3bar)
@@ -683,7 +711,7 @@
 
 c*******************************************************************
       subroutine fix_s_color_indices(n3,n3bar,i3,i3bar,ncolmp,icolmp,
-     $                             ires,icol)
+     $                             ires,icol,is_colors)
 c*******************************************************************
 c
 c     Fix color flow if some particle has got the wrong pop-up color
@@ -694,37 +722,27 @@
       include 'nexternal.inc'
       integer n3,n3bar,ncolmp,icolmp(2,*),maxcolor
       integer ires,icol(2,-nexternal+2:2*nexternal-3)
+      integer is_colors(2,nincoming)
       integer i,j,i3,i3bar
       integer max_n3,max_n3bar,min_n3,min_n3bar,maxcol,mincol
 
-      max_n3=0
-      max_n3bar=0
-      min_n3=1000
-      min_n3bar=1000
-      do i=1,ncolmp
-         if(icolmp(1,i).gt.max_n3)
-     $        max_n3=icolmp(1,i)
-         if(icolmp(2,i).gt.max_n3bar)
-     $        max_n3bar=icolmp(2,i)
-         if(icolmp(1,i).gt.0.and.icolmp(1,i).lt.min_n3)
-     $        min_n3=icolmp(1,i)
-         if(icolmp(2,i).gt.0.and.icolmp(2,i).lt.min_n3bar)
-     $        min_n3bar=icolmp(2,i)
-      enddo
-
       icol(1,ires)=0
       icol(2,ires)=0
 
+c      print *,'Colors: ',ncolmp,((icolmp(j,i),j=1,2),i=1,ncolmp)
+c      print *,'n3,n3bar,i3,i3bar: ',n3,n3bar,i3,i3bar
+
 c     Make sure that max and min don't come from the same octet
-      call clean_max_min(icolmp,ncolmp,max_n3,min_n3,
-     $                   max_n3bar,min_n3bar,i3,i3bar)
+      call find_max_min(icolmp,ncolmp,max_n3,min_n3,
+     $                   max_n3bar,min_n3bar,i3,i3bar,is_colors)
+c      print *,'max3,min3bar,min3,max3bar: ',max_n3,min_n3bar,min_n3,max_n3bar
 
       if(n3.eq.1.and.n3bar.eq.0.and.i3-i3bar.eq.n3.or.
      $   n3bar.eq.1.and.n3.eq.0.and.i3bar-i3.eq.n3bar.or.
      $   n3bar.eq.1.and.n3.eq.1.and.i3bar-i3.eq.0.or.
      $   n3bar.eq.0.and.n3.eq.0.and.i3bar-i3.eq.0)then
 c     Replace the highest 3bar-index with the lowest 3-index,
-c     and vice versa
+c     or vice versa
          maxcol=max(max_n3,max_n3bar)
          if(maxcol.eq.max_n3) then
             mincol=min_n3bar
@@ -754,73 +772,117 @@
       end
 
 c*******************************************************************************
-      subroutine clean_max_min(icolmp,ncolmp,max3,min3,max3bar,min3bar,i3,i3bar)
+      subroutine find_max_min(icolmp,ncolmp,max3,min3,max3bar,min3bar,
+     $     i3,i3bar,is_colors)
 c*******************************************************************************
       implicit none
+      include 'nexternal.inc'
       integer ncolmp,icolmp(2,*)
-      integer i,j,max3,max3bar,min3,min3bar,i3,i3bar
-      
-c     Make sure that max and min don't come from the same octet
+      integer is_colors(2,nincoming)
+      integer i,j,k,max3,max3bar,min3,min3bar,i3,i3bar,i3now,i3barnow
+      integer allpairs(2,nexternal),npairs,maxcol,mincol
+
+      i3now=i3
+      i3barnow=i3bar
+
+c     Create all possible pairs (3,3bar) that
+c     1. come from different octets, 2. are different, 
+c     3. don't contain any color lines passing through the event
+      npairs = 0
+      do 20 i=1,ncolmp
+         if(icolmp(1,i).eq.0) goto 20
+         do k=1,nincoming
+            if(icolmp(1,i).eq.is_colors(1,k)) goto 20
+         enddo
+         do 10 j=1,ncolmp
+            if(i.eq.j.or.icolmp(2,j).eq.0.or.
+     $           icolmp(1,i).eq.icolmp(2,j)) goto 10
+            do k=1,nincoming
+               if(icolmp(2,j).eq.is_colors(2,k)) goto 10
+            enddo
+            npairs=npairs+1
+            allpairs(1,npairs)=icolmp(1,i)
+            allpairs(2,npairs)=icolmp(2,j)
+ 10      enddo
+ 20   enddo
+
+c      print *,'is_colors: ',((is_colors(i,j),i=1,2),j=1,nincoming)
+c      print *,'pairs: ',((allpairs(i,j),i=1,2),j=1,npairs)
+
+c     Find the pairs with maximum 3 and 3bar
+      min3=1000
+      min3bar=1000
+      max3=0
+      max3bar=0
+      do i=1,npairs
+         if(allpairs(1,i).gt.max3.and.
+     $      (allpairs(2,i).lt.max3bar.or.
+     $       allpairs(1,i).gt.allpairs(2,i)))then
+            max3=allpairs(1,i)
+            min3bar=allpairs(2,i)
+         else if(allpairs(2,i).gt.max3bar.and.
+     $           (allpairs(1,i).lt.max3.or.
+     $            allpairs(2,i).gt.allpairs(1,i)))then
+            max3bar=allpairs(2,i)
+            min3=allpairs(1,i)
+         endif
+      enddo
+
+c     Find "maximum" pairs with minimum 3 and 3bar
+      do i=1,npairs
+         if(allpairs(1,i).eq.max3.and.
+     $        allpairs(2,i).lt.min3bar.and.
+     $        allpairs(2,i).ne.max3bar)
+     $        min3bar=allpairs(2,i)
+         if(allpairs(2,i).eq.max3bar.and.
+     $        allpairs(1,i).lt.min3.and.
+     $        allpairs(1,i).ne.max3)
+     $        min3=allpairs(1,i)
+      enddo
+
+      if (max3.gt.0.and.max3bar.gt.0) then
+c       We have found our two pairs, so we're done
+         return
+      endif
+
+      if(max3.gt.0.or.max3bar.gt.0)then
+         i3now=i3now-1
+         i3barnow=i3barnow-1
+      endif
+
+c     Find pair for non-maximum (where we allow all colors)
+      maxcol=max(max3,max3bar)
+      if(maxcol.eq.max3) then
+         mincol=min3bar
+      else
+         mincol=min3
+      endif
+
+      npairs=0
       do i=1,ncolmp
-         if(icolmp(1,i).eq.max3.and.icolmp(2,i).eq.min3bar)then
-            min3bar=1000
-            do j=1,ncolmp
-               if(j.eq.i) cycle
-               if(icolmp(2,j).lt.min3bar) min3bar=icolmp(2,j)
-            enddo
-         endif
-         if(icolmp(2,i).eq.max3bar.and.icolmp(1,i).eq.min3)then
-            min3=1000
-            do j=1,ncolmp
-               if(j.eq.i) cycle
-               if(icolmp(1,j).lt.min3) min3=icolmp(1,j)
-            enddo
-         endif
+         if(icolmp(1,i).eq.0.and.i3now.gt.0) cycle
+         if(icolmp(1,i).eq.maxcol.or.icolmp(1,i).eq.mincol)
+     $        cycle
+         do j=1,ncolmp
+            if(icolmp(2,j).eq.0.and.i3barnow.gt.0) cycle
+            if(i.eq.j.or.icolmp(1,i).eq.icolmp(2,j)) cycle
+            if(icolmp(2,j).eq.maxcol.or.icolmp(2,j).eq.mincol)
+     $           cycle
+            npairs=npairs+1
+            allpairs(1,npairs)=icolmp(1,i)
+            allpairs(2,npairs)=icolmp(2,j)
+         enddo
       enddo
-
-c     ...and that max and min are different
-      if(i3.gt.1.and.max3.eq.min3.or.i3bar.gt.1.and.max3bar.eq.min3bar)then
-         if(max3.gt.max3bar)then
-c        Need to change min3, while still ensuring that max3bar is ok
-            max3bar=0
-            min3=1000
-            do i=1,ncolmp
-               if(icolmp(2,i).gt.max3bar.and.icolmp(2,i).ne.min3bar)
-     $              max3bar=icolmp(2,i)
-               if(icolmp(1,i).lt.min3.and.icolmp(1,i).ne.max3)
-     $              min3=icolmp(1,i)
-            enddo
-c     Make sure that max3bar and min3 don't come from the same octet
-            do i=1,ncolmp
-               if(icolmp(2,i).eq.max3bar.and.icolmp(1,i).eq.min3)then
-                  min3=1000
-                  do j=1,ncolmp
-                     if(j.eq.i.or.icolmp(1,j).eq.max3) cycle
-                     if(icolmp(1,j).lt.min3) min3=icolmp(1,j)
-                  enddo
-               endif
-            enddo
+      if(npairs.ge.1)then
+         if(maxcol.eq.max3)then
+            min3=allpairs(1,1)
+            max3bar=allpairs(2,1)
          else
-c        Need to change min3bar, while still ensuring that max3 is ok
-            max3=0
-            min3bar=1000
-            do i=1,ncolmp
-               if(icolmp(1,i).gt.max3.and.icolmp(1,i).ne.min3)
-     $              max3=icolmp(1,i)
-               if(icolmp(2,i).lt.min3bar.and.icolmp(2,i).ne.max3bar)
-     $              min3bar=icolmp(2,i)
-            enddo
-c     Make sure that max3 and min3bar don't come from the same octet
-            do i=1,ncolmp
-               if(icolmp(1,i).eq.max3.and.icolmp(2,i).eq.min3bar)then
-                  min3bar=1000
-                  do j=1,ncolmp
-                     if(j.eq.i.or.icolmp(2,j).eq.max3bar) cycle
-                     if(icolmp(2,j).lt.min3bar) min3bar=icolmp(2,j)
-                  enddo
-               endif
-            enddo
+            max3=allpairs(1,1)
+            min3bar=allpairs(2,1)            
          endif
       endif
+      
+c      print *,'allpairs: ',((allpairs(i,j),i=1,2),j=1,npairs)
 
       end

=== modified file 'Template/SubProcesses/cuts.f'
--- Template/SubProcesses/cuts.f	2011-12-13 16:49:59 +0000
+++ Template/SubProcesses/cuts.f	2012-05-16 04:17:21 +0000
@@ -51,7 +51,7 @@
 C
       LOGICAL FIRSTTIME,FIRSTTIME2,pass_bw,notgood,good,foundheavy
       LOGICAL DEBUG
-      integer i,j,njets,nheavyjets,hardj1,hardj2
+      integer i,j,njets,nheavyjets,nleptons,hardj1,hardj2
       REAL*8 XVAR,ptmax1,ptmax2,htj,tmp,inclht
       real*8 ptemp(0:3), ptemp2(0:3)
       character*20 formstr
@@ -74,6 +74,7 @@
 
       double precision ptjet(nexternal)
       double precision ptheavyjet(nexternal)
+      double precision ptlepton(nexternal)
       double precision temp
 
       double precision etmin(nincoming+1:nexternal),etamax(nincoming+1:nexternal)
@@ -93,6 +94,9 @@
       logical jetor
       common/to_jet_cuts/ ptjmin4,ptjmax4,htjmin4,htjmax4,jetor
 
+      double precision ptlmin4(4),ptlmax4(4)
+      common/to_lepton_cuts/ ptlmin4,ptlmax4
+
 c
 c     Special cuts
 c
@@ -545,7 +549,66 @@
          passcuts=.false.
          return
       endif
- 
+
+C     
+C     maximal and minimal pt of the leptons sorted by pt
+c     
+      nleptons=0
+
+      if(ptl1min.gt.0.or.ptl2min.gt.0.or.ptl3min.gt.0.or.ptl4min.gt.0.or.
+     $     ptl1max.lt.1d5.or.ptl2max.lt.1d5.or.
+     $     ptl3max.lt.1d5.or.ptl4max.lt.1d5) then
+
+c     - fill ptlepton with the pt's of the leptons.
+         do i=nincoming+1,nexternal
+            if(is_a_l(i)) then
+               nleptons=nleptons+1
+               ptlepton(nleptons)=pt(p(0,i))
+            endif
+         enddo
+         if(debug) write (*,*) 'not yet ordered ',njets,'   ',ptjet
+
+c     - check existance of leptons if lepton cuts are on
+         if(nleptons.lt.1.and.ptl1min.gt.0.or.
+     $        nleptons.lt.2.and.ptl2min.gt.0.or.
+     $        nleptons.lt.3.and.ptl3min.gt.0.or.
+     $        nleptons.lt.4.and.ptl4min.gt.0)then
+            if(debug) write (*,*) i, ' too few leptons -> fails'
+            passcuts=.false.
+            return
+         endif
+
+c     - sort lepton pts
+         do i=1,nleptons-1
+            do j=i+1,nleptons
+               if(ptlepton(j).gt.ptlepton(i)) then
+                  temp=ptlepton(i)
+                  ptlepton(i)=ptlepton(j)
+                  ptlepton(j)=temp
+               endif
+            enddo
+         enddo
+         if(debug) write (*,*) 'ordered ',nleptons,'   ',ptlepton
+
+         if(nleptons.gt.0) then
+
+            notgood = .false.
+            do i=1,nleptons 
+               if(debug) write (*,*) i,ptlepton(i), '   ',ptlmin4(min(i,4)),':',ptlmax4(min(i,4))
+c---  if one of the leptons does not pass, the event is rejected
+               notgood=notgood.or.(ptlepton(i).gt.ptlmax4(min(i,4))).or.
+     $              (ptlepton(i).lt.ptlmin4(min(i,4)))
+               if(debug) write (*,*) i,' notgood total:', notgood   
+            enddo
+
+
+            if (notgood) then
+               if(debug) write (*,*) i, ' multiple pt -> fails'
+               passcuts=.false.
+               return
+            endif
+         endif
+      endif
 C>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>     
 C     SPECIAL CUTS
 C<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

=== modified file 'Template/SubProcesses/myamp.f'
--- Template/SubProcesses/myamp.f	2011-10-10 07:34:37 +0000
+++ Template/SubProcesses/myamp.f	2012-05-16 04:17:21 +0000
@@ -566,6 +566,10 @@
          xo = max(xo, ht4min**2/stot)
          xo = max(xo, misset**2/stot)
          xo = max(xo, ptllmin**2/stot)
+         xo = max(xo, ptl1min**2/stot)
+         xo = max(xo, ptl2min**2/stot)
+         xo = max(xo, ptl3min**2/stot)
+         xo = max(xo, ptl4min**2/stot)
          if (swidth(i).eq.0.and.xo.eq.1d0/stot) then
             write(*,*) 'Warning: No minimum found for integration'
             write(*,*) '         Setting minimum to ',1d0/stot

=== modified file 'Template/SubProcesses/setcuts.f'
--- Template/SubProcesses/setcuts.f	2012-02-24 08:51:01 +0000
+++ Template/SubProcesses/setcuts.f	2012-05-16 04:17:21 +0000
@@ -59,6 +59,9 @@
       logical jetor
       common/to_jet_cuts/ ptjmin4,ptjmax4,htjmin4,htjmax4,jetor
 
+      double precision ptlmin4(4),ptlmax4(4)
+      common/to_lepton_cuts/ ptlmin4,ptlmax4
+
       double precision xqcutij(nexternal,nexternal),xqcuti(nexternal)
       common/to_xqcuts/xqcutij,xqcuti
 c
@@ -413,6 +416,20 @@
       inclHtmax=ihtmax
 
       jetor = cutuse.eq.0d0
+
+c
+c   EXTRA LEPTON CUTS
+c
+      ptlmin4(1)=ptl1min
+      ptlmin4(2)=ptl2min
+      ptlmin4(3)=ptl3min
+      ptlmin4(4)=ptl4min
+
+      ptlmax4(1)=ptl1max
+      ptlmax4(2)=ptl2max
+      ptlmax4(3)=ptl3max
+      ptlmax4(4)=ptl4max
+
 c
 c    ERROR TRAPS 
 c

=== modified file 'Template/bin/madevent'
--- Template/bin/madevent	2012-04-19 20:28:42 +0000
+++ Template/bin/madevent	2012-05-16 04:17:21 +0000
@@ -33,18 +33,44 @@
 sys.path.insert(0, root_path)
 
 
+
+class MyOptParser(optparse.OptionParser):
+    
+    class InvalidOption(Exception): pass
+
+    def error(self, msg=''):
+        raise MyOptParser.InvalidOption(msg)
+
+
+
+
 # Write out nice usage message if called with -h or --help
 usage = "usage: %prog [options] [FILE] "
-parser = optparse.OptionParser(usage=usage)
+parser = MyOptParser(usage=usage)
 parser.add_option("-l", "--logging", default='INFO',
                   help="logging level (DEBUG|INFO|WARNING|ERROR|CRITICAL) [%default]")
-parser.add_option("-f", "--file", default='',
-                    help="Use script file FILE")
 parser.add_option("","--web", action="store_true", default=False, dest='web', \
                  help='force to be in secure mode')
 parser.add_option("","--debug", action="store_true", default=False, dest='debug', \
                  help='force to launch debug mode')
-(options, args) = parser.parse_args()
+parser_error = ''
+done = False
+for i in range(len(sys.argv)-1):
+    try:
+        (options, args) = parser.parse_args(sys.argv[1:len(sys.argv)-i])
+        done = True
+    except MyOptParser.InvalidOption, error:
+        pass 
+    else:
+        args += sys.argv[len(sys.argv)-i:]
+if not done:
+    # raise correct error:
+    try:
+        (options, args) = parser.parse_args()
+    except MyOptParser.InvalidOption, error:
+        print error
+        sys.exit(2)  
+
 if len(args) == 0:
     args = ''
 
@@ -115,25 +141,33 @@
 
 # Call the cmd interface main loop
 try:
-    if options.file or args:
+    if (args and os.path.exists(args[0])):
         # They are an input file 
-        if args:
-            input_file = args[0]
-        else:
-            input_file = options.file
+        input_file = args[0]
         if options.web:
             cmd_line = cmd_interface.MadEventCmd()
             cmd_line.debug_output = os.path.join(os.path.dirname(input_file),'generation.log')
             cmd_line.use_rawinput = False
             cmd_line.run_cmd('import command ' + input_file)
-            cmd_line.run_cmd('quit')
-            sys.exit()
+            cmd_line.run_cmd('quit')      
         else:
             cmd_line = cmd_interface.MadEventCmdShell()
             cmd_line.use_rawinput = False
             cmd_line.run_cmd('import command ' + input_file)
             cmd_line.run_cmd('quit')
-            sys.exit()
+    elif args:
+        # a single command is provided
+        cmd_line = cmd_interface.MadEventCmd()
+        if not hasattr(cmd_line, 'do_%s' % args[0]):
+            if parser_error:
+                print parser_error
+                print 'and %s  can not be interpreted as a valid command.' % args[0]
+            else:
+                print 'ERROR: %s  not a valid command. Please retry' % args[0]
+        else:
+            cmd_line.use_rawinput = False    
+            cmd_line.run_cmd(' '.join(args))
+            cmd_line.run_cmd('quit')
     else:
         # Interactive mode
         if options.web:

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2012-04-20 05:12:21 +0000
+++ UpdateNotes.txt	2012-05-16 04:17:21 +0000
@@ -1,5 +1,23 @@
 Update notes for MadGraph 5 (in reverse time order)
 
+1.4.6 (XX/04/12)  JA: Added cuts on lepton pt for each of the 4 hardest leptons
+                  OM: allow bin/madevent script to be feeded by a single line command:
+		      example ./bin/madevent multi_run 10 
+                  JA: Added new restriction card for the sm model with massive
+                      muon and electron, and non-zero tau decay width
+                  JA: Ensure assignment of colors to intermediate propagators
+                      works also in fermion flow- and color flow-violating 
+                      RPV processes (thanks Brock Tweedie for finding this).
+                  JA: Fix crash for certain fermion flow violating decay chains
+                      (introduced in v. 1.3.27) (again thanks to Brock Tweedie).
+                  JA: Fix crash for decay chains with multiple decays involving 
+                      the same particles (thanks Steve Blanchet for reporting)
+                  JA+OM: Fix crash for Pythia8 output with multiparticle vertices
+                      (thanks to Moritz Huck for reporting this.)
+                  OM: Fixing ALOHA output for C++/python.
+                  OM: Fix a crash occuring when trying to create an output on 
+                      an existing directory (thanks Celine)
+
 1.4.5 (11/04/12)  OM: Change the seed automatically in multi_run. (Even if the seed
                       was set to a non automatic value in the card.)
                   OM: correct a minor bug #975647 (SLAH convention problem) 

=== modified file 'aloha/aloha_writers.py'
--- aloha/aloha_writers.py	2012-03-07 17:49:58 +0000
+++ aloha/aloha_writers.py	2012-05-16 04:17:21 +0000
@@ -1013,11 +1013,11 @@
         else:
             main = '%(spin)s%(id)d' % \
                           {'spin': self.particles[self.offshell -1],
-                           'id': self.offshell}
+                           'id': self.outgoing}
             call_arg = '%(args)s, %(COUP)s, M%(id)d, W%(id)d, %(LAST)s' % \
                     {'args': ', '.join(self.calllist['CallList']), 
                      'COUP':'COUP%d',
-                     'id': self.offshell,
+                     'id': self.outgoing,
                      'LAST': '%s'}
 
         # make the first call
@@ -1087,7 +1087,7 @@
  
     def write_combined(self, lor_names, mode='self', offshell=None, **opt):
         """Write the .h and .cc files associated to the combined file"""
-
+        
         # Set some usefull command
         if offshell is None:
             offshell = self.offshell

=== modified file 'aloha/create_aloha.py'
--- aloha/create_aloha.py	2012-03-15 15:22:31 +0000
+++ aloha/create_aloha.py	2012-05-16 04:17:21 +0000
@@ -499,8 +499,11 @@
                     if lorentz.name in self.multiple_lor:
                         for m in self.multiple_lor[lorentz.name]:
                             for outgoing in range(len(lorentz.spins)+1):
-                                self[(conjg_builder.name, outgoing)].add_combine(m)
-                                                
+                                realname = conjg_builder.name + ''.join(['C%s' % pair for pair in conjg_builder.conjg])
+                                try:
+                                    self[(realname, outgoing)].add_combine(m)
+                                except Exception,error:
+                                    self[(realname, self.symmetries[lorentz.name][outgoing])].add_combine(m)          
                     
                     
         if save:
@@ -585,6 +588,7 @@
                 #Store the information
                 realname = name + ''.join(wavefunction.tag)
                 self.set(realname, outgoing, wavefunction)
+            
 
     def compute_aloha_without_kernel(self, builder, symmetry=None, routines=None):
         """define all the AbstractRoutine linked to a given lorentz structure

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2012-04-20 09:03:43 +0000
+++ madgraph/VERSION	2012-05-16 04:17:21 +0000
@@ -1,3 +1,3 @@
-version = 1.4.5
-date = 2012-04-20
+version = 1.4.6
+date = 2012-04-XX
 

=== modified file 'madgraph/core/helas_objects.py'
--- madgraph/core/helas_objects.py	2012-03-28 03:42:34 +0000
+++ madgraph/core/helas_objects.py	2012-05-16 04:17:21 +0000
@@ -2955,6 +2955,7 @@
                         for i, wf in enumerate(final_decay_wfs):
                             final_decay_wfs[i] = \
                                                decay_diag_wfs[decay_diag_wfs.index(wf)]
+                            
                         # Remove final wavefunctions from decay_diag_wfs,
                         # since these will be replaced separately by
                         # replace_wavefunctions
@@ -3075,7 +3076,6 @@
                                                    final_decay_wfs,
                                                    diagrams,
                                                    numbers)
-
             # Now that we are done with this set of diagrams, we need
             # to clean out duplicate wavefunctions (i.e., remove
             # identical wavefunctions which are already present in
@@ -3261,7 +3261,7 @@
         is possible only if there is only one diagram in the decay."""
 
         for key in old_wf.keys():
-            old_wf.set(key, new_wf.get(key))
+            old_wf.set(key, new_wf[key])
 
     def identical_decay_chain_factor(self, decay_chains):
         """Calculate the denominator factor from identical decay chains"""
@@ -3552,7 +3552,7 @@
         """Return a list of (lorentz_name, conjugate, outgoing) with
         all lorentz structures used by this HelasMatrixElement."""
 
-        return [(tuple(wa.get('lorentz')), tuple(wa.get_conjugate_index()),
+        return [(tuple(wa.get('lorentz')), tuple(wa.get('conjugate_indices')),
                  wa.find_outgoing_number()) for wa in \
                 self.get_all_wavefunctions() + self.get_all_amplitudes() \
                 if wa.get('interaction_id') != 0]

=== modified file 'madgraph/interface/extended_cmd.py'
--- madgraph/interface/extended_cmd.py	2012-03-22 04:20:14 +0000
+++ madgraph/interface/extended_cmd.py	2012-05-16 04:17:21 +0000
@@ -39,7 +39,8 @@
     from madgraph import MG5DIR
     MADEVENT = False
 except Exception, error:
-    print error
+    if __debug__:
+        print error
     import internal.misc as misc
     MADEVENT = True
 
@@ -843,7 +844,6 @@
         value =   Cmd.timed_input(question, default, timeout=timeout,
                                     fct=f, fct_timeout=fct_timeout)
 
-        self.preloop()        
         return value
         
     def check_answer_in_input_file(self, options, path=False):

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2012-04-20 05:12:21 +0000
+++ madgraph/interface/madevent_interface.py	2012-05-16 04:17:21 +0000
@@ -24,6 +24,7 @@
 import optparse
 import os
 import pydoc
+import random
 import re
 import shutil
 import subprocess
@@ -532,7 +533,7 @@
         if not self.me_dir:
             if not os.path.isfile(args[0]):
                 self.help_open()
-                raise self.InvalidCmd('No MadEvent path defined. Impossible to associate this name to a file')
+                raise self.InvalidCmd('No MadEvent path defined. Unable to associate this name to a file')
             else:
                 return True
             
@@ -683,7 +684,7 @@
             if self.results.lastrun:
                 self.set_run_name(self.results.lastrun)
             else:
-                raise self.InvalidCmd('No run_name currently define. Impossible to run refine')
+                raise self.InvalidCmd('No run_name currently define. Unable to run refine')
 
         if len(args) > 2:
             self.help_refine()
@@ -719,7 +720,7 @@
         
         if not self.run_name:
             if not self.results.lastrun:
-                raise self.InvalidCmd('No run_name currently define. Impossible to run combine')
+                raise self.InvalidCmd('No run_name currently define. Unable to run combine')
             else:
                 self.set_run_name(self.results.lastrun)
         
@@ -1324,9 +1325,9 @@
         # Check that the directory is not currently running
         if os.path.exists(pjoin(me_dir,'RunWeb')): 
             message = '''Another instance of madevent is currently running.
-            Please wait that all instance of madevent are closed. If this message
-            is an error in itself, you can suppress the files: 
-            %s.''' % pjoin(me_dir,'RunWeb')
+            Please wait that all instance of madevent are closed. If no
+            instance is running, you can delete the file
+            %s and try again.''' % pjoin(me_dir,'RunWeb')
             raise MadEventAlreadyRunning, message
         else:
             os.system('touch %s' % pjoin(me_dir,'RunWeb'))
@@ -1357,8 +1358,7 @@
         # load the current status of the directory
         if os.path.exists(pjoin(self.me_dir,'HTML','results.pkl')):
             self.results = save_load_object.load_from_file(pjoin(self.me_dir,'HTML','results.pkl'))
-            self.results.path = self.me_dir # allowed to move the directory after some launch
-            self.results.resetall()
+            self.results.resetall(self.me_dir)
         else:
             model = self.find_model_name()
             process = self.process # define in find_model_name
@@ -1729,7 +1729,8 @@
             self.exec_cmd('pythia --no_default', postcmd=False, printcmd=False)
             # pythia launches pgs/delphes if needed
             self.store_result()
-        
+            
+            
             
     def print_results_in_shell(self, data):
         """Have a nice results prints in the shell,
@@ -1748,8 +1749,6 @@
                 logger.info("     Matched Cross-section :   %.4g +- %.4g pb" % (data['cross_pythia'], data['error_pythia']))            
             logger.info("     Nb of events after Matching :  %s" % data['nb_event_pythia'])
         logger.info(" " )
-        
-            
     
     ############################################################################      
     def do_calculate_decay_widths(self, line):
@@ -2119,6 +2118,8 @@
         if not self.banner:
             self.banner = banner_mod.recover_banner(self.results, 'parton')
         self.banner.load_basic(self.me_dir)
+        # Add cross-section/event information
+        self.banner.add_generation_info(self.results.current['cross'], nb_event)        
         if not hasattr(self, 'random'): self.random = 0
         self.banner.change_seed(self.random)
         if not os.path.exists(pjoin(self.me_dir, 'Events', self.run_name)):
@@ -2134,11 +2135,6 @@
         misc.call(['%s/put_banner'% self.dirbin, 'unweighted_events.lhe'],
                             cwd=pjoin(self.me_dir, 'Events'))
         
-        #if os.path.exists(pjoin(self.me_dir, 'Events', 'unweighted_events.lhe')):
-        #    misc.call(['%s/extract_banner-pl' % self.dirbin, 
-        #                     'unweighted_events.lhe', 'banner.txt'],
-        #                    cwd=pjoin(self.me_dir, 'Events'))
-        
         eradir = self.options['exrootanalysis_path']
         madir = self.options['madanalysis_path']
         td = self.options['td_path']
@@ -2220,8 +2216,7 @@
                 output = pjoin(O_path, name)
                 files.mv(input, output) 
                 misc.call(['gzip', output], stdout=devnull, stderr=devnull, 
-                                                                     cwd=O_path)
-                
+                                                                     cwd=O_path) 
         self.update_status('End Parton', level='parton', makehtml=False)
 
     ############################################################################ 
@@ -2458,14 +2453,14 @@
             pass # Just ensure that html never makes crash this function
 
 
-        # Found the file to suppress
+        # Found the file to delete
         
-        to_suppress = glob.glob(pjoin(self.me_dir, 'Events', run, '*'))
-        to_suppress += glob.glob(pjoin(self.me_dir, 'HTML', run, '*'))
+        to_delete = glob.glob(pjoin(self.me_dir, 'Events', run, '*'))
+        to_delete += glob.glob(pjoin(self.me_dir, 'HTML', run, '*'))
         # forbid the banner to be removed
-        to_suppress = [os.path.basename(f) for f in to_suppress if 'banner' not in f]
+        to_delete = [os.path.basename(f) for f in to_delete if 'banner' not in f]
         if tag:
-            to_suppress = [f for f in to_suppress if tag in f]
+            to_delete = [f for f in to_delete if tag in f]
             if 'parton' in mode or 'all' in mode:
                 try:
                     if self.results[run][0]['tag'] != tag:
@@ -2473,35 +2468,35 @@
                 except:
                     pass
                 else:
-                    nb_rm = len(to_suppress)
+                    nb_rm = len(to_delete)
                     if os.path.exists(pjoin(self.me_dir, 'Events', run, 'events.lhe.gz')):
-                        to_suppress.append('events.lhe.gz')
+                        to_delete.append('events.lhe.gz')
                     if os.path.exists(pjoin(self.me_dir, 'Events', run, 'unweighted_events.lhe.gz')):
-                        to_suppress.append('unweighted_events.lhe.gz')
-                    if nb_rm != len(to_suppress):
+                        to_delete.append('unweighted_events.lhe.gz')
+                    if nb_rm != len(to_delete):
                         logger.warning('Be carefull that partonic information are on the point to be removed.')
         if 'all' in mode:
-            pass # suppress everything
+            pass # delete everything
         else:
             if 'pythia' not in mode:
-                to_suppress = [f for f in to_suppress if 'pythia' not in f]
+                to_delete = [f for f in to_delete if 'pythia' not in f]
             if 'pgs' not in mode:
-                to_suppress = [f for f in to_suppress if 'pgs' not in f]
+                to_delete = [f for f in to_delete if 'pgs' not in f]
             if 'delphes' not in mode:
-                to_suppress = [f for f in to_suppress if 'delphes' not in f]
+                to_delete = [f for f in to_delete if 'delphes' not in f]
             if 'parton' not in mode:
-                to_suppress = [f for f in to_suppress if 'delphes' in f 
+                to_delete = [f for f in to_delete if 'delphes' in f 
                                                       or 'pgs' in f 
                                                       or 'pythia' in f]
-        if not self.force and len(to_suppress):
-            question = 'Do you want to suppress the following files?\n     %s' % \
-                               '\n    '.join(to_suppress)
+        if not self.force and len(to_delete):
+            question = 'Do you want to delete the following files?\n     %s' % \
+                               '\n    '.join(to_delete)
             ans = self.ask(question, 'y', choices=['y','n'])
         else:
             ans = 'y'
         
         if ans == 'y':
-            for file2rm in to_suppress:
+            for file2rm in to_delete:
                 if os.path.exists(pjoin(self.me_dir, 'Events', run, file2rm)):
                     try:
                         os.remove(pjoin(self.me_dir, 'Events', run, file2rm))
@@ -2523,23 +2518,23 @@
             except:
                 pass
             else:
-                to_suppress = glob.glob(pjoin(self.me_dir, 'SubProcesses', '%s*' % run))
-                to_suppress += glob.glob(pjoin(self.me_dir, 'SubProcesses', '*','%s*' % run))
-                to_suppress += glob.glob(pjoin(self.me_dir, 'SubProcesses', '*','*','%s*' % run))
+                to_delete = glob.glob(pjoin(self.me_dir, 'SubProcesses', '%s*' % run))
+                to_delete += glob.glob(pjoin(self.me_dir, 'SubProcesses', '*','%s*' % run))
+                to_delete += glob.glob(pjoin(self.me_dir, 'SubProcesses', '*','*','%s*' % run))
 
-                if self.force or len(to_suppress) == 0:
+                if self.force or len(to_delete) == 0:
                     ans = 'y'
                 else:
-                    question = 'Do you want to suppress the following files?\n     %s' % \
-                               '\n    '.join(to_suppress)
+                    question = 'Do you want to delete the following files?\n     %s' % \
+                               '\n    '.join(to_delete)
                     ans = self.ask(question, 'y', choices=['y','n'])
 
                 if ans == 'y':
-                    for file2rm in to_suppress:
+                    for file2rm in to_delete:
                         os.remove(file2rm)
                         
         if 'banner' in mode:
-            to_suppress = glob.glob(pjoin(self.me_dir, 'Events', run, '*'))
+            to_delete = glob.glob(pjoin(self.me_dir, 'Events', run, '*'))
             if tag:
                 # remove banner
                 try:
@@ -2550,8 +2545,8 @@
                 if run in self.results:
                     self.results.delete_run(run, tag)
                     return
-            elif any(['banner' not in os.path.basename(p) for p in to_suppress]):
-                if to_suppress:
+            elif any(['banner' not in os.path.basename(p) for p in to_delete]):
+                if to_delete:
                     raise MadGraph5Error, '''Some output still exists for this run. 
                 Please remove those output first. Do for example: 
                 remove %s all banner
@@ -3064,7 +3059,7 @@
         out = misc.call([pjoin(self.dirbin, 'compile_Source')],
                               cwd = self.me_dir)
         if out:
-            raise MadEventError, 'Impossible to compile'
+            raise MadEventError, 'Unable to compile'
         
         # set random number
         if self.run_card['iseed'] != '0':

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2012-04-20 05:12:21 +0000
+++ madgraph/interface/madgraph_interface.py	2012-05-16 04:17:21 +0000
@@ -24,6 +24,7 @@
 import re
 import subprocess
 import sys
+import shutil
 import traceback
 import time
 
@@ -1373,7 +1374,7 @@
         
         
         # options
-        options = ['--format=Fortran', '--format=Python','--format=Cpp','--output=']
+        options = ['--format=Fortran', '--format=Python','--format=CPP','--output=']
         options = self.list_completion(text, options)
         if options:
             completion_categories['options'] = options
@@ -3209,7 +3210,7 @@
         ################
         if self._export_format == 'aloha':
             # catch format
-            format = [d[11:] for d in args if d.startswith('--language=')]
+            format = [d[9:] for d in args if d.startswith('--format=')]
             if not format:
                 format = 'Fortran'
             else:
@@ -3245,10 +3246,12 @@
                and self._export_format in ['madevent', 'standalone']:
             # Don't ask if user already specified force or noclean
             logger.info('INFO: directory %s already exists.' % self._export_dir)
-            logger.info('If you continue this directory will be cleaned')
+            logger.info('If you continue this directory will be deleted and replaced.')
             answer = self.ask('Do you want to continue?', 'y', ['y','n'])
             if answer != 'y':
                 raise self.InvalidCmd('Stopped by user request')
+            else:
+                shutil.rmtree(self._export_dir)
 
         #check if we need to group processes
         group_subprocesses = False

=== modified file 'madgraph/iolibs/export_cpp.py'
--- madgraph/iolibs/export_cpp.py	2012-02-17 06:01:41 +0000
+++ madgraph/iolibs/export_cpp.py	2012-05-16 04:17:21 +0000
@@ -1195,12 +1195,11 @@
 
             for schannel in schannels:
                 sid = schannel.get('legs')[-1].get('id')
-                try:
+                part = self.model.get_particle(sid)
+                if part:
                     width = self.model.get_particle(sid).get('width')
                     if width.lower() != 'zero':
                         resonances.append(sid)
-                except KeyError:
-                    pass
         resonance_set = set(resonances)
 
         singleres = 0

=== modified file 'madgraph/iolibs/group_subprocs.py'
--- madgraph/iolibs/group_subprocs.py	2012-03-28 03:42:34 +0000
+++ madgraph/iolibs/group_subprocs.py	2012-05-16 04:17:21 +0000
@@ -520,6 +520,7 @@
         for me in matrix_elements:
             group_assignment = self.assign_group_to_decay_process(\
                                     me.get('processes')[0])
+            assert group_assignment
             try:
                 me_assignments[group_assignment].append(me)
             except KeyError:
@@ -556,24 +557,23 @@
         for decay in process.get('decay_chains'):
             # Find decay group that has this decay in it
             ids = [l.get('id') for l in decay.get('legs')]
-            decay_group = [(i, group) for (i, group) in \
+            decay_groups = [(i, group) for (i, group) in \
                            enumerate(self.get('decay_groups')) \
                            if any([ids in [[l.get('id') for l in \
                                             a.get('process').get('legs')] \
                                            for a in g.get('amplitudes')] \
                                    for g in group.get('core_groups')])]
 
-            assert len(decay_group) > 0
-
-            for i in range(1,len(decay_group)):
-                assert decay_group[i-1][1] == decay_group[i][1]
-                
-            decay_group = decay_group[0]
-
-            group_assignment = \
-                          decay_group[1].assign_group_to_decay_process(decay)
-
-            group_assignments.append((decay_group[0], group_assignment))
+            for decay_group in decay_groups:
+
+                group_assignment = \
+                    decay_group[1].assign_group_to_decay_process(decay)
+
+                if group_assignment:
+                    group_assignments.append((decay_group[0], group_assignment))
+
+        if process.get('decay_chains') and not group_assignments:
+            return None
 
         # Now calculate the corresponding properties for process
 
@@ -584,6 +584,10 @@
                       if ids in [[l.get('id') for l in \
                                   a.get('process').get('legs')] \
                                  for a in group.get('amplitudes')]]
+
+        if not core_group:
+            return None
+
         assert len(core_group) == 1
         
         core_group = core_group[0]

=== modified file 'madgraph/iolibs/helas_call_writers.py'
--- madgraph/iolibs/helas_call_writers.py	2012-01-31 16:28:22 +0000
+++ madgraph/iolibs/helas_call_writers.py	2012-05-16 04:17:21 +0000
@@ -925,10 +925,7 @@
 
             # Check if we need to append a charge conjugation flag
             l = [str(l) for l in argument.get('lorentz')]
-            flag = []
-            if argument.needs_hermitian_conjugate():
-                flag = ['C%d' % i for i in \
-                                  argument.get_conjugate_index()]
+            flag = ['C%d' % i for i in argument.get('conjugate_indices')]
             routine_name = aloha_writers.combine_name(
                                         '%s' % l[0], l[1:], outgoing, flag)
             call = 'CALL %s' % (routine_name)
@@ -1062,10 +1059,7 @@
 
             # Check if we need to append a charge conjugation flag
             l = [str(l) for l in argument.get('lorentz')]
-            flag = [] 
-            if argument.needs_hermitian_conjugate():
-                flag = ['C%d' % i for i in \
-                                            argument.get_conjugate_index()]
+            flag = ['C%d' % i for i in argument.get('conjugate_indices')]
             routine_name = aloha_writers.combine_name(
                                         '%s' % l[0], l[1:], outgoing, flag)
             call = '%s' % (routine_name)
@@ -1237,9 +1231,7 @@
 
             # Check if we need to append a charge conjugation flag
             l = [str(l) for l in argument.get('lorentz')]
-            flag = []
-            if argument.needs_hermitian_conjugate():
-                flag = ['C%d' % i for i in argument.get_conjugate_index()]
+            flag = ['C%d' % i for i in argument.get('conjugate_indices')]
             routine_name = aloha_writers.combine_name(
                                         '%s' % l[0], l[1:], outgoing, flag)
 

=== modified file 'madgraph/various/banner.py'
--- madgraph/various/banner.py	2012-02-24 16:52:39 +0000
+++ madgraph/various/banner.py	2012-05-16 04:17:21 +0000
@@ -104,6 +104,14 @@
         new_seed_str = "     %s       = iseed" % seed
         self['mgruncard'] = p.sub(new_seed_str, self['mgruncard'])
     
+    def add_generation_info(self, cross, nb_event):
+        """add info on MGGeneration"""
+        
+        text = """
+#  Number of Events        :       %s
+#  Integrated weight (pb)  :       %s
+""" % (nb_event, cross)
+        self['MGGenerationInfo'] = text
     
     ############################################################################
     #  SPLIT BANNER

=== modified file 'madgraph/various/gen_crossxhtml.py'
--- madgraph/various/gen_crossxhtml.py	2012-04-19 20:49:31 +0000
+++ madgraph/various/gen_crossxhtml.py	2012-05-16 04:17:21 +0000
@@ -227,8 +227,13 @@
         if makehtml:
             self.output()
 
-    def resetall(self):
-        """check the output status of all run"""
+    def resetall(self, main_path=None):
+        """check the output status of all run
+           main_path redefines the path associated to the run (allowing to move 
+           the directory)
+        """
+        
+        self.path = main_path
         
         for key,run in self.items():
             if key == 'web':
@@ -236,6 +241,7 @@
             for i,subrun in enumerate(run):
                 self.def_current(subrun)
                 self.clean()
+                self.current.event_path = pjoin(main_path,'Events') 
                 if i==0:
                     self.current.update_status()
                 else:

=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2012-04-15 06:01:59 +0000
+++ madgraph/various/misc.py	2012-05-16 04:17:21 +0000
@@ -288,7 +288,8 @@
             self.data = (self.read(self.blksize) + line).split('\n')
           except IOError:  # can't seek before the beginning of the file
             self.seek(0)
-            self.data = string.split(self.read(self.size - (self.blksize * (self.blkcount-1))) + line, '\n')
+            data = self.read(self.size - (self.blksize * (self.blkcount-1))) + line
+            self.data = data.split('\n')
     
         if len(self.data) == 0:
           return ""
@@ -322,13 +323,6 @@
             return line
         else:
             raise StopIteration
-        
-    def close(self):
-        """ close correctly file """
-        try:
-            self.close()
-        except:
-           pass
 
 
 

=== modified file 'models/sm/coupling_orders.py'
--- models/sm/coupling_orders.py	2011-07-19 18:58:02 +0000
+++ models/sm/coupling_orders.py	2012-05-16 04:17:21 +0000
@@ -1,15 +1,16 @@
-# This file was automatically created by FeynRules $Revision: 634 $
+# This file was automatically created by FeynRules $Revision: 1105 $
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Tue 19 Jul 2011 18:23:49
+# Date: Tue 3 Apr 2012 09:10:20
 
 
 from object_library import all_orders, CouplingOrder
 
 
 QCD = CouplingOrder(name = 'QCD',
-                    expansion_order = -1,
+                    expansion_order = 99,
                     hierarchy = 1)
 
 QED = CouplingOrder(name = 'QED',
-                    expansion_order = -1,
+                    expansion_order = 99,
                     hierarchy = 2)
+

=== modified file 'models/sm/couplings.py'
--- models/sm/couplings.py	2011-07-19 18:58:02 +0000
+++ models/sm/couplings.py	2012-05-16 04:17:21 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 634 $
+# This file was automatically created by FeynRules $Revision: 1105 $
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Wed 6 Jul 2011 14:07:37
+# Date: Tue 3 Apr 2012 09:10:20
 
 
 from object_library import all_couplings, Coupling
@@ -46,154 +46,158 @@
                 order = {'QED':2})
 
 GC_10 = Coupling(name = 'GC_10',
+                 value = '-6*complex(0,1)*lam',
+                 order = {'QED':2})
+
+GC_11 = Coupling(name = 'GC_11',
                  value = '(ee**2*complex(0,1))/(2.*sw**2)',
                  order = {'QED':2})
 
-GC_11 = Coupling(name = 'GC_11',
+GC_12 = Coupling(name = 'GC_12',
                  value = '(ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_12 = Coupling(name = 'GC_12',
-                 value = '(CKM11*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
-
 GC_13 = Coupling(name = 'GC_13',
-                 value = '(CKM12*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '(CKM1x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_14 = Coupling(name = 'GC_14',
-                 value = '(CKM13*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '(CKM1x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_15 = Coupling(name = 'GC_15',
-                 value = '(CKM21*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '(CKM1x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_16 = Coupling(name = 'GC_16',
-                 value = '(CKM22*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '(CKM2x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_17 = Coupling(name = 'GC_17',
-                 value = '(CKM23*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '(CKM2x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_18 = Coupling(name = 'GC_18',
-                 value = '(CKM31*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '(CKM2x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_19 = Coupling(name = 'GC_19',
-                 value = '(CKM32*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '(CKM3x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_20 = Coupling(name = 'GC_20',
-                 value = '(CKM33*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '(CKM3x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_21 = Coupling(name = 'GC_21',
+                 value = '(CKM3x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_22 = Coupling(name = 'GC_22',
                  value = '-(cw*ee*complex(0,1))/(2.*sw)',
                  order = {'QED':1})
 
-GC_22 = Coupling(name = 'GC_22',
+GC_23 = Coupling(name = 'GC_23',
                  value = '(cw*ee*complex(0,1))/(2.*sw)',
                  order = {'QED':1})
 
-GC_23 = Coupling(name = 'GC_23',
+GC_24 = Coupling(name = 'GC_24',
                  value = '-(ee*complex(0,1)*sw)/(6.*cw)',
                  order = {'QED':1})
 
-GC_24 = Coupling(name = 'GC_24',
+GC_25 = Coupling(name = 'GC_25',
                  value = '(ee*complex(0,1)*sw)/(2.*cw)',
                  order = {'QED':1})
 
-GC_25 = Coupling(name = 'GC_25',
+GC_26 = Coupling(name = 'GC_26',
                  value = 'complex(0,1)*gw*sw',
                  order = {'QED':1})
 
-GC_26 = Coupling(name = 'GC_26',
+GC_27 = Coupling(name = 'GC_27',
                  value = '-2*cw*complex(0,1)*gw**2*sw',
                  order = {'QED':2})
 
-GC_27 = Coupling(name = 'GC_27',
+GC_28 = Coupling(name = 'GC_28',
                  value = 'complex(0,1)*gw**2*sw**2',
                  order = {'QED':2})
 
-GC_28 = Coupling(name = 'GC_28',
+GC_29 = Coupling(name = 'GC_29',
                  value = '(cw*ee*complex(0,1))/(2.*sw) + (ee*complex(0,1)*sw)/(2.*cw)',
                  order = {'QED':1})
 
-GC_29 = Coupling(name = 'GC_29',
+GC_30 = Coupling(name = 'GC_30',
                  value = 'ee**2*complex(0,1) + (cw**2*ee**2*complex(0,1))/(2.*sw**2) + (ee**2*complex(0,1)*sw**2)/(2.*cw**2)',
                  order = {'QED':2})
 
-GC_30 = Coupling(name = 'GC_30',
+GC_31 = Coupling(name = 'GC_31',
                  value = '-6*complex(0,1)*lam*v',
                  order = {'QED':1})
 
-GC_31 = Coupling(name = 'GC_31',
+GC_32 = Coupling(name = 'GC_32',
                  value = '(ee**2*complex(0,1)*v)/(2.*sw**2)',
                  order = {'QED':1})
 
-GC_32 = Coupling(name = 'GC_32',
+GC_33 = Coupling(name = 'GC_33',
                  value = 'ee**2*complex(0,1)*v + (cw**2*ee**2*complex(0,1)*v)/(2.*sw**2) + (ee**2*complex(0,1)*sw**2*v)/(2.*cw**2)',
                  order = {'QED':1})
 
-GC_33 = Coupling(name = 'GC_33',
+GC_34 = Coupling(name = 'GC_34',
                  value = '-((complex(0,1)*yb)/cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_34 = Coupling(name = 'GC_34',
+GC_35 = Coupling(name = 'GC_35',
                  value = '-((complex(0,1)*yc)/cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_35 = Coupling(name = 'GC_35',
+GC_36 = Coupling(name = 'GC_36',
                  value = '-((complex(0,1)*ye)/cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_36 = Coupling(name = 'GC_36',
+GC_37 = Coupling(name = 'GC_37',
                  value = '-((complex(0,1)*ym)/cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_37 = Coupling(name = 'GC_37',
+GC_38 = Coupling(name = 'GC_38',
                  value = '-((complex(0,1)*yt)/cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_38 = Coupling(name = 'GC_38',
+GC_39 = Coupling(name = 'GC_39',
                  value = '-((complex(0,1)*ytau)/cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_39 = Coupling(name = 'GC_39',
-                 value = '(ee*complex(0,1)*complexconjugate(CKM11))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
-
 GC_40 = Coupling(name = 'GC_40',
-                 value = '(ee*complex(0,1)*complexconjugate(CKM12))/(sw*cmath.sqrt(2))',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM1x1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_41 = Coupling(name = 'GC_41',
-                 value = '(ee*complex(0,1)*complexconjugate(CKM13))/(sw*cmath.sqrt(2))',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM1x2))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_42 = Coupling(name = 'GC_42',
-                 value = '(ee*complex(0,1)*complexconjugate(CKM21))/(sw*cmath.sqrt(2))',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM1x3))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_43 = Coupling(name = 'GC_43',
-                 value = '(ee*complex(0,1)*complexconjugate(CKM22))/(sw*cmath.sqrt(2))',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM2x1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_44 = Coupling(name = 'GC_44',
-                 value = '(ee*complex(0,1)*complexconjugate(CKM23))/(sw*cmath.sqrt(2))',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM2x2))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_45 = Coupling(name = 'GC_45',
-                 value = '(ee*complex(0,1)*complexconjugate(CKM31))/(sw*cmath.sqrt(2))',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM2x3))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_46 = Coupling(name = 'GC_46',
-                 value = '(ee*complex(0,1)*complexconjugate(CKM32))/(sw*cmath.sqrt(2))',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM3x1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_47 = Coupling(name = 'GC_47',
-                 value = '(ee*complex(0,1)*complexconjugate(CKM33))/(sw*cmath.sqrt(2))',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM3x2))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_48 = Coupling(name = 'GC_48',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM3x3))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 

=== modified file 'models/sm/lorentz.py'
--- models/sm/lorentz.py	2011-07-19 18:58:02 +0000
+++ models/sm/lorentz.py	2012-05-16 04:17:21 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 634 $
+# This file was automatically created by FeynRules $Revision: 1105 $
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Wed 6 Jul 2011 14:07:37
+# Date: Tue 3 Apr 2012 09:10:20
 
 
 from object_library import all_lorentz, Lorentz
@@ -49,6 +49,10 @@
                spins = [ 3, 3, 3 ],
                structure = 'P(3,1)*Metric(1,2) - P(3,2)*Metric(1,2) - P(2,1)*Metric(1,3) + P(2,3)*Metric(1,3) + P(1,2)*Metric(2,3) - P(1,3)*Metric(2,3)')
 
+SSSS1 = Lorentz(name = 'SSSS1',
+                spins = [ 1, 1, 1, 1 ],
+                structure = '1')
+
 VVSS1 = Lorentz(name = 'VVSS1',
                 spins = [ 3, 3, 1, 1 ],
                 structure = 'Metric(1,2)')

=== modified file 'models/sm/parameters.py'
--- models/sm/parameters.py	2011-07-19 18:58:02 +0000
+++ models/sm/parameters.py	2012-05-16 04:17:21 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 634 $
+# This file was automatically created by FeynRules $Revision: 1105 $
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Wed 6 Jul 2011 14:07:37
+# Date: Tue 3 Apr 2012 09:10:20
 
 
 
@@ -225,59 +225,59 @@
                  lhablock = 'DECAY',
                  lhacode = [ 15 ])
 
-CKM11 = Parameter(name = 'CKM11',
-                  nature = 'internal',
-                  type = 'complex',
-                  value = '1 - lamWS**2/2.',
-                  texname = '\\text{CKM11}')
-
-CKM12 = Parameter(name = 'CKM12',
-                  nature = 'internal',
-                  type = 'complex',
-                  value = 'lamWS',
-                  texname = '\\text{CKM12}')
-
-CKM13 = Parameter(name = 'CKM13',
-                  nature = 'internal',
-                  type = 'complex',
-                  value = 'AWS*lamWS**3*(-(etaWS*complex(0,1)) + rhoWS)',
-                  texname = '\\text{CKM13}')
-
-CKM21 = Parameter(name = 'CKM21',
-                  nature = 'internal',
-                  type = 'complex',
-                  value = '-lamWS',
-                  texname = '\\text{CKM21}')
-
-CKM22 = Parameter(name = 'CKM22',
-                  nature = 'internal',
-                  type = 'complex',
-                  value = '1 - lamWS**2/2.',
-                  texname = '\\text{CKM22}')
-
-CKM23 = Parameter(name = 'CKM23',
-                  nature = 'internal',
-                  type = 'complex',
-                  value = 'AWS*lamWS**2',
-                  texname = '\\text{CKM23}')
-
-CKM31 = Parameter(name = 'CKM31',
-                  nature = 'internal',
-                  type = 'complex',
-                  value = 'AWS*lamWS**3*(1 - etaWS*complex(0,1) - rhoWS)',
-                  texname = '\\text{CKM31}')
-
-CKM32 = Parameter(name = 'CKM32',
-                  nature = 'internal',
-                  type = 'complex',
-                  value = '-(AWS*lamWS**2)',
-                  texname = '\\text{CKM32}')
-
-CKM33 = Parameter(name = 'CKM33',
-                  nature = 'internal',
-                  type = 'complex',
-                  value = '1',
-                  texname = '\\text{CKM33}')
+CKM1x1 = Parameter(name = 'CKM1x1',
+                   nature = 'internal',
+                   type = 'complex',
+                   value = '1 - lamWS**2/2.',
+                   texname = '\\text{CKM1x1}')
+
+CKM1x2 = Parameter(name = 'CKM1x2',
+                   nature = 'internal',
+                   type = 'complex',
+                   value = 'lamWS',
+                   texname = '\\text{CKM1x2}')
+
+CKM1x3 = Parameter(name = 'CKM1x3',
+                   nature = 'internal',
+                   type = 'complex',
+                   value = 'AWS*lamWS**3*(-(etaWS*complex(0,1)) + rhoWS)',
+                   texname = '\\text{CKM1x3}')
+
+CKM2x1 = Parameter(name = 'CKM2x1',
+                   nature = 'internal',
+                   type = 'complex',
+                   value = '-lamWS',
+                   texname = '\\text{CKM2x1}')
+
+CKM2x2 = Parameter(name = 'CKM2x2',
+                   nature = 'internal',
+                   type = 'complex',
+                   value = '1 - lamWS**2/2.',
+                   texname = '\\text{CKM2x2}')
+
+CKM2x3 = Parameter(name = 'CKM2x3',
+                   nature = 'internal',
+                   type = 'complex',
+                   value = 'AWS*lamWS**2',
+                   texname = '\\text{CKM2x3}')
+
+CKM3x1 = Parameter(name = 'CKM3x1',
+                   nature = 'internal',
+                   type = 'complex',
+                   value = 'AWS*lamWS**3*(1 - etaWS*complex(0,1) - rhoWS)',
+                   texname = '\\text{CKM3x1}')
+
+CKM3x2 = Parameter(name = 'CKM3x2',
+                   nature = 'internal',
+                   type = 'complex',
+                   value = '-(AWS*lamWS**2)',
+                   texname = '\\text{CKM3x2}')
+
+CKM3x3 = Parameter(name = 'CKM3x3',
+                   nature = 'internal',
+                   type = 'complex',
+                   value = '1',
+                   texname = '\\text{CKM3x3}')
 
 aEW = Parameter(name = 'aEW',
                 nature = 'internal',

=== modified file 'models/sm/particles.py'
--- models/sm/particles.py	2011-07-19 18:58:02 +0000
+++ models/sm/particles.py	2012-05-16 04:17:21 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 634 $
+# This file was automatically created by FeynRules $Revision: 1105 $
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Wed 6 Jul 2011 14:07:37
+# Date: Tue 3 Apr 2012 09:10:20
 
 
 from __future__ import division
@@ -15,10 +15,10 @@
               mass = Param.ZERO,
               width = Param.ZERO,
               texname = 've',
-              antitexname = 've',
+              antitexname = 've~',
               charge = 0,
-              LeptonNumber = 1,
-              GhostNumber = 0)
+              GhostNumber = 0,
+              LeptonNumber = 1)
 
 ve__tilde__ = ve.anti()
 
@@ -30,10 +30,10 @@
               mass = Param.ZERO,
               width = Param.ZERO,
               texname = 'vm',
-              antitexname = 'vm',
+              antitexname = 'vm~',
               charge = 0,
-              LeptonNumber = 1,
-              GhostNumber = 0)
+              GhostNumber = 0,
+              LeptonNumber = 1)
 
 vm__tilde__ = vm.anti()
 
@@ -45,10 +45,10 @@
               mass = Param.ZERO,
               width = Param.ZERO,
               texname = 'vt',
-              antitexname = 'vt',
+              antitexname = 'vt~',
               charge = 0,
-              LeptonNumber = 1,
-              GhostNumber = 0)
+              GhostNumber = 0,
+              LeptonNumber = 1)
 
 vt__tilde__ = vt.anti()
 
@@ -60,10 +60,10 @@
              mass = Param.ZERO,
              width = Param.ZERO,
              texname = 'u',
-             antitexname = 'u',
+             antitexname = 'u~',
              charge = 2/3,
-             LeptonNumber = 0,
-             GhostNumber = 0)
+             GhostNumber = 0,
+             LeptonNumber = 0)
 
 u__tilde__ = u.anti()
 
@@ -75,10 +75,10 @@
              mass = Param.MC,
              width = Param.ZERO,
              texname = 'c',
-             antitexname = 'c',
+             antitexname = 'c~',
              charge = 2/3,
-             LeptonNumber = 0,
-             GhostNumber = 0)
+             GhostNumber = 0,
+             LeptonNumber = 0)
 
 c__tilde__ = c.anti()
 
@@ -90,10 +90,10 @@
              mass = Param.MT,
              width = Param.WT,
              texname = 't',
-             antitexname = 't',
+             antitexname = 't~',
              charge = 2/3,
-             LeptonNumber = 0,
-             GhostNumber = 0)
+             GhostNumber = 0,
+             LeptonNumber = 0)
 
 t__tilde__ = t.anti()
 
@@ -105,10 +105,10 @@
              mass = Param.ZERO,
              width = Param.ZERO,
              texname = 'd',
-             antitexname = 'd',
+             antitexname = 'd~',
              charge = -1/3,
-             LeptonNumber = 0,
-             GhostNumber = 0)
+             GhostNumber = 0,
+             LeptonNumber = 0)
 
 d__tilde__ = d.anti()
 
@@ -120,10 +120,10 @@
              mass = Param.ZERO,
              width = Param.ZERO,
              texname = 's',
-             antitexname = 's',
+             antitexname = 's~',
              charge = -1/3,
-             LeptonNumber = 0,
-             GhostNumber = 0)
+             GhostNumber = 0,
+             LeptonNumber = 0)
 
 s__tilde__ = s.anti()
 
@@ -135,10 +135,10 @@
              mass = Param.MB,
              width = Param.ZERO,
              texname = 'b',
-             antitexname = 'b',
+             antitexname = 'b~',
              charge = -1/3,
-             LeptonNumber = 0,
-             GhostNumber = 0)
+             GhostNumber = 0,
+             LeptonNumber = 0)
 
 b__tilde__ = b.anti()
 
@@ -150,10 +150,10 @@
                mass = Param.ZERO,
                width = Param.ZERO,
                texname = 'ghA',
-               antitexname = 'ghA',
+               antitexname = 'ghA~',
                charge = 0,
-               LeptonNumber = 0,
-               GhostNumber = 1)
+               GhostNumber = 1,
+               LeptonNumber = 0)
 
 ghA__tilde__ = ghA.anti()
 
@@ -163,12 +163,12 @@
                spin = -1,
                color = 1,
                mass = Param.MZ,
-               width = Param.ZERO,
+               width = Param.WZ,
                texname = 'ghZ',
-               antitexname = 'ghZ',
+               antitexname = 'ghZ~',
                charge = 0,
-               LeptonNumber = 0,
-               GhostNumber = 1)
+               GhostNumber = 1,
+               LeptonNumber = 0)
 
 ghZ__tilde__ = ghZ.anti()
 
@@ -178,12 +178,12 @@
                 spin = -1,
                 color = 1,
                 mass = Param.MW,
-                width = Param.ZERO,
+                width = Param.WW,
                 texname = 'ghWp',
-                antitexname = 'ghWp',
+                antitexname = 'ghWp~',
                 charge = 1,
-                LeptonNumber = 0,
-                GhostNumber = 1)
+                GhostNumber = 1,
+                LeptonNumber = 0)
 
 ghWp__tilde__ = ghWp.anti()
 
@@ -193,12 +193,12 @@
                 spin = -1,
                 color = 1,
                 mass = Param.MW,
-                width = Param.ZERO,
+                width = Param.WW,
                 texname = 'ghWm',
-                antitexname = 'ghWm',
+                antitexname = 'ghWm~',
                 charge = -1,
-                LeptonNumber = 0,
-                GhostNumber = 1)
+                GhostNumber = 1,
+                LeptonNumber = 0)
 
 ghWm__tilde__ = ghWm.anti()
 
@@ -210,10 +210,10 @@
                mass = Param.ZERO,
                width = Param.ZERO,
                texname = 'ghG',
-               antitexname = 'ghG',
+               antitexname = 'ghG~',
                charge = 0,
-               LeptonNumber = 0,
-               GhostNumber = 1)
+               GhostNumber = 1,
+               LeptonNumber = 0)
 
 ghG__tilde__ = ghG.anti()
 
@@ -227,8 +227,8 @@
              texname = 'A',
              antitexname = 'A',
              charge = 0,
-             LeptonNumber = 0,
-             GhostNumber = 0)
+             GhostNumber = 0,
+             LeptonNumber = 0)
 
 Z = Particle(pdg_code = 23,
              name = 'Z',
@@ -240,8 +240,8 @@
              texname = 'Z',
              antitexname = 'Z',
              charge = 0,
-             LeptonNumber = 0,
-             GhostNumber = 0)
+             GhostNumber = 0,
+             LeptonNumber = 0)
 
 W__plus__ = Particle(pdg_code = 24,
                      name = 'W+',
@@ -251,10 +251,10 @@
                      mass = Param.MW,
                      width = Param.WW,
                      texname = 'W+',
-                     antitexname = 'W+',
+                     antitexname = 'W-',
                      charge = 1,
-                     LeptonNumber = 0,
-                     GhostNumber = 0)
+                     GhostNumber = 0,
+                     LeptonNumber = 0)
 
 W__minus__ = W__plus__.anti()
 
@@ -268,8 +268,8 @@
              texname = 'G',
              antitexname = 'G',
              charge = 0,
-             LeptonNumber = 0,
-             GhostNumber = 0)
+             GhostNumber = 0,
+             LeptonNumber = 0)
 
 H = Particle(pdg_code = 25,
              name = 'H',
@@ -281,8 +281,8 @@
              texname = '\\phi',
              antitexname = '\\phi',
              charge = 0,
-             LeptonNumber = 0,
-             GhostNumber = 0)
+             GhostNumber = 0,
+             LeptonNumber = 0)
 
 phi0 = Particle(pdg_code = 250,
                 name = 'phi0',
@@ -295,8 +295,8 @@
                 antitexname = 'phi0',
                 GoldstoneBoson = True,
                 charge = 0,
-                LeptonNumber = 0,
-                GhostNumber = 0)
+                GhostNumber = 0,
+                LeptonNumber = 0)
 
 phi__plus__ = Particle(pdg_code = 251,
                        name = 'phi+',
@@ -306,11 +306,11 @@
                        mass = Param.MW,
                        width = Param.ZERO,
                        texname = '\\phi^+',
-                       antitexname = '\\phi^+',
+                       antitexname = '\\phi^-',
                        GoldstoneBoson = True,
                        charge = 1,
-                       LeptonNumber = 0,
-                       GhostNumber = 0)
+                       GhostNumber = 0,
+                       LeptonNumber = 0)
 
 phi__minus__ = phi__plus__.anti()
 
@@ -322,10 +322,10 @@
                       mass = Param.Me,
                       width = Param.ZERO,
                       texname = 'e-',
-                      antitexname = 'e-',
+                      antitexname = 'e+',
                       charge = -1,
-                      LeptonNumber = 1,
-                      GhostNumber = 0)
+                      GhostNumber = 0,
+                      LeptonNumber = 1)
 
 e__plus__ = e__minus__.anti()
 
@@ -337,10 +337,10 @@
                       mass = Param.MM,
                       width = Param.ZERO,
                       texname = 'm-',
-                      antitexname = 'm-',
+                      antitexname = 'm+',
                       charge = -1,
-                      LeptonNumber = 1,
-                      GhostNumber = 0)
+                      GhostNumber = 0,
+                      LeptonNumber = 1)
 
 m__plus__ = m__minus__.anti()
 
@@ -352,10 +352,10 @@
                        mass = Param.MTA,
                        width = Param.WTau,
                        texname = 'tt-',
-                       antitexname = 'tt-',
+                       antitexname = 'tt+',
                        charge = -1,
-                       LeptonNumber = 1,
-                       GhostNumber = 0)
+                       GhostNumber = 0,
+                       LeptonNumber = 1)
 
 tt__plus__ = tt__minus__.anti()
 

=== added file 'models/sm/restrict_lepton_masses.dat'
--- models/sm/restrict_lepton_masses.dat	1970-01-01 00:00:00 +0000
+++ models/sm/restrict_lepton_masses.dat	2012-05-16 04:17:21 +0000
@@ -0,0 +1,53 @@
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################
+######################################################################
+
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
+## INFORMATION FOR MASS
+###################################
+Block MASS 
+    4 0.000000e+00 # MC 
+    5 4.700000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 5.110000e-04 # Me 
+   13 1.056600e-01 # MM 
+   15 1.777000e+00 # MTA 
+   23 9.118800e+01 # MZ 
+   25 1.200000e+02 # MH 
+
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY   6 1.491500E+00
+DECAY  15 2.270000e-12
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
+
+###################################
+## INFORMATION FOR WOLFENSTEIN
+###################################
+Block Wolfenstein 
+    1 0.000000e+00 # lamWS 
+    2 0.000000e+00 # AWS 
+    3 0.000000e+00 # rhoWS 
+    4 0.000000e+00 # etaWS 
+
+###################################
+## INFORMATION FOR YUKAWA
+###################################
+Block YUKAWA 
+    4 0.000000e+00 # ymc 
+    5 4.200000e+00 # ymb 
+    6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
+   15 1.777000e+00 # ymtau 

=== modified file 'models/sm/vertices.py'
--- models/sm/vertices.py	2011-07-19 18:58:02 +0000
+++ models/sm/vertices.py	2012-05-16 04:17:21 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 634 $
+# This file was automatically created by FeynRules $Revision: 1105 $
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Wed 6 Jul 2011 14:07:37
+# Date: Tue 3 Apr 2012 09:10:20
 
 
 from object_library import all_vertices, Vertex
@@ -10,428 +10,434 @@
 
 
 V_1 = Vertex(name = 'V_1',
+             particles = [ P.H, P.H, P.H, P.H ],
+             color = [ '1' ],
+             lorentz = [ L.SSSS1 ],
+             couplings = {(0,0):C.GC_10})
+
+V_2 = Vertex(name = 'V_2',
              particles = [ P.H, P.H, P.H ],
              color = [ '1' ],
              lorentz = [ L.SSS1 ],
-             couplings = {(0,0):C.GC_30})
+             couplings = {(0,0):C.GC_31})
 
-V_2 = Vertex(name = 'V_2',
+V_3 = Vertex(name = 'V_3',
              particles = [ P.ghG, P.ghG__tilde__, P.G ],
              color = [ 'f(3,1,2)' ],
              lorentz = [ L.UUV1 ],
              couplings = {(0,0):C.GC_4})
 
-V_3 = Vertex(name = 'V_3',
+V_4 = Vertex(name = 'V_4',
              particles = [ P.G, P.G, P.G ],
              color = [ 'f(1,2,3)' ],
              lorentz = [ L.VVV1 ],
              couplings = {(0,0):C.GC_4})
 
-V_4 = Vertex(name = 'V_4',
+V_5 = Vertex(name = 'V_5',
              particles = [ P.G, P.G, P.G, P.G ],
              color = [ 'f(-1,1,2)*f(3,4,-1)', 'f(-1,1,3)*f(2,4,-1)', 'f(-1,1,4)*f(2,3,-1)' ],
              lorentz = [ L.VVVV1, L.VVVV3, L.VVVV4 ],
              couplings = {(1,1):C.GC_6,(0,0):C.GC_6,(2,2):C.GC_6})
 
-V_5 = Vertex(name = 'V_5',
+V_6 = Vertex(name = 'V_6',
              particles = [ P.A, P.W__minus__, P.W__plus__ ],
              color = [ '1' ],
              lorentz = [ L.VVV1 ],
-             couplings = {(0,0):C.GC_25})
+             couplings = {(0,0):C.GC_26})
 
-V_6 = Vertex(name = 'V_6',
+V_7 = Vertex(name = 'V_7',
              particles = [ P.W__minus__, P.W__plus__, P.H, P.H ],
              color = [ '1' ],
              lorentz = [ L.VVSS1 ],
-             couplings = {(0,0):C.GC_10})
+             couplings = {(0,0):C.GC_11})
 
-V_7 = Vertex(name = 'V_7',
+V_8 = Vertex(name = 'V_8',
              particles = [ P.W__minus__, P.W__plus__, P.H ],
              color = [ '1' ],
              lorentz = [ L.VVS1 ],
-             couplings = {(0,0):C.GC_31})
+             couplings = {(0,0):C.GC_32})
 
-V_8 = Vertex(name = 'V_8',
+V_9 = Vertex(name = 'V_9',
              particles = [ P.A, P.A, P.W__minus__, P.W__plus__ ],
              color = [ '1' ],
              lorentz = [ L.VVVV2 ],
-             couplings = {(0,0):C.GC_27})
-
-V_9 = Vertex(name = 'V_9',
-             particles = [ P.W__minus__, P.W__plus__, P.Z ],
-             color = [ '1' ],
-             lorentz = [ L.VVV1 ],
-             couplings = {(0,0):C.GC_7})
+             couplings = {(0,0):C.GC_28})
 
 V_10 = Vertex(name = 'V_10',
+              particles = [ P.W__minus__, P.W__plus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.VVV1 ],
+              couplings = {(0,0):C.GC_7})
+
+V_11 = Vertex(name = 'V_11',
               particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__ ],
               color = [ '1' ],
               lorentz = [ L.VVVV2 ],
               couplings = {(0,0):C.GC_8})
 
-V_11 = Vertex(name = 'V_11',
+V_12 = Vertex(name = 'V_12',
               particles = [ P.A, P.W__minus__, P.W__plus__, P.Z ],
               color = [ '1' ],
               lorentz = [ L.VVVV5 ],
-              couplings = {(0,0):C.GC_26})
+              couplings = {(0,0):C.GC_27})
 
-V_12 = Vertex(name = 'V_12',
+V_13 = Vertex(name = 'V_13',
               particles = [ P.Z, P.Z, P.H, P.H ],
               color = [ '1' ],
               lorentz = [ L.VVSS1 ],
-              couplings = {(0,0):C.GC_29})
+              couplings = {(0,0):C.GC_30})
 
-V_13 = Vertex(name = 'V_13',
+V_14 = Vertex(name = 'V_14',
               particles = [ P.Z, P.Z, P.H ],
               color = [ '1' ],
               lorentz = [ L.VVS1 ],
-              couplings = {(0,0):C.GC_32})
+              couplings = {(0,0):C.GC_33})
 
-V_14 = Vertex(name = 'V_14',
+V_15 = Vertex(name = 'V_15',
               particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z ],
               color = [ '1' ],
               lorentz = [ L.VVVV2 ],
               couplings = {(0,0):C.GC_9})
 
-V_15 = Vertex(name = 'V_15',
+V_16 = Vertex(name = 'V_16',
               particles = [ P.d__tilde__, P.d, P.A ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV1 ],
               couplings = {(0,0):C.GC_1})
 
-V_16 = Vertex(name = 'V_16',
+V_17 = Vertex(name = 'V_17',
               particles = [ P.s__tilde__, P.s, P.A ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV1 ],
               couplings = {(0,0):C.GC_1})
 
-V_17 = Vertex(name = 'V_17',
+V_18 = Vertex(name = 'V_18',
               particles = [ P.b__tilde__, P.b, P.A ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV1 ],
               couplings = {(0,0):C.GC_1})
 
-V_18 = Vertex(name = 'V_18',
-              particles = [ P.e__plus__, P.e__minus__, P.A ],
-              color = [ '1' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_3})
-
 V_19 = Vertex(name = 'V_19',
-              particles = [ P.m__plus__, P.m__minus__, P.A ],
-              color = [ '1' ],
+              particles = [ P.d__tilde__, P.d, P.G ],
+              color = [ 'T(3,2,1)' ],
               lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_3})
+              couplings = {(0,0):C.GC_5})
 
 V_20 = Vertex(name = 'V_20',
-              particles = [ P.tt__plus__, P.tt__minus__, P.A ],
-              color = [ '1' ],
+              particles = [ P.s__tilde__, P.s, P.G ],
+              color = [ 'T(3,2,1)' ],
               lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_3})
+              couplings = {(0,0):C.GC_5})
 
 V_21 = Vertex(name = 'V_21',
-              particles = [ P.u__tilde__, P.u, P.A ],
-              color = [ 'Identity(1,2)' ],
+              particles = [ P.b__tilde__, P.b, P.G ],
+              color = [ 'T(3,2,1)' ],
               lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_2})
+              couplings = {(0,0):C.GC_5})
 
 V_22 = Vertex(name = 'V_22',
-              particles = [ P.c__tilde__, P.c, P.A ],
+              particles = [ P.b__tilde__, P.b, P.H ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_2})
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_34})
 
 V_23 = Vertex(name = 'V_23',
-              particles = [ P.t__tilde__, P.t, P.A ],
+              particles = [ P.d__tilde__, P.d, P.Z ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_2})
+              lorentz = [ L.FFV2, L.FFV3 ],
+              couplings = {(0,0):C.GC_22,(0,1):C.GC_24})
 
 V_24 = Vertex(name = 'V_24',
-              particles = [ P.d__tilde__, P.d, P.G ],
-              color = [ 'T(3,2,1)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              particles = [ P.s__tilde__, P.s, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV3 ],
+              couplings = {(0,0):C.GC_22,(0,1):C.GC_24})
 
 V_25 = Vertex(name = 'V_25',
-              particles = [ P.s__tilde__, P.s, P.G ],
-              color = [ 'T(3,2,1)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              particles = [ P.b__tilde__, P.b, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV3 ],
+              couplings = {(0,1):C.GC_24,(0,0):C.GC_22})
 
 V_26 = Vertex(name = 'V_26',
-              particles = [ P.b__tilde__, P.b, P.G ],
-              color = [ 'T(3,2,1)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              particles = [ P.u__tilde__, P.d, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_40})
 
 V_27 = Vertex(name = 'V_27',
-              particles = [ P.b__tilde__, P.b, P.H ],
+              particles = [ P.c__tilde__, P.d, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFS1 ],
-              couplings = {(0,0):C.GC_33})
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_43})
 
 V_28 = Vertex(name = 'V_28',
-              particles = [ P.d__tilde__, P.d, P.Z ],
+              particles = [ P.t__tilde__, P.d, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2, L.FFV3 ],
-              couplings = {(0,0):C.GC_21,(0,1):C.GC_23})
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_46})
 
 V_29 = Vertex(name = 'V_29',
-              particles = [ P.s__tilde__, P.s, P.Z ],
+              particles = [ P.u__tilde__, P.s, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2, L.FFV3 ],
-              couplings = {(0,0):C.GC_21,(0,1):C.GC_23})
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_41})
 
 V_30 = Vertex(name = 'V_30',
-              particles = [ P.b__tilde__, P.b, P.Z ],
+              particles = [ P.c__tilde__, P.s, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2, L.FFV3 ],
-              couplings = {(0,0):C.GC_21,(0,1):C.GC_23})
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_44})
 
 V_31 = Vertex(name = 'V_31',
-              particles = [ P.d__tilde__, P.u, P.W__minus__ ],
+              particles = [ P.t__tilde__, P.s, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_12})
+              couplings = {(0,0):C.GC_47})
 
 V_32 = Vertex(name = 'V_32',
-              particles = [ P.d__tilde__, P.c, P.W__minus__ ],
+              particles = [ P.u__tilde__, P.b, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_15})
+              couplings = {(0,0):C.GC_42})
 
 V_33 = Vertex(name = 'V_33',
-              particles = [ P.d__tilde__, P.t, P.W__minus__ ],
+              particles = [ P.c__tilde__, P.b, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_18})
+              couplings = {(0,0):C.GC_45})
 
 V_34 = Vertex(name = 'V_34',
-              particles = [ P.s__tilde__, P.u, P.W__minus__ ],
+              particles = [ P.t__tilde__, P.b, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_13})
+              couplings = {(0,0):C.GC_48})
 
 V_35 = Vertex(name = 'V_35',
-              particles = [ P.s__tilde__, P.c, P.W__minus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_16})
+              particles = [ P.e__plus__, P.e__minus__, P.A ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
 
 V_36 = Vertex(name = 'V_36',
-              particles = [ P.s__tilde__, P.t, P.W__minus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_19})
+              particles = [ P.m__plus__, P.m__minus__, P.A ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
 
 V_37 = Vertex(name = 'V_37',
-              particles = [ P.b__tilde__, P.u, P.W__minus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_14})
+              particles = [ P.tt__plus__, P.tt__minus__, P.A ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
 
 V_38 = Vertex(name = 'V_38',
-              particles = [ P.b__tilde__, P.c, P.W__minus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_17})
+              particles = [ P.e__plus__, P.e__minus__, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_36})
 
 V_39 = Vertex(name = 'V_39',
-              particles = [ P.b__tilde__, P.t, P.W__minus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_20})
+              particles = [ P.m__plus__, P.m__minus__, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_37})
 
 V_40 = Vertex(name = 'V_40',
-              particles = [ P.u__tilde__, P.d, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
+              particles = [ P.tt__plus__, P.tt__minus__, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.FFS1 ],
               couplings = {(0,0):C.GC_39})
 
 V_41 = Vertex(name = 'V_41',
-              particles = [ P.c__tilde__, P.d, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_42})
+              particles = [ P.e__plus__, P.e__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,0):C.GC_22,(0,1):C.GC_25})
 
 V_42 = Vertex(name = 'V_42',
-              particles = [ P.t__tilde__, P.d, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_45})
+              particles = [ P.m__plus__, P.m__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,0):C.GC_22,(0,1):C.GC_25})
 
 V_43 = Vertex(name = 'V_43',
-              particles = [ P.u__tilde__, P.s, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_40})
+              particles = [ P.tt__plus__, P.tt__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,0):C.GC_22,(0,1):C.GC_25})
 
 V_44 = Vertex(name = 'V_44',
-              particles = [ P.c__tilde__, P.s, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
+              particles = [ P.ve__tilde__, P.e__minus__, P.W__plus__ ],
+              color = [ '1' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_43})
+              couplings = {(0,0):C.GC_12})
 
 V_45 = Vertex(name = 'V_45',
-              particles = [ P.t__tilde__, P.s, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
+              particles = [ P.vm__tilde__, P.m__minus__, P.W__plus__ ],
+              color = [ '1' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_46})
+              couplings = {(0,0):C.GC_12})
 
 V_46 = Vertex(name = 'V_46',
-              particles = [ P.u__tilde__, P.b, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
+              particles = [ P.vt__tilde__, P.tt__minus__, P.W__plus__ ],
+              color = [ '1' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_41})
+              couplings = {(0,0):C.GC_12})
 
 V_47 = Vertex(name = 'V_47',
-              particles = [ P.c__tilde__, P.b, P.W__plus__ ],
+              particles = [ P.d__tilde__, P.u, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_44})
+              couplings = {(0,0):C.GC_13})
 
 V_48 = Vertex(name = 'V_48',
-              particles = [ P.t__tilde__, P.b, P.W__plus__ ],
+              particles = [ P.s__tilde__, P.u, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_47})
+              couplings = {(0,0):C.GC_14})
 
 V_49 = Vertex(name = 'V_49',
-              particles = [ P.u__tilde__, P.u, P.G ],
-              color = [ 'T(3,2,1)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              particles = [ P.b__tilde__, P.u, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_15})
 
 V_50 = Vertex(name = 'V_50',
-              particles = [ P.c__tilde__, P.c, P.G ],
-              color = [ 'T(3,2,1)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              particles = [ P.d__tilde__, P.c, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_16})
 
 V_51 = Vertex(name = 'V_51',
-              particles = [ P.t__tilde__, P.t, P.G ],
-              color = [ 'T(3,2,1)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              particles = [ P.s__tilde__, P.c, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_17})
 
 V_52 = Vertex(name = 'V_52',
-              particles = [ P.e__plus__, P.e__minus__, P.H ],
-              color = [ '1' ],
-              lorentz = [ L.FFS1 ],
-              couplings = {(0,0):C.GC_35})
+              particles = [ P.b__tilde__, P.c, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_18})
 
 V_53 = Vertex(name = 'V_53',
-              particles = [ P.m__plus__, P.m__minus__, P.H ],
-              color = [ '1' ],
-              lorentz = [ L.FFS1 ],
-              couplings = {(0,0):C.GC_36})
+              particles = [ P.d__tilde__, P.t, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_19})
 
 V_54 = Vertex(name = 'V_54',
-              particles = [ P.tt__plus__, P.tt__minus__, P.H ],
-              color = [ '1' ],
-              lorentz = [ L.FFS1 ],
-              couplings = {(0,0):C.GC_38})
+              particles = [ P.s__tilde__, P.t, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_20})
 
 V_55 = Vertex(name = 'V_55',
-              particles = [ P.c__tilde__, P.c, P.H ],
+              particles = [ P.b__tilde__, P.t, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFS1 ],
-              couplings = {(0,0):C.GC_34})
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_21})
 
 V_56 = Vertex(name = 'V_56',
-              particles = [ P.t__tilde__, P.t, P.H ],
+              particles = [ P.u__tilde__, P.u, P.A ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFS1 ],
-              couplings = {(0,0):C.GC_37})
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
 
 V_57 = Vertex(name = 'V_57',
-              particles = [ P.e__plus__, P.e__minus__, P.Z ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2, L.FFV4 ],
-              couplings = {(0,0):C.GC_21,(0,1):C.GC_24})
+              particles = [ P.c__tilde__, P.c, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
 
 V_58 = Vertex(name = 'V_58',
-              particles = [ P.m__plus__, P.m__minus__, P.Z ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2, L.FFV4 ],
-              couplings = {(0,0):C.GC_21,(0,1):C.GC_24})
+              particles = [ P.t__tilde__, P.t, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
 
 V_59 = Vertex(name = 'V_59',
-              particles = [ P.tt__plus__, P.tt__minus__, P.Z ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2, L.FFV4 ],
-              couplings = {(0,0):C.GC_21,(0,1):C.GC_24})
+              particles = [ P.u__tilde__, P.u, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_5})
 
 V_60 = Vertex(name = 'V_60',
-              particles = [ P.e__plus__, P.ve, P.W__minus__ ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_11})
+              particles = [ P.c__tilde__, P.c, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_5})
 
 V_61 = Vertex(name = 'V_61',
-              particles = [ P.m__plus__, P.vm, P.W__minus__ ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_11})
+              particles = [ P.t__tilde__, P.t, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_5})
 
 V_62 = Vertex(name = 'V_62',
-              particles = [ P.tt__plus__, P.vt, P.W__minus__ ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_11})
+              particles = [ P.c__tilde__, P.c, P.H ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_35})
 
 V_63 = Vertex(name = 'V_63',
-              particles = [ P.ve__tilde__, P.e__minus__, P.W__plus__ ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_11})
+              particles = [ P.t__tilde__, P.t, P.H ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_38})
 
 V_64 = Vertex(name = 'V_64',
-              particles = [ P.vm__tilde__, P.m__minus__, P.W__plus__ ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_11})
+              particles = [ P.u__tilde__, P.u, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV5 ],
+              couplings = {(0,0):C.GC_23,(0,1):C.GC_24})
 
 V_65 = Vertex(name = 'V_65',
-              particles = [ P.vt__tilde__, P.tt__minus__, P.W__plus__ ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_11})
+              particles = [ P.c__tilde__, P.c, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV5 ],
+              couplings = {(0,0):C.GC_23,(0,1):C.GC_24})
 
 V_66 = Vertex(name = 'V_66',
-              particles = [ P.u__tilde__, P.u, P.Z ],
+              particles = [ P.t__tilde__, P.t, P.Z ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2, L.FFV5 ],
-              couplings = {(0,0):C.GC_22,(0,1):C.GC_23})
+              couplings = {(0,0):C.GC_23,(0,1):C.GC_24})
 
 V_67 = Vertex(name = 'V_67',
-              particles = [ P.c__tilde__, P.c, P.Z ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2, L.FFV5 ],
-              couplings = {(0,0):C.GC_22,(0,1):C.GC_23})
+              particles = [ P.e__plus__, P.ve, P.W__minus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_12})
 
 V_68 = Vertex(name = 'V_68',
-              particles = [ P.t__tilde__, P.t, P.Z ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2, L.FFV5 ],
-              couplings = {(0,0):C.GC_22,(0,1):C.GC_23})
+              particles = [ P.m__plus__, P.vm, P.W__minus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_12})
 
 V_69 = Vertex(name = 'V_69',
+              particles = [ P.tt__plus__, P.vt, P.W__minus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_12})
+
+V_70 = Vertex(name = 'V_70',
               particles = [ P.ve__tilde__, P.ve, P.Z ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_28})
+              couplings = {(0,0):C.GC_29})
 
-V_70 = Vertex(name = 'V_70',
+V_71 = Vertex(name = 'V_71',
               particles = [ P.vm__tilde__, P.vm, P.Z ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_28})
+              couplings = {(0,0):C.GC_29})
 
-V_71 = Vertex(name = 'V_71',
+V_72 = Vertex(name = 'V_72',
               particles = [ P.vt__tilde__, P.vt, P.Z ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_28})
+              couplings = {(0,0):C.GC_29})
 

=== modified file 'models/sm/write_param_card.py'
--- models/sm/write_param_card.py	2011-03-20 16:49:47 +0000
+++ models/sm/write_param_card.py	2012-05-16 04:17:21 +0000
@@ -1,5 +1,5 @@
 
-__date__ = "3 june 2010"
+__date__ = "22 Sept 2011"
 __author__ = '[e-mail]'
 
 from function_library import *
@@ -162,7 +162,7 @@
             text += self.data % {'pdg': part.pdg_code,
                                  'name': part.name,
                                  'charge': 3 * part.charge,
-                                 'spin': 2 * part.spin + 1,
+                                 'spin': part.spin,
                                  'color': part.color,
                                  'antipart': part.name != part.antiname and 1 or 0}
         

=== modified file 'tests/acceptance_tests/test_cmd.py'
--- tests/acceptance_tests/test_cmd.py	2012-03-20 19:55:40 +0000
+++ tests/acceptance_tests/test_cmd.py	2012-05-16 04:17:21 +0000
@@ -1001,18 +1001,19 @@
         
         self.do('import model sm')
         self.assertEqual(len(self.cmd._curr_model.get('particles')), 17)
-        self.assertEqual(len(self.cmd._curr_model.get('interactions')), 55)
+        self.assertEqual(len(self.cmd._curr_model.get('interactions')), 56)
         self.do('save model /tmp/model.pkl')
         self.do('import model mssm-full')
         self.do('load model /tmp/model.pkl')
         self.assertEqual(len(self.cmd._curr_model.get('particles')), 17)
-        self.assertEqual(len(self.cmd._curr_model.get('interactions')), 55)
+        self.assertEqual(len(self.cmd._curr_model.get('interactions')), 56)
         self.do('generate mu+ mu- > ta+ ta-') 
         self.assertEqual(len(self.cmd._curr_amps), 1)
         nicestring = """Process: mu+ mu- > ta+ ta- WEIGHTED=4
 2 diagrams:
-1  ((1(13),2(-13)>1(22),id:18),(3(-15),4(15),1(22),id:19)) (QCD=0,QED=2,WEIGHTED=4)
-2  ((1(13),2(-13)>1(23),id:57),(3(-15),4(15),1(23),id:58)) (QCD=0,QED=2,WEIGHTED=4)"""
+1  ((1(13),2(-13)>1(22),id:35),(3(-15),4(15),1(22),id:36)) (QCD=0,QED=2,WEIGHTED=4)
+2  ((1(13),2(-13)>1(23),id:41),(3(-15),4(15),1(23),id:42)) (QCD=0,QED=2,WEIGHTED=4)"""
+       
         self.assertEqual(self.cmd._curr_amps[0].nice_string().split('\n'), nicestring.split('\n'))
         self.do('save processes /tmp/model.pkl')
         self.do('generate e+ e- > e+ e-')

=== modified file 'tests/acceptance_tests/test_model_equivalence.py'
--- tests/acceptance_tests/test_model_equivalence.py	2012-03-20 21:46:23 +0000
+++ tests/acceptance_tests/test_model_equivalence.py	2012-05-16 04:17:21 +0000
@@ -121,7 +121,7 @@
             except ValueError:
                 mg4_vertices.append(pdg_code_mg4)
 
-        self.assertEqual(ufo_vertices, [])  # [[25,25,25,25]]
+        self.assertEqual(ufo_vertices, [[25,25,25,25]])
         self.assertEqual(mg4_vertices, [])  
 
     def test_mssm_equivalence(self):
@@ -299,7 +299,8 @@
         testprog = subprocess.Popen("./testprog", stdout=subprocess.PIPE,
                             cwd=self.output_path,
                             stderr=subprocess.STDOUT, shell=True)
-        solutions={'CKM22 ': [1.0], 'G ': [1.2177157847767195], 'GC_1 ': [-0.0, -0.10265], 'GC_10 ': [0.0, 0.21336], 'GC_16 ': [0.0, 0.46191], 'GC_2 ': [0.0, 0.2053], 'GC_21 ': [-0.0, -0.28804], 'GC_22 ': [0.0, 0.28804], 'GC_23 ': [-0.0, -0.027437], 'GC_24 ': [0.0, 0.08231], 'GC_25 ': [0.0, 0.30795], 'GC_26 ': [-0.0, -0.35482], 'GC_27 ': [0.0, 0.094836], 'GC_28 ': [0.0, 0.37035], 'GC_29 ': [0.0, 0.27432], 'GC_3 ': [-0.0, -0.30795], 'GC_30 ': [-0.0, -175.45], 'GC_31 ': [0.0, 52.532], 'GC_32 ': [0.0, 67.544], 'GC_33 ': [-0.0, -0.017058], 'GC_37 ': [-0.0, -0.66811], 'GC_38 ': [-0.0, -0.0072172], 'GC_4 ': [-1.2177, 0.0], 'GC_5 ': [0.0, 1.2177], 'GC_6 ': [0.0, 1.4828], 'GC_7 ': [0.0, 0.57609], 'GC_8 ': [-0.0, -0.42671], 'GC_9 ': [0.0, 0.33188], 'G__exp__2 ': [1.4828317324943818], 'Gf ': [1.16639e-05], 'MB ': [4.7], 'MH ': [120.0], 'MH__exp__2 ': [14400.0], 'MT ': [173.0], 'MTA ': [1.777], 'MW ': [80.419002445756163], 'MW__exp__2 ': [6467.2159543705357], 'MZ ': [91.188], 'MZ__exp__2 ': [8315.25134], 'MZ__exp__4 ': [69143404.913893804], 'WH ': [0.005753088], 'WT ': [1.4915], 'WW ': [2.0476], 'WZ ': [2.441404], 'aEW ': [0.0075467711139788835], 'aEWM1 ': [132.507], 'aS ': [0.118], 'complexi ': (0.0, 1.0), 'cw ': [0.88190334743339216], 'cw__exp__2 ': [0.77775351421422245], 'ee ': [0.30795376724436879], 'ee__exp__2 ': [0.094835522759998875], 'g1 ': [0.34919219678733299], 'gw ': [0.6532329303475799], 'gw__exp__2 ': [0.42671326129048615], 'lam ': [0.11876576810517747], 'muH ': [84.852813742385706], 'sqrt__2 ': [1.4142135623730951], 'sqrt__aEW ': [0.086872153846781555], 'sqrt__aS ': [0.34351128074635334], 'sqrt__sw2 ': [0.4714302554840723], 'sw ': [0.4714302554840723], 'sw2 ': [0.22224648578577766], 'sw__exp__2 ': [0.22224648578577769], 'v ': [246.21845810181637], 'v__exp__2 ': [60623.529110035903], 'yb ': [0.024123686777011714], 'ymb ': [4.2], 'ymt ': [164.5], 'ymtau ': [1.777], 'yt ': [0.944844398766292], 'ytau ': [0.010206617000654717]}
+        
+        solutions={'sqrt__aEW ': [0.0868721538], 'ymtau ': [1.777], 'GC_5 ': [0.0, 1.2177], 'sqrt__sw2 ': [0.471430255], 'sw__exp__2 ': [0.222246486], 'GC_11 ': [0.0, 0.21336], 'GC_3 ': [0.0, -0.30795], 'aEW ': [0.00754677111], 'MZ__exp__2 ': [8315.25134], 'MZ ': [91.188], 'WW ': [2.0476], 'GC_1 ': [0.0, -0.10265], 'GC_38 ': [0.0, -0.66811], 'GC_9 ': [0.0, 0.33188], 'GC_7 ': [0.0, 0.57609], 'GC_10 ': [0.0, -0.71259], 'ee__exp__2 ': [0.0948355228], 'aEWM1 ': [132.507], 'GC_29 ': [0.0, 0.37035], 'gw ': [0.65323293], 'ytau ': [0.010206617], 'GC_8 ': [0.0, -0.42671], 'MTA ': [1.777], 'sqrt__aS ': [0.343511281], 'MH ': [120.0], 'GC_27 ': [0.0, -0.35482], 'GC_31 ': [0.0, -175.45], 'GC_23 ': [0.0, 0.28804], 'aS ': [0.118], 'ymb ': [4.2], 'MZ__exp__4 ': [69143404.9], 'complexi ': [0.0, 1.0], 'yb ': [0.0241236868], 'MW__exp__2 ': [6467.21595], 'Gf ': [1.16639e-05], 'GC_33 ': [0.0, 67.544], 'ee ': [0.307953767], 'WZ ': [2.441404], 'v__exp__2 ': [60623.5291], 'v ': [246.218458], 'WH ': [0.005753088], 'cw__exp__2 ': [0.777753514], 'GC_6 ': [0.0, 1.4828], 'sw2 ': [0.222246486], 'GC_2 ': [0.0, 0.2053], 'GC_24 ': [0.0, -0.027437], 'MB ': [4.7], 'WT ': [1.4915], 'GC_28 ': [0.0, 0.094836], 'GC_4 ': [-1.2177, 0.0], 'MH__exp__2 ': [14400.0], 'ymt ': [164.5], 'GC_39 ': [0.0, -0.0072172], 'G__exp__2 ': [1.48283173], 'MT ': [173.0], 'lam ': [0.118765768], 'GC_25 ': [0.0, 0.08231], 'sw ': [0.471430255], 'gw__exp__2 ': [0.426713261], 'GC_26 ': [0.0, 0.30795], 'GC_34 ': [0.0, -0.017058], 'g1 ': [0.349192197], 'GC_22 ': [0.0, -0.28804], 'GC_30 ': [0.0, 0.27432], 'MW ': [80.4190024], 'CKM2x2 ': [1.0], 'muH ': [84.8528137], 'GC_17 ': [0.0, 0.46191], 'cw ': [0.881903347], 'sqrt__2 ': [1.41421356], 'GC_32 ': [0.0, 52.532], 'yt ': [0.944844399]}
         nb_value = 0
         for line in testprog.stdout:
             self.assertTrue('Warning' not in line)
@@ -325,8 +326,8 @@
                 #        solutions[variable] = [singlevalue]
                 #    else:
                 #        solutions[variable].append(singlevalue)
-        
-        self.assertEqual(nb_value, 71)
+       
+        self.assertEqual(nb_value, 72)
         
         
 
@@ -346,7 +347,7 @@
             alreadydefine.append(new_def)
         alreadydefine = [name.lower() for name in alreadydefine]
         alreadydefine.sort()
-        solution = ['aew ', 'as ', 'ckm22 ', 'complexi ', 'cw ', 'cw__exp__2 ', 'ee ', 'ee__exp__2 ','g ', 'g1 ', 'g__exp__2 ', 'gal(1) ', 'gal(2) ', 'gw ', 'gw__exp__2 ', 'lam ', 'mh__exp__2 ', 'muh ', 'mw ', 'mw__exp__2 ', 'mz__exp__2 ', 'mz__exp__4 ', 'sqrt__2 ', 'sqrt__aew ', 'sqrt__as ', 'sqrt__sw2 ', 'sw ', 'sw2 ', 'sw__exp__2 ', 'v ', 'v__exp__2 ', 'yb ', 'yt ', 'ytau ']
+        solution = ['aew ', 'as ', 'ckm2x2 ', 'complexi ', 'cw ', 'cw__exp__2 ', 'ee ', 'ee__exp__2 ','g ', 'g1 ', 'g__exp__2 ', 'gal(1) ', 'gal(2) ', 'gw ', 'gw__exp__2 ', 'lam ', 'mh__exp__2 ', 'muh ', 'mw ', 'mw__exp__2 ', 'mz__exp__2 ', 'mz__exp__4 ', 'sqrt__2 ', 'sqrt__aew ', 'sqrt__as ', 'sqrt__sw2 ', 'sw ', 'sw2 ', 'sw__exp__2 ', 'v ', 'v__exp__2 ', 'yb ', 'yt ', 'ytau ']
         self.assertEqual(alreadydefine, solution)
         
 

=== modified file 'tests/parallel_tests/compare_with_old_mg5_version.py'
--- tests/parallel_tests/compare_with_old_mg5_version.py	2012-02-27 16:23:02 +0000
+++ tests/parallel_tests/compare_with_old_mg5_version.py	2012-05-16 04:17:21 +0000
@@ -38,7 +38,7 @@
     """A class to compare the value of a old MG5 version and the current one"""
     
     old_mg5 = None # link to the previous version of MG5 (prevent multiple build)
-    reference_number = 186 #146 corresponds to 1.3.3 
+    reference_number = 229 #186 #146 corresponds to 1.3.3 
     nb_test = 0
     
     

=== modified file 'tests/parallel_tests/input_files/mg5_short_paralleltest_sm.pkl'
Binary files tests/parallel_tests/input_files/mg5_short_paralleltest_sm.pkl	2011-11-28 20:34:18 +0000 and tests/parallel_tests/input_files/mg5_short_paralleltest_sm.pkl	2012-05-16 04:17:21 +0000 differ
=== modified file 'tests/unit_tests/iolibs/test_export_cpp.py'
--- tests/unit_tests/iolibs/test_export_cpp.py	2012-02-17 06:01:41 +0000
+++ tests/unit_tests/iolibs/test_export_cpp.py	2012-05-16 04:17:21 +0000
@@ -1300,6 +1300,562 @@
         #print open(self.give_pos('test.cc')).read()
         self.assertFileContains('test.cc', goal_string)
 
+    def test_write_cpp_four_fermion_vertex(self):
+        """Testing process u u > t t g with fermion flow (u~t)(u~t)
+        """
+
+        # Set up model
+
+        mypartlist = base_objects.ParticleList()
+        myinterlist = base_objects.InteractionList()
+
+        # A u quark and its antiparticle
+        mypartlist.append(base_objects.Particle({'name':'u',
+                      'antiname':'u~',
+                      'spin':2,
+                      'color':3,
+                      'mass':'zero',
+                      'width':'zero',
+                      'texname':'u',
+                      'antitexname':'\bar u',
+                      'line':'straight',
+                      'charge':2. / 3.,
+                      'pdg_code':2,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        u = mypartlist[len(mypartlist) - 1]
+        antiu = copy.copy(u)
+        antiu.set('is_part', False)
+
+        # A t quark and its antiparticle
+        mypartlist.append(base_objects.Particle({'name':'t',
+                      'antiname':'t~',
+                      'spin':2,
+                      'color':3,
+                      'mass':'MT',
+                      'width':'WT',
+                      'texname':'t',
+                      'antitexname':'\bar t',
+                      'line':'straight',
+                      'charge':2. / 3.,
+                      'pdg_code':6,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        t = mypartlist[len(mypartlist) - 1]
+        antit = copy.copy(t)
+        antit.set('is_part', False)
+
+        # A gluon
+        mypartlist.append(base_objects.Particle({'name':'g',
+                      'antiname':'g',
+                      'spin':3,
+                      'color':8,
+                      'mass':'zero',
+                      'width':'zero',
+                      'texname':'g',
+                      'antitexname':'g',
+                      'line':'curly',
+                      'charge':0.,
+                      'pdg_code':21,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':True}))
+
+        g = mypartlist[len(mypartlist) - 1]
+
+        # Gluon couplings to quarks
+        myinterlist.append(base_objects.Interaction({
+                      'id': 1,
+                      'particles': base_objects.ParticleList(\
+                                            [antiu, \
+                                             u, \
+                                             g]),
+                      'color': [color.ColorString([color.T(2, 1, 0)])],
+                      'lorentz':['FFV1'],
+                      'couplings':{(0, 0):'GG'},
+                      'orders':{'QCD':1}}))
+
+        myinterlist.append(base_objects.Interaction({
+                      'id': 2,
+                      'particles': base_objects.ParticleList(\
+                                            [antit, \
+                                             t, \
+                                             g]),
+                      'color': [color.ColorString([color.T(2, 1, 0)])],
+                      'lorentz':['FFV1'],
+                      'couplings':{(0, 0):'GG'},
+                      'orders':{'QCD':1}}))
+
+        # Four fermion vertex
+        myinterlist.append(base_objects.Interaction({
+                      'id': 3,
+                      'particles': base_objects.ParticleList(\
+                                            [antiu,
+                                             t,
+                                             antiu,
+                                             t]),
+                      'color': [color.ColorString([color.T(1, 0),
+                                                   color.T(3, 2)])],
+                      'lorentz':['FFFF1'],
+                      'couplings':{(0, 0):'GEFF'},
+                      'orders':{'NP':2}}))
+
+        mybasemodel = base_objects.Model()
+        mybasemodel.set('particles', mypartlist)
+        mybasemodel.set('interactions', myinterlist)
+
+        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}))
+        myleglist.append(base_objects.Leg({'id':21,
+                                         'state':True}))
+
+        myproc = base_objects.Process({'legs':myleglist,
+                                       'model':mybasemodel})
+        
+        myamplitude = diagram_generation.Amplitude({'process': myproc})
+
+        matrix_element = helas_objects.HelasMultiProcess(myamplitude)
+        matrix_element.get('matrix_elements')[0].set('has_mirror_process',
+                                                     True)
+
+        goal_string = \
+"""//==========================================================================
+// This file has been automatically generated for Pythia 8
+// MadGraph 5 v. %(version)s, %(date)s
+// By the MadGraph Development Team
+// Please visit us at https://launchpad.net/madgraph5
+//==========================================================================
+
+#ifndef Pythia8_Sigma__uu_ttg_H
+#define Pythia8_Sigma__uu_ttg_H
+
+#include <complex> 
+
+#include "SigmaProcess.h"
+#include "Parameters_.h"
+
+using namespace std; 
+
+namespace Pythia8 
+{
+//==========================================================================
+// A class for calculating the matrix elements for
+// Process: u u > t t g
+//--------------------------------------------------------------------------
+
+class Sigma__uu_ttg : public Sigma3Process 
+{
+  public:
+
+    // Constructor.
+    Sigma__uu_ttg() {}
+
+    // Initialize process.
+    virtual void initProc(); 
+
+    // Calculate flavour-independent parts of cross section.
+    virtual void sigmaKin(); 
+
+    // Evaluate sigmaHat(sHat).
+    virtual double sigmaHat(); 
+
+    // Select flavour, colour and anticolour.
+    virtual void setIdColAcol(); 
+
+    // Evaluate weight for decay angles.
+    virtual double weightDecay(Event& process, int iResBeg, int iResEnd); 
+
+    // Info on the subprocess.
+    virtual string name() const {return "u u > t t g ()";}
+
+    virtual int code() const {return 10000;}
+
+    virtual string inFlux() const {return "qq";}
+    int id3Mass() const {return 6;}
+    int id4Mass() const {return 6;}
+    virtual int resonanceA() const {return 6;}
+    // Tell Pythia that sigmaHat returns the ME^2
+    virtual bool convertM2() const {return true;}
+
+  private:
+
+    // Private functions to calculate the matrix element for all subprocesses
+    // Calculate wavefunctions
+    void calculate_wavefunctions(const int perm[], const int hel[]); 
+    static const int nwavefuncs = 9; 
+    std::complex<double> w[nwavefuncs][18]; 
+    static const int namplitudes = 4; 
+    std::complex<double> amp[namplitudes]; 
+    double matrix_uu_ttg(); 
+
+    // Constants for array limits
+    static const int nexternal = 5; 
+    static const int nprocesses = 2; 
+
+    // Store the matrix element value from sigmaKin
+    double matrix_element[nprocesses]; 
+
+    // Color flows, used when selecting color
+    double * jamp2[nprocesses]; 
+
+    // Pointer to the model parameters
+    Parameters_ * pars; 
+
+}; 
+
+}  // end namespace Pythia
+
+#endif  // Pythia8_Sigma__uu_ttg_H
+""" % misc.get_pkg_info()
+
+        exporter = export_cpp.ProcessExporterPythia8(matrix_element,
+                                                     self.mycppwriter)
+
+        exporter.write_process_h_file(\
+                  writers.CPPWriter(self.give_pos('test.h')))
+
+        #print open(self.give_pos('test.h')).read()
+        self.assertFileContains('test.h', goal_string)
+
+        goal_string = \
+"""//==========================================================================
+// This file has been automatically generated for Pythia 8 by
+// MadGraph 5 v. 1.4.6, 2012-04-XX
+// By the MadGraph Development Team
+// Please visit us at https://launchpad.net/madgraph5
+//==========================================================================
+
+#include "Sigma__uu_ttg.h"
+#include "HelAmps_.h"
+
+using namespace Pythia8_; 
+
+namespace Pythia8 
+{
+
+//==========================================================================
+// Class member functions for calculating the matrix elements for
+// Process: u u > t t g
+
+//--------------------------------------------------------------------------
+// Initialize process.
+
+void Sigma__uu_ttg::initProc() 
+{
+  // Instantiate the model class and set parameters that stay fixed during run
+  pars = Parameters_::getInstance(); 
+  pars->setIndependentParameters(particleDataPtr, couplingsPtr, slhaPtr); 
+  pars->setIndependentCouplings(); 
+  // Set massive/massless matrix elements for c/b/mu/tau
+  mcME = 0.; 
+  mbME = 0.; 
+  mmuME = 0.; 
+  mtauME = 0.; 
+  jamp2[0] = new double[3]; 
+}
+
+//--------------------------------------------------------------------------
+// Evaluate |M|^2, part independent of incoming flavour.
+
+void Sigma__uu_ttg::sigmaKin() 
+{
+  // Set the parameters which change event by event
+  pars->setDependentParameters(particleDataPtr, couplingsPtr, slhaPtr, alpS); 
+  pars->setDependentCouplings(); 
+  // Reset color flows
+  for(int i = 0; i < 3; i++ )
+    jamp2[0][i] = 0.; 
+
+  // Local variables and constants
+  const int ncomb = 32; 
+  static bool goodhel[ncomb] = {ncomb * false}; 
+  static int ntry = 0, sum_hel = 0, ngood = 0; 
+  static int igood[ncomb]; 
+  static int jhel; 
+  double t[nprocesses]; 
+  // Helicities for the process
+  static const int helicities[ncomb][nexternal] = {{-1, -1, -1, -1, -1}, {-1,
+      -1, -1, -1, 1}, {-1, -1, -1, 1, -1}, {-1, -1, -1, 1, 1}, {-1, -1, 1, -1,
+      -1}, {-1, -1, 1, -1, 1}, {-1, -1, 1, 1, -1}, {-1, -1, 1, 1, 1}, {-1, 1,
+      -1, -1, -1}, {-1, 1, -1, -1, 1}, {-1, 1, -1, 1, -1}, {-1, 1, -1, 1, 1},
+      {-1, 1, 1, -1, -1}, {-1, 1, 1, -1, 1}, {-1, 1, 1, 1, -1}, {-1, 1, 1, 1,
+      1}, {1, -1, -1, -1, -1}, {1, -1, -1, -1, 1}, {1, -1, -1, 1, -1}, {1, -1,
+      -1, 1, 1}, {1, -1, 1, -1, -1}, {1, -1, 1, -1, 1}, {1, -1, 1, 1, -1}, {1,
+      -1, 1, 1, 1}, {1, 1, -1, -1, -1}, {1, 1, -1, -1, 1}, {1, 1, -1, 1, -1},
+      {1, 1, -1, 1, 1}, {1, 1, 1, -1, -1}, {1, 1, 1, -1, 1}, {1, 1, 1, 1, -1},
+      {1, 1, 1, 1, 1}};
+  // Denominators: spins, colors and identical particles
+  const int denominators[nprocesses] = {72, 72}; 
+
+  ntry = ntry + 1; 
+
+  // Reset the matrix elements
+  for(int i = 0; i < nprocesses; i++ )
+  {
+    matrix_element[i] = 0.; 
+    t[i] = 0.; 
+  }
+
+  // Define permutation
+  int perm[nexternal]; 
+  for(int i = 0; i < nexternal; i++ )
+  {
+    perm[i] = i; 
+  }
+
+  // For now, call setupForME() here
+  id1 = 2; 
+  id2 = 2; 
+  if( !setupForME())
+  {
+    return; 
+  }
+
+  if (sum_hel == 0 || ntry < 10)
+  {
+    // Calculate the matrix element for all helicities
+    for(int ihel = 0; ihel < ncomb; ihel++ )
+    {
+      if (goodhel[ihel] || ntry < 2)
+      {
+        calculate_wavefunctions(perm, helicities[ihel]); 
+        t[0] = matrix_uu_ttg(); 
+        // Mirror initial state momenta for mirror process
+        perm[0] = 1; 
+        perm[1] = 0; 
+        // Calculate wavefunctions
+        calculate_wavefunctions(perm, helicities[ihel]); 
+        // Mirror back
+        perm[0] = 0; 
+        perm[1] = 1; 
+        // Calculate matrix elements
+        t[1] = matrix_uu_ttg(); 
+        double tsum = 0; 
+        for(int iproc = 0; iproc < nprocesses; iproc++ )
+        {
+          matrix_element[iproc] += t[iproc]; 
+          tsum += t[iproc]; 
+        }
+        // Store which helicities give non-zero result
+        if (tsum != 0. && !goodhel[ihel])
+        {
+          goodhel[ihel] = true; 
+          ngood++; 
+          igood[ngood] = ihel; 
+        }
+      }
+    }
+    jhel = 0; 
+    sum_hel = min(sum_hel, ngood); 
+  }
+  else
+  {
+    // Only use the "good" helicities
+    for(int j = 0; j < sum_hel; j++ )
+    {
+      jhel++; 
+      if (jhel >= ngood)
+        jhel = 0; 
+      double hwgt = double(ngood)/double(sum_hel); 
+      int ihel = igood[jhel]; 
+      calculate_wavefunctions(perm, helicities[ihel]); 
+      t[0] = matrix_uu_ttg(); 
+      // Mirror initial state momenta for mirror process
+      perm[0] = 1; 
+      perm[1] = 0; 
+      // Calculate wavefunctions
+      calculate_wavefunctions(perm, helicities[ihel]); 
+      // Mirror back
+      perm[0] = 0; 
+      perm[1] = 1; 
+      // Calculate matrix elements
+      t[1] = matrix_uu_ttg(); 
+      for(int iproc = 0; iproc < nprocesses; iproc++ )
+      {
+        matrix_element[iproc] += t[iproc] * hwgt; 
+      }
+    }
+  }
+
+  for (int i = 0; i < nprocesses; i++ )
+    matrix_element[i] /= denominators[i]; 
+
+
+
+}
+
+//--------------------------------------------------------------------------
+// Evaluate |M|^2, including incoming flavour dependence.
+
+double Sigma__uu_ttg::sigmaHat() 
+{
+  // Select between the different processes
+  if(id1 == 2 && id2 == 2)
+  {
+    // Add matrix elements for processes with beams (2, 2)
+    return matrix_element[0] + matrix_element[1]; 
+  }
+  else
+  {
+    // Return 0 if not correct initial state assignment
+    return 0.; 
+  }
+}
+
+//--------------------------------------------------------------------------
+// Select identity, colour and anticolour.
+
+void Sigma__uu_ttg::setIdColAcol() 
+{
+  if(id1 == 2 && id2 == 2)
+  {
+    // Pick one of the flavor combinations (6, 6, 21)
+    int flavors[1][3] = {{6, 6, 21}}; 
+    vector<double> probs; 
+    double sum = matrix_element[0]; 
+    probs.push_back(matrix_element[0]/sum); 
+    int choice = rndmPtr->pick(probs); 
+    id3 = flavors[choice][0]; 
+    id4 = flavors[choice][1]; 
+    id5 = flavors[choice][2]; 
+  }
+  setId(id1, id2, id3, id4, id5); 
+  // Pick color flow
+  int ncolor[1] = {3}; 
+  if(id1 == 2 && id2 == 2 && id3 == 6 && id4 == 6 && id5 == 21)
+  {
+    vector<double> probs; 
+    double sum = jamp2[0][0] + jamp2[0][1] + jamp2[0][2]; 
+    for(int i = 0; i < ncolor[0]; i++ )
+      probs.push_back(jamp2[0][i]/sum); 
+    int ic = rndmPtr->pick(probs); 
+    static int colors[3][10] = {{3, 0, 1, 0, 1, 0, 2, 0, 3, 2}, {2, 0, 3, 0, 1,
+        0, 2, 0, 3, 1}, {3, 0, 2, 0, 1, 0, 2, 0, 3, 1}};
+    setColAcol(colors[ic][0], colors[ic][1], colors[ic][2], colors[ic][3],
+        colors[ic][4], colors[ic][5], colors[ic][6], colors[ic][7],
+        colors[ic][8], colors[ic][9]);
+  }
+  else if(id1 == 2 && id2 == 2 && id3 == 6 && id4 == 6 && id5 == 21)
+  {
+    vector<double> probs; 
+    double sum = jamp2[0][0] + jamp2[0][1] + jamp2[0][2]; 
+    for(int i = 0; i < ncolor[0]; i++ )
+      probs.push_back(jamp2[0][i]/sum); 
+    int ic = rndmPtr->pick(probs); 
+    static int colors[3][10] = {{1, 0, 3, 0, 1, 0, 2, 0, 3, 2}, {3, 0, 2, 0, 1,
+        0, 2, 0, 3, 1}, {2, 0, 3, 0, 1, 0, 2, 0, 3, 1}};
+    setColAcol(colors[ic][0], colors[ic][1], colors[ic][2], colors[ic][3],
+        colors[ic][4], colors[ic][5], colors[ic][6], colors[ic][7],
+        colors[ic][8], colors[ic][9]);
+  }
+}
+
+//--------------------------------------------------------------------------
+// Evaluate weight for angles of decay products in process
+
+double Sigma__uu_ttg::weightDecay(Event& process, int iResBeg, int iResEnd) 
+{
+  // Just use isotropic decay (default)
+  return 1.; 
+}
+
+//==========================================================================
+// Private class member functions
+
+//--------------------------------------------------------------------------
+// Evaluate |M|^2 for each subprocess
+
+void Sigma__uu_ttg::calculate_wavefunctions(const int perm[], const int hel[])
+{
+  // Calculate wavefunctions for all processes
+  double p[nexternal][4]; 
+  int i; 
+
+  // Convert Pythia 4-vectors to double[]
+  for(i = 0; i < nexternal; i++ )
+  {
+    p[i][0] = pME[i].e(); 
+    p[i][1] = pME[i].px(); 
+    p[i][2] = pME[i].py(); 
+    p[i][3] = pME[i].pz(); 
+  }
+
+  // Calculate all wavefunctions
+  ixxxxx(p[perm[0]], mME[0], hel[0], +1, w[0]); 
+  ixxxxx(p[perm[1]], mME[1], hel[1], +1, w[1]); 
+  oxxxxx(p[perm[2]], mME[2], hel[2], +1, w[2]); 
+  oxxxxx(p[perm[3]], mME[3], hel[3], +1, w[3]); 
+  vxxxxx(p[perm[4]], mME[4], hel[4], +1, w[4]); 
+  FFV1_2(w[0], w[4], pars->GG, pars->zero, pars->zero, w[5]); 
+  FFFF1_2(w[0], w[1], w[2], pars->GEFF, pars->MT, pars->WT, w[6]); 
+  FFFF1_2(w[0], w[1], w[3], pars->GEFF, pars->MT, pars->WT, w[7]); 
+  FFFF1_1(w[2], w[0], w[3], pars->GEFF, pars->zero, pars->zero, w[8]); 
+
+  // Calculate all amplitudes
+  // Amplitude(s) for diagram number 0
+  FFFF1_0(w[1], w[2], w[5], w[3], pars->GEFF, amp[0]); 
+  FFV1_0(w[6], w[3], w[4], pars->GG, amp[1]); 
+  FFV1_0(w[7], w[2], w[4], pars->GG, amp[2]); 
+  FFV1_0(w[1], w[8], w[4], pars->GG, amp[3]); 
+
+
+}
+double Sigma__uu_ttg::matrix_uu_ttg() 
+{
+  int i, j; 
+  // Local variables
+  const int ngraphs = 4; 
+  const int ncolor = 3; 
+  std::complex<double> ztemp; 
+  std::complex<double> jamp[ncolor]; 
+  // The color matrix;
+  static const double denom[ncolor] = {1, 1, 1}; 
+  static const double cf[ncolor][ncolor] = {{12, 0, 4}, {0, 12, 4}, {4, 4,
+      12}};
+
+  // Calculate color flows
+  jamp[0] = +amp[0] + amp[1]; 
+  jamp[1] = +amp[3]; 
+  jamp[2] = -amp[2]; 
+
+  // Sum and square the color flows to get the matrix element
+  double matrix = 0; 
+  for(i = 0; i < ncolor; i++ )
+  {
+    ztemp = 0.; 
+    for(j = 0; j < ncolor; j++ )
+      ztemp = ztemp + cf[i][j] * jamp[j]; 
+    matrix = matrix + real(ztemp * conj(jamp[i]))/denom[i]; 
+  }
+
+  // Store the leading color flows for choice of color
+  for(i = 0; i < ncolor; i++ )
+    jamp2[0][i] += real(jamp[i] * conj(jamp[i])); 
+
+  return matrix; 
+}
+
+
+}  // end namespace Pythia
+"""
+
+        exporter.write_process_cc_file(\
+                  writers.CPPWriter(self.give_pos('test.cc')))
+
+        #print open(self.give_pos('test.cc')).read()
+        self.assertFileContains('test.cc', goal_string)
+
+
     def disabled_test_write_process_files(self):
         """Test writing the .h  and .cc Pythia file for a matrix element"""
 
@@ -1312,6 +1868,7 @@
         print "cd /tmp; g++ -c -I $PATH_TO_PYTHIA8/include Sigma_sm_qqx_qqx.cc.cc"
 
 
+
 #===============================================================================
 # ExportUFOModelPythia8Test
 #===============================================================================
@@ -1340,68 +1897,54 @@
         """Test writing the Pythia model parameter files"""
 
         goal_file_h = \
-"""//==========================================================================
-// This file has been automatically generated for Pythia 8
+"""//==========================================================================\n
+// This file has been automatically generated for Pythia 8\n
 #  MadGraph 5 v. %(version)s, %(date)s
-#  By the MadGraph Development Team
-#  Please visit us at https://launchpad.net/madgraph5
-//==========================================================================
-
-#ifndef Pythia8_parameters_sm_H
-#define Pythia8_parameters_sm_H
-
-#include <complex>
-
-#include "ParticleData.h"
-#include "StandardModel.h"
-#include "SusyLesHouches.h"
-
-using namespace std;
-
-namespace Pythia8 {
-
-class Parameters_sm
-{
-public:
-
-static Parameters_sm* getInstance();
-
-// Model parameters independent of aS
-double WTau,WH,WW,WZ,WT,MTA,MM,Me,MH,MZ,MB,MT,MC,ymtau,ymm,yme,ymt,ymb,ymc,etaWS,rhoWS,AWS,lamWS,Gf,aEWM1,ZERO,lamWS__exp__2,lamWS__exp__3,MZ__exp__2,MZ__exp__4,sqrt__2,MH__exp__2,aEW,MW,sqrt__aEW,ee,MW__exp__2,sw2,cw,sqrt__sw2,sw,g1,gw,v,v__exp__2,lam,yb,yc,ye,ym,yt,ytau,muH,gw__exp__2,cw__exp__2,ee__exp__2,sw__exp__2;
-std::complex<double> CKM11,CKM12,complexi,CKM13,CKM21,CKM22,CKM23,CKM31,CKM32,CKM33,conjg__CKM11,conjg__CKM12,conjg__CKM13,conjg__CKM21,conjg__CKM22,conjg__CKM23,conjg__CKM31,conjg__CKM32,conjg__CKM33;
-// Model parameters dependent on aS
-double aS,sqrt__aS,G,G__exp__2;
-// Model couplings independent of aS
-std::complex<double> GC_1,GC_2,GC_3,GC_7,GC_8,GC_9,GC_10,GC_11,GC_12,GC_13,GC_14,GC_15,GC_16,GC_17,GC_18,GC_19,GC_20,GC_21,GC_22,GC_23,GC_24,GC_25,GC_26,GC_27,GC_28,GC_29,GC_30,GC_31,GC_32,GC_33,GC_34,GC_35,GC_36,GC_37,GC_38,GC_39,GC_40,GC_41,GC_42,GC_43,GC_44,GC_45,GC_46,GC_47;
-// Model couplings dependent on aS
-std::complex<double> GC_6,GC_5,GC_4;
-
-// Set parameters that are unchanged during the run
-void setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr);
-// Set couplings that are unchanged during the run
-void setIndependentCouplings();
-// Set parameters that are changed event by event
-void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS);
-// Set couplings that are changed event by event
-void setDependentCouplings();
-
-// Print parameters that are unchanged during the run
-void printIndependentParameters();
-// Print couplings that are unchanged during the run
-void printIndependentCouplings();
-// Print parameters that are changed event by event
-void printDependentParameters();
-// Print couplings that are changed event by event
-void printDependentCouplings();
-
-
-  private:
-static Parameters_sm* instance;
-};
-
-} // end namespace Pythia8
-#endif // Pythia8_parameters_sm_H
-""" % misc.get_pkg_info()
+#  By the MadGraph Development Team\n
+#  Please visit us at https://launchpad.net/madgraph5\n
+//==========================================================================\n\n
+#ifndef Pythia8_parameters_sm_H\n
+#define Pythia8_parameters_sm_H\n\n
+#include <complex>\n\n
+#include "ParticleData.h"\n
+#include "StandardModel.h"\n
+#include "SusyLesHouches.h"\n\n
+using namespace std;\n\n
+namespace Pythia8 {\n\n
+class Parameters_sm\n
+{\n
+public:\n\n
+static Parameters_sm* getInstance();\n\n
+// Model parameters independent of aS\n
+double WTau,WH,WW,WZ,WT,MTA,MM,Me,MH,MZ,MB,MT,MC,ymtau,ymm,yme,ymt,ymb,ymc,etaWS,rhoWS,AWS,lamWS,Gf,aEWM1,ZERO,lamWS__exp__2,lamWS__exp__3,MZ__exp__2,MZ__exp__4,sqrt__2,MH__exp__2,aEW,MW,sqrt__aEW,ee,MW__exp__2,sw2,cw,sqrt__sw2,sw,g1,gw,v,v__exp__2,lam,yb,yc,ye,ym,yt,ytau,muH,gw__exp__2,cw__exp__2,ee__exp__2,sw__exp__2;\n
+std::complex<double> CKM1x1,CKM1x2,complexi,CKM1x3,CKM2x1,CKM2x2,CKM2x3,CKM3x1,CKM3x2,CKM3x3,conjg__CKM1x1,conjg__CKM1x2,conjg__CKM1x3,conjg__CKM2x1,conjg__CKM2x2,conjg__CKM2x3,conjg__CKM3x1,conjg__CKM3x2,conjg__CKM3x3;\n
+// Model parameters dependent on aS\n
+double aS,sqrt__aS,G,G__exp__2;\n
+// Model couplings independent of aS\n
+std::complex<double> GC_1,GC_2,GC_3,GC_7,GC_8,GC_9,GC_10,GC_11,GC_12,GC_13,GC_14,GC_15,GC_16,GC_17,GC_18,GC_19,GC_20,GC_21,GC_22,GC_23,GC_24,GC_25,GC_26,GC_27,GC_28,GC_29,GC_30,GC_31,GC_32,GC_33,GC_34,GC_35,GC_36,GC_37,GC_38,GC_39,GC_40,GC_41,GC_42,GC_43,GC_44,GC_45,GC_46,GC_47,GC_48;\n
+// Model couplings dependent on aS\n
+std::complex<double> GC_6,GC_5,GC_4;\n\n
+// Set parameters that are unchanged during the run\n
+void setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr);\n
+// Set couplings that are unchanged during the run\n
+void setIndependentCouplings();\n
+// Set parameters that are changed event by event\n
+void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS);\n
+// Set couplings that are changed event by event\n
+void setDependentCouplings();\n\n
+// Print parameters that are unchanged during the run\n
+void printIndependentParameters();\n
+// Print couplings that are unchanged during the run\n
+void printIndependentCouplings();\n
+// Print parameters that are changed event by event\n
+void printDependentParameters();\n
+// Print couplings that are changed event by event\n
+void printDependentCouplings();\n\n\n
+  private:\n
+static Parameters_sm* instance;\n
+};\n\n
+} // end namespace Pythia8\n
+#endif // Pythia8_parameters_sm_H\n""" % misc.get_pkg_info()
 
         goal_file_cc = \
 """//==========================================================================
@@ -1422,14 +1965,14 @@
 
     // Function to get static instance - only one instance per program
     Parameters_sm* Parameters_sm::getInstance(){
-	if (instance == 0)
-	    instance = new Parameters_sm();
+\tif (instance == 0)
+\t    instance = new Parameters_sm();
 
-	return instance;
+    return instance;
     }
 
     void Parameters_sm::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){
-	WTau=pd->mWidth(15);
+\tWTau=pd->mWidth(15);
 WH=pd->mWidth(25);
 WW=pd->mWidth(24);
 WZ=pd->mWidth(23);
@@ -1464,30 +2007,30 @@
 aEWM1 = 1./csm->alphaEM(pow(pd->m0(23),2));
 ZERO = 0.;
 lamWS__exp__2 = pow(lamWS,2.);
-CKM11 = 1.-lamWS__exp__2/2.;
-CKM12 = lamWS;
+CKM1x1 = 1.-lamWS__exp__2/2.;
+CKM1x2 = lamWS;
 complexi = std::complex<double>(0.,1.);
 lamWS__exp__3 = pow(lamWS,3.);
-CKM13 = AWS*lamWS__exp__3*(-(etaWS*complexi)+rhoWS);
-CKM21 = -lamWS;
-CKM22 = 1.-lamWS__exp__2/2.;
-CKM23 = AWS*lamWS__exp__2;
-CKM31 = AWS*lamWS__exp__3*(1.-etaWS*complexi-rhoWS);
-CKM32 = -(AWS*lamWS__exp__2);
-CKM33 = 1.;
+CKM1x3 = AWS*lamWS__exp__3*(-(etaWS*complexi)+rhoWS);
+CKM2x1 = -lamWS;
+CKM2x2 = 1.-lamWS__exp__2/2.;
+CKM2x3 = AWS*lamWS__exp__2;
+CKM3x1 = AWS*lamWS__exp__3*(1.-etaWS*complexi-rhoWS);
+CKM3x2 = -(AWS*lamWS__exp__2);
+CKM3x3 = 1.;
 MZ__exp__2 = pow(MZ,2.);
 MZ__exp__4 = pow(MZ,4.);
 sqrt__2 = sqrt(2.);
 MH__exp__2 = pow(MH,2.);
-conjg__CKM11 = conj(CKM11);
-conjg__CKM12 = conj(CKM12);
-conjg__CKM13 = conj(CKM13);
-conjg__CKM21 = conj(CKM21);
-conjg__CKM22 = conj(CKM22);
-conjg__CKM23 = conj(CKM23);
-conjg__CKM31 = conj(CKM31);
-conjg__CKM32 = conj(CKM32);
-conjg__CKM33 = conj(CKM33);
+conjg__CKM1x1 = conj(CKM1x1);
+conjg__CKM1x2 = conj(CKM1x2);
+conjg__CKM1x3 = conj(CKM1x3);
+conjg__CKM2x1 = conj(CKM2x1);
+conjg__CKM2x2 = conj(CKM2x2);
+conjg__CKM2x3 = conj(CKM2x3);
+conjg__CKM3x1 = conj(CKM3x1);
+conjg__CKM3x2 = conj(CKM3x2);
+conjg__CKM3x3 = conj(CKM3x3);
 aEW = 1./aEWM1;
 MW = sqrt(MZ__exp__2/2.+sqrt(MZ__exp__4/4.-(aEW*M_PI*MZ__exp__2)/(Gf*sqrt__2)));
 sqrt__aEW = sqrt(aEW);
@@ -1515,67 +2058,68 @@
 sw__exp__2 = pow(sw,2.);
     }
     void Parameters_sm::setIndependentCouplings(){
-	GC_1 = -(ee*complexi)/3.;
+\tGC_1 = -(ee*complexi)/3.;
 GC_2 = (2.*ee*complexi)/3.;
 GC_3 = -(ee*complexi);
 GC_7 = cw*complexi*gw;
 GC_8 = -(complexi*gw__exp__2);
 GC_9 = cw__exp__2*complexi*gw__exp__2;
-GC_10 = (ee__exp__2*complexi)/(2.*sw__exp__2);
-GC_11 = (ee*complexi)/(sw*sqrt__2);
-GC_12 = (CKM11*ee*complexi)/(sw*sqrt__2);
-GC_13 = (CKM12*ee*complexi)/(sw*sqrt__2);
-GC_14 = (CKM13*ee*complexi)/(sw*sqrt__2);
-GC_15 = (CKM21*ee*complexi)/(sw*sqrt__2);
-GC_16 = (CKM22*ee*complexi)/(sw*sqrt__2);
-GC_17 = (CKM23*ee*complexi)/(sw*sqrt__2);
-GC_18 = (CKM31*ee*complexi)/(sw*sqrt__2);
-GC_19 = (CKM32*ee*complexi)/(sw*sqrt__2);
-GC_20 = (CKM33*ee*complexi)/(sw*sqrt__2);
-GC_21 = -(cw*ee*complexi)/(2.*sw);
-GC_22 = (cw*ee*complexi)/(2.*sw);
-GC_23 = -(ee*complexi*sw)/(6.*cw);
-GC_24 = (ee*complexi*sw)/(2.*cw);
-GC_25 = complexi*gw*sw;
-GC_26 = -2.*cw*complexi*gw__exp__2*sw;
-GC_27 = complexi*gw__exp__2*sw__exp__2;
-GC_28 = (cw*ee*complexi)/(2.*sw)+(ee*complexi*sw)/(2.*cw);
-GC_29 = ee__exp__2*complexi+(cw__exp__2*ee__exp__2*complexi)/(2.*sw__exp__2)+(ee__exp__2*complexi*sw__exp__2)/(2.*cw__exp__2);
-GC_30 = -6.*complexi*lam*v;
-GC_31 = (ee__exp__2*complexi*v)/(2.*sw__exp__2);
-GC_32 = ee__exp__2*complexi*v+(cw__exp__2*ee__exp__2*complexi*v)/(2.*sw__exp__2)+(ee__exp__2*complexi*sw__exp__2*v)/(2.*cw__exp__2);
-GC_33 = -((complexi*yb)/sqrt__2);
-GC_34 = -((complexi*yc)/sqrt__2);
-GC_35 = -((complexi*ye)/sqrt__2);
-GC_36 = -((complexi*ym)/sqrt__2);
-GC_37 = -((complexi*yt)/sqrt__2);
-GC_38 = -((complexi*ytau)/sqrt__2);
-GC_39 = (ee*complexi*conjg__CKM11)/(sw*sqrt__2);
-GC_40 = (ee*complexi*conjg__CKM12)/(sw*sqrt__2);
-GC_41 = (ee*complexi*conjg__CKM13)/(sw*sqrt__2);
-GC_42 = (ee*complexi*conjg__CKM21)/(sw*sqrt__2);
-GC_43 = (ee*complexi*conjg__CKM22)/(sw*sqrt__2);
-GC_44 = (ee*complexi*conjg__CKM23)/(sw*sqrt__2);
-GC_45 = (ee*complexi*conjg__CKM31)/(sw*sqrt__2);
-GC_46 = (ee*complexi*conjg__CKM32)/(sw*sqrt__2);
-GC_47 = (ee*complexi*conjg__CKM33)/(sw*sqrt__2);
+GC_10 = -6.*complexi*lam;
+GC_11 = (ee__exp__2*complexi)/(2.*sw__exp__2);
+GC_12 = (ee*complexi)/(sw*sqrt__2);
+GC_13 = (CKM1x1*ee*complexi)/(sw*sqrt__2);
+GC_14 = (CKM1x2*ee*complexi)/(sw*sqrt__2);
+GC_15 = (CKM1x3*ee*complexi)/(sw*sqrt__2);
+GC_16 = (CKM2x1*ee*complexi)/(sw*sqrt__2);
+GC_17 = (CKM2x2*ee*complexi)/(sw*sqrt__2);
+GC_18 = (CKM2x3*ee*complexi)/(sw*sqrt__2);
+GC_19 = (CKM3x1*ee*complexi)/(sw*sqrt__2);
+GC_20 = (CKM3x2*ee*complexi)/(sw*sqrt__2);
+GC_21 = (CKM3x3*ee*complexi)/(sw*sqrt__2);
+GC_22 = -(cw*ee*complexi)/(2.*sw);
+GC_23 = (cw*ee*complexi)/(2.*sw);
+GC_24 = -(ee*complexi*sw)/(6.*cw);
+GC_25 = (ee*complexi*sw)/(2.*cw);
+GC_26 = complexi*gw*sw;
+GC_27 = -2.*cw*complexi*gw__exp__2*sw;
+GC_28 = complexi*gw__exp__2*sw__exp__2;
+GC_29 = (cw*ee*complexi)/(2.*sw)+(ee*complexi*sw)/(2.*cw);
+GC_30 = ee__exp__2*complexi+(cw__exp__2*ee__exp__2*complexi)/(2.*sw__exp__2)+(ee__exp__2*complexi*sw__exp__2)/(2.*cw__exp__2);
+GC_31 = -6.*complexi*lam*v;
+GC_32 = (ee__exp__2*complexi*v)/(2.*sw__exp__2);
+GC_33 = ee__exp__2*complexi*v+(cw__exp__2*ee__exp__2*complexi*v)/(2.*sw__exp__2)+(ee__exp__2*complexi*sw__exp__2*v)/(2.*cw__exp__2);
+GC_34 = -((complexi*yb)/sqrt__2);
+GC_35 = -((complexi*yc)/sqrt__2);
+GC_36 = -((complexi*ye)/sqrt__2);
+GC_37 = -((complexi*ym)/sqrt__2);
+GC_38 = -((complexi*yt)/sqrt__2);
+GC_39 = -((complexi*ytau)/sqrt__2);
+GC_40 = (ee*complexi*conjg__CKM1x1)/(sw*sqrt__2);
+GC_41 = (ee*complexi*conjg__CKM1x2)/(sw*sqrt__2);
+GC_42 = (ee*complexi*conjg__CKM1x3)/(sw*sqrt__2);
+GC_43 = (ee*complexi*conjg__CKM2x1)/(sw*sqrt__2);
+GC_44 = (ee*complexi*conjg__CKM2x2)/(sw*sqrt__2);
+GC_45 = (ee*complexi*conjg__CKM2x3)/(sw*sqrt__2);
+GC_46 = (ee*complexi*conjg__CKM3x1)/(sw*sqrt__2);
+GC_47 = (ee*complexi*conjg__CKM3x2)/(sw*sqrt__2);
+GC_48 = (ee*complexi*conjg__CKM3x3)/(sw*sqrt__2);
     }
     void Parameters_sm::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){
-	aS = alpS;
+\taS = alpS;
 sqrt__aS = sqrt(aS);
 G = 2.*sqrt__aS*sqrt(M_PI);
 G__exp__2 = pow(G,2.);
     }
     void Parameters_sm::setDependentCouplings(){
-	GC_6 = complexi*G__exp__2;
+\tGC_6 = complexi*G__exp__2;
 GC_5 = complexi*G;
 GC_4 = -G;
     }
 
     // Routines for printing out parameters
     void Parameters_sm::printIndependentParameters(){
-	cout << "sm model parameters independent of event kinematics:" << endl;
-	cout << setw(20) << "WTau " << "= " << setiosflags(ios::scientific) << setw(10) << WTau << endl;
+\tcout << "sm model parameters independent of event kinematics:" << endl;
+\tcout << setw(20) << "WTau " << "= " << setiosflags(ios::scientific) << setw(10) << WTau << endl;
 cout << setw(20) << "WH " << "= " << setiosflags(ios::scientific) << setw(10) << WH << endl;
 cout << setw(20) << "WW " << "= " << setiosflags(ios::scientific) << setw(10) << WW << endl;
 cout << setw(20) << "WZ " << "= " << setiosflags(ios::scientific) << setw(10) << WZ << endl;
@@ -1602,30 +2146,30 @@
 cout << setw(20) << "aEWM1 " << "= " << setiosflags(ios::scientific) << setw(10) << aEWM1 << endl;
 cout << setw(20) << "ZERO " << "= " << setiosflags(ios::scientific) << setw(10) << ZERO << endl;
 cout << setw(20) << "lamWS__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << lamWS__exp__2 << endl;
-cout << setw(20) << "CKM11 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM11 << endl;
-cout << setw(20) << "CKM12 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM12 << endl;
+cout << setw(20) << "CKM1x1 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM1x1 << endl;
+cout << setw(20) << "CKM1x2 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM1x2 << endl;
 cout << setw(20) << "complexi " << "= " << setiosflags(ios::scientific) << setw(10) << complexi << endl;
 cout << setw(20) << "lamWS__exp__3 " << "= " << setiosflags(ios::scientific) << setw(10) << lamWS__exp__3 << endl;
-cout << setw(20) << "CKM13 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM13 << endl;
-cout << setw(20) << "CKM21 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM21 << endl;
-cout << setw(20) << "CKM22 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM22 << endl;
-cout << setw(20) << "CKM23 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM23 << endl;
-cout << setw(20) << "CKM31 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM31 << endl;
-cout << setw(20) << "CKM32 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM32 << endl;
-cout << setw(20) << "CKM33 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM33 << endl;
+cout << setw(20) << "CKM1x3 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM1x3 << endl;
+cout << setw(20) << "CKM2x1 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM2x1 << endl;
+cout << setw(20) << "CKM2x2 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM2x2 << endl;
+cout << setw(20) << "CKM2x3 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM2x3 << endl;
+cout << setw(20) << "CKM3x1 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM3x1 << endl;
+cout << setw(20) << "CKM3x2 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM3x2 << endl;
+cout << setw(20) << "CKM3x3 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM3x3 << endl;
 cout << setw(20) << "MZ__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << MZ__exp__2 << endl;
 cout << setw(20) << "MZ__exp__4 " << "= " << setiosflags(ios::scientific) << setw(10) << MZ__exp__4 << endl;
 cout << setw(20) << "sqrt__2 " << "= " << setiosflags(ios::scientific) << setw(10) << sqrt__2 << endl;
 cout << setw(20) << "MH__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << MH__exp__2 << endl;
-cout << setw(20) << "conjg__CKM11 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM11 << endl;
-cout << setw(20) << "conjg__CKM12 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM12 << endl;
-cout << setw(20) << "conjg__CKM13 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM13 << endl;
-cout << setw(20) << "conjg__CKM21 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM21 << endl;
-cout << setw(20) << "conjg__CKM22 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM22 << endl;
-cout << setw(20) << "conjg__CKM23 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM23 << endl;
-cout << setw(20) << "conjg__CKM31 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM31 << endl;
-cout << setw(20) << "conjg__CKM32 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM32 << endl;
-cout << setw(20) << "conjg__CKM33 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM33 << endl;
+cout << setw(20) << "conjg__CKM1x1 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM1x1 << endl;
+cout << setw(20) << "conjg__CKM1x2 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM1x2 << endl;
+cout << setw(20) << "conjg__CKM1x3 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM1x3 << endl;
+cout << setw(20) << "conjg__CKM2x1 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM2x1 << endl;
+cout << setw(20) << "conjg__CKM2x2 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM2x2 << endl;
+cout << setw(20) << "conjg__CKM2x3 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM2x3 << endl;
+cout << setw(20) << "conjg__CKM3x1 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM3x1 << endl;
+cout << setw(20) << "conjg__CKM3x2 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM3x2 << endl;
+cout << setw(20) << "conjg__CKM3x3 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM3x3 << endl;
 cout << setw(20) << "aEW " << "= " << setiosflags(ios::scientific) << setw(10) << aEW << endl;
 cout << setw(20) << "MW " << "= " << setiosflags(ios::scientific) << setw(10) << MW << endl;
 cout << setw(20) << "sqrt__aEW " << "= " << setiosflags(ios::scientific) << setw(10) << sqrt__aEW << endl;
@@ -1653,8 +2197,8 @@
 cout << setw(20) << "sw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << sw__exp__2 << endl;
     }
     void Parameters_sm::printIndependentCouplings(){
-	cout << "sm model couplings independent of event kinematics:" << endl;
-	cout << setw(20) << "GC_1 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_1 << endl;
+\tcout << "sm model couplings independent of event kinematics:" << endl;
+\tcout << setw(20) << "GC_1 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_1 << endl;
 cout << setw(20) << "GC_2 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_2 << endl;
 cout << setw(20) << "GC_3 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_3 << endl;
 cout << setw(20) << "GC_7 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_7 << endl;
@@ -1698,17 +2242,18 @@
 cout << setw(20) << "GC_45 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_45 << endl;
 cout << setw(20) << "GC_46 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_46 << endl;
 cout << setw(20) << "GC_47 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_47 << endl;
+cout << setw(20) << "GC_48 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_48 << endl;
     }
     void Parameters_sm::printDependentParameters(){
-	cout << "sm model parameters dependent on event kinematics:" << endl;
-	cout << setw(20) << "aS " << "= " << setiosflags(ios::scientific) << setw(10) << aS << endl;
+\tcout << "sm model parameters dependent on event kinematics:" << endl;
+\tcout << setw(20) << "aS " << "= " << setiosflags(ios::scientific) << setw(10) << aS << endl;
 cout << setw(20) << "sqrt__aS " << "= " << setiosflags(ios::scientific) << setw(10) << sqrt__aS << endl;
 cout << setw(20) << "G " << "= " << setiosflags(ios::scientific) << setw(10) << G << endl;
 cout << setw(20) << "G__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << G__exp__2 << endl;
     }
     void Parameters_sm::printDependentCouplings(){
-	cout << "sm model couplings dependent on event kinematics:" << endl;
-	cout << setw(20) << "GC_6 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_6 << endl;
+\tcout << "sm model couplings dependent on event kinematics:" << endl;
+\tcout << setw(20) << "GC_6 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_6 << endl;
 cout << setw(20) << "GC_5 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_5 << endl;
 cout << setw(20) << "GC_4 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_4 << endl;
     }
@@ -1718,6 +2263,9 @@
 
         file_h, file_cc = self.model_builder.generate_parameters_class_files()
 
-        self.assertEqual(file_h, goal_file_h)
-        self.assertEqual(file_cc, goal_file_cc)
+        self.assertEqual([l for l in file_h.split('\n') if l.strip()], 
+                         [l for l in goal_file_h.split('\n') if l.strip()])
+
+        self.assertEqual([l.strip() for l in file_cc.split('\n') if l.strip()], 
+                          [l.strip() for l in goal_file_cc.split('\n') if l.strip()])
 

=== modified file 'tests/unit_tests/iolibs/test_export_v4.py'
--- tests/unit_tests/iolibs/test_export_v4.py	2012-04-16 08:48:53 +0000
+++ tests/unit_tests/iolibs/test_export_v4.py	2012-05-16 04:17:21 +0000
@@ -4775,6 +4775,259 @@
 # Amplitude(s) for diagram number 28
 CALL VVVXXX(W(1,4),W(1,2),W(1,24),MGVX5,AMP(28))""")
 
+    def test_helas_diagrams_gg_gogo_go_tt1x_t_wpb(self):
+        """Testing g g > go go, (go > t t1~, t > w+ b)
+        """
+
+        # Set up model
+
+        mypartlist = base_objects.ParticleList()
+        myinterlist = base_objects.InteractionList()
+
+        # A gluon and gluino
+        mypartlist.append(base_objects.Particle({'name':'g',
+                      'antiname':'g',
+                      'spin':3,
+                      'color':8,
+                      'mass':'zero',
+                      'width':'zero',
+                      'texname':'g',
+                      'antitexname':'g',
+                      'line':'curly',
+                      'charge':0.,
+                      'pdg_code':21,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':True}))
+        g = mypartlist[-1]
+
+        mypartlist.append(base_objects.Particle({'name':'go',
+                      'antiname':'go',
+                      'spin':2,
+                      'color':8,
+                      'mass':'MGO',
+                      'width':'WGO',
+                      'texname':'g',
+                      'antitexname':'g',
+                      'line':'curly',
+                      'charge':0.,
+                      'pdg_code':1000021,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':True}))
+        go = mypartlist[-1]
+
+        # A top quark and stop squark
+        mypartlist.append(base_objects.Particle({'name':'t',
+                      'antiname':'t~',
+                      'spin':2,
+                      'color':3,
+                      'mass':'MT',
+                      'width':'WT',
+                      'texname':'t',
+                      'antitexname':'\bar t',
+                      'line':'straight',
+                      'charge':2. / 3.,
+                      'pdg_code':6,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        t = mypartlist[len(mypartlist) - 1]
+        antit = copy.copy(t)
+        antit.set('is_part', False)
+
+        mypartlist.append(base_objects.Particle({'name':'t1',
+                      'antiname':'t1~',
+                      'spin':0,
+                      'color':3,
+                      'mass':'MT1',
+                      'width':'WT1',
+                      'texname':'t1',
+                      'antitexname':'\bar t1',
+                      'line':'dashed',
+                      'charge':2. / 3.,
+                      'pdg_code':1000006,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        t1 = mypartlist[len(mypartlist) - 1]
+        antit1 = copy.copy(t1)
+        antit1.set('is_part', False)
+
+        # A W
+        mypartlist.append(base_objects.Particle({'name':'W+',
+                      'antiname':'W-',
+                      'spin':3,
+                      'color':1,
+                      'mass':'MW',
+                      'width':'WW',
+                      'texname':'W^+',
+                      'antitexname':'W^-',
+                     'line':'wavy',
+                      'charge':1.,
+                      'pdg_code':24,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        Wplus = mypartlist[len(mypartlist) - 1]
+        Wminus = copy.copy(Wplus)
+        Wminus.set('is_part', False)
+
+        # b quark
+        mypartlist.append(base_objects.Particle({'name':'b',
+                      'antiname':'b~',
+                      'spin':2,
+                      'color':3,
+                      'mass':'zero',
+                      'width':'zero',
+                      'texname':'b',
+                      'antitexname':'\bar b',
+                      'line':'straight',
+                      'charge':-1. / 3.,
+                      'pdg_code':5,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        b = mypartlist[len(mypartlist) - 1]
+        antib = copy.copy(b)
+        antib.set('is_part', False)
+
+        # top-w-b coupling
+        myinterlist.append(base_objects.Interaction({
+            'id': 1,
+            'particles': base_objects.ParticleList([antib, t, Wminus]),
+            'color': [color.ColorString([color.T(1,0)])],
+            'lorentz': ['FFV2'],
+            'couplings': {(0, 0): 'GC_108'},
+            'orders': {'QED': 1}
+            }))
+        myinterlist.append(base_objects.Interaction({
+            'id': 2,
+            'particles': base_objects.ParticleList([antit, b, Wplus]),
+            'color': [color.ColorString([color.T(1,0)])],
+            'lorentz': ['FFV2'],
+            'couplings': {(0, 0): 'GC_108'},
+            'orders': {'QED': 1}
+            }))
+
+        # Gluon couplings to gluino
+        myinterlist.append(base_objects.Interaction({
+                      'id': 3,
+                      'particles': base_objects.ParticleList(\
+                                            [go, \
+                                             go, \
+                                             g]),
+                      'color': [],
+                      'lorentz':['L1'],
+                      'couplings':{(0, 0):'GQQ'},
+                      'orders':{'QCD':1}}))
+
+        # Gluino couplings to top and stop
+        myinterlist.append(base_objects.Interaction({
+                      'id': 11,
+                      'particles': base_objects.ParticleList(\
+                                            [go, \
+                                             t, \
+                                             antit1]),
+                      'color': [],
+                      'lorentz':['L1'],
+                      'couplings':{(0, 0):'GQQ'},
+                      'orders':{'QCD':1}}))
+
+        myinterlist.append(base_objects.Interaction({
+                      'id': 12,
+                      'particles': base_objects.ParticleList(\
+                                            [antit, \
+                                             go, \
+                                             t1]),
+                      'color': [],
+                      'lorentz':['L1'],
+                      'couplings':{(0, 0):'GQQ'},
+                      'orders':{'QCD':1}}))
+
+        mybasemodel = base_objects.Model()
+        mybasemodel.set('particles', mypartlist)
+        mybasemodel.set('interactions', myinterlist)
+
+        myleglist = base_objects.LegList()
+
+        myleglist.append(base_objects.Leg({'id':21,
+                                         'state':False}))
+        myleglist.append(base_objects.Leg({'id':21,
+                                         'state':False}))
+        myleglist.append(base_objects.Leg({'id':1000021}))
+        myleglist.append(base_objects.Leg({'id':1000021}))
+
+        core_proc = base_objects.Process({'legs':myleglist,
+                                          'model':mybasemodel})
+
+        myleglist = base_objects.LegList()
+
+        myleglist.append(base_objects.Leg({'id':1000021,
+                                         'state':False}))
+        myleglist.append(base_objects.Leg({'id':6}))
+        myleglist.append(base_objects.Leg({'id':-1000006}))
+
+        decay1_process = base_objects.Process({'legs':myleglist,
+                                               'model':mybasemodel,
+                                               'is_decay_chain': True})
+
+        core_proc.get('decay_chains').append(decay1_process)
+        
+        myleglist = base_objects.LegList()
+
+        myleglist.append(base_objects.Leg({'id':6,
+                                         'state':False}))
+        myleglist.append(base_objects.Leg({'id':5}))
+        myleglist.append(base_objects.Leg({'id':24}))
+
+        decay2_process = base_objects.Process({'legs':myleglist,
+                                               'model':mybasemodel,
+                                               'is_decay_chain': True})
+
+        decay1_process.get('decay_chains').append(decay2_process)
+
+        amplitude = diagram_generation.DecayChainAmplitude(core_proc)
+
+        self.assertEqual(len(amplitude.get('amplitudes')),1)
+
+        matrix_elements = helas_objects.HelasDecayChainProcess(amplitude)
+
+        matrix_element = matrix_elements.combine_decay_chain_processes()[0]
+
+        #print "\n".join(helas_call_writers.FortranUFOHelasCallWriter().\
+        #                get_matrix_element_calls(matrix_element))
+
+        self.assertEqual("\n".join(helas_call_writers.FortranUFOHelasCallWriter().\
+                                   get_matrix_element_calls(matrix_element)),
+                         """CALL VXXXXX(P(0,1),zero,NHEL(1),-1*IC(1),W(1,1))
+CALL VXXXXX(P(0,2),zero,NHEL(2),-1*IC(2),W(1,2))
+CALL OXXXXX(P(0,3),zero,NHEL(3),+1*IC(3),W(1,3))
+CALL VXXXXX(P(0,4),MW,NHEL(4),+1*IC(4),W(1,4))
+CALL FFV2_1(W(1,3),W(1,4),GC_108,MT, WT, W(1,5))
+CALL SXXXXX(P(0,5),+1*IC(5),W(1,6))
+CALL L1_1(W(1,5),W(1,6),GQQ,MGO, WGO, W(1,7))
+CALL IXXXXX(P(0,6),zero,NHEL(6),-1*IC(6),W(1,8))
+CALL VXXXXX(P(0,7),MW,NHEL(7),+1*IC(7),W(1,9))
+CALL FFV2C1_2(W(1,8),W(1,9),GC_108,MT, WT, W(1,10))
+CALL SXXXXX(P(0,8),+1*IC(8),W(1,11))
+CALL L1C1_2(W(1,10),W(1,11),GQQ,MGO, WGO, W(1,12))
+CALL L1_1(W(1,7),W(1,1),GQQ,MGO, WGO, W(1,13))
+# Amplitude(s) for diagram number 1
+CALL L1_0(W(1,12),W(1,13),W(1,2),GQQ,AMP(1))
+CALL L1_2(W(1,12),W(1,1),-GQQ,MGO, WGO, W(1,14))
+# Amplitude(s) for diagram number 2
+CALL L1_0(W(1,14),W(1,7),W(1,2),GQQ,AMP(2))""")
+
+        # Test get_used_lorentz
+        goal_lorentz_list = [(('FFV2',), (), 1), (('L1',), (), 1), 
+                             (('FFV2',), (1,), 2), (('L1',), (1,), 2), 
+                             (('L1',), (), 1), (('L1',), (), 2), 
+                             (('L1',), (), 0), (('L1',), (), 0)]
+
+        self.assertEqual(matrix_element.get_used_lorentz(),
+                         goal_lorentz_list)
+
     def test_multiple_lorentz_structures(self):
         """Testing multiple Lorentz structures for one diagram.
         """
@@ -9318,8 +9571,7 @@
         
         # couplings
         self.assertEqual(len(mg4_model.coups_dep), 3)
-        sol= ['GC_1', 'GC_2', 'GC_3', 'GC_7', 'GC_8', 'GC_9', 'GC_10', 'GC_16', 'GC_21', 'GC_22', 'GC_23', 'GC_24', 'GC_25', 'GC_26', 'GC_27', 'GC_28', 'GC_29', 'GC_30', 'GC_31', 'GC_32', 'GC_33', 'GC_37', 'GC_38']
-        
+        sol = ['GC_1', 'GC_2', 'GC_3', 'GC_7', 'GC_8', 'GC_9', 'GC_10', 'GC_11', 'GC_17', 'GC_22', 'GC_23', 'GC_24', 'GC_25', 'GC_26', 'GC_27', 'GC_28', 'GC_29', 'GC_30', 'GC_31', 'GC_32', 'GC_33', 'GC_34', 'GC_38', 'GC_39']
         self.assertEqual(sol, [ p.name for p in mg4_model.coups_indep])
 
         

=== modified file 'tests/unit_tests/iolibs/test_group_subprocs.py'
--- tests/unit_tests/iolibs/test_group_subprocs.py	2012-02-17 06:01:41 +0000
+++ tests/unit_tests/iolibs/test_group_subprocs.py	2012-05-16 04:17:21 +0000
@@ -764,3 +764,371 @@
             self.assertEqual(me.get('processes')[0].nice_string(),
                              me_strings[i])
             
+
+    def test_even_more_special_group_decay_chain(self):
+        """Test group_amplitudes for even more special decay chain"""
+
+        mypartlist = base_objects.ParticleList()
+        myinterlist = base_objects.InteractionList()
+
+        # A d quark and its antiparticle
+        mypartlist.append(base_objects.Particle({'name':'d',
+                      'antiname':'d~',
+                      'spin':2,
+                      'color':1,
+                      'mass':'zero',
+                      'width':'zero',
+                      'texname':'d',
+                      'antitexname':'\bar d',
+                      'line':'straight',
+                      'charge':-1. / 3.,
+                      'pdg_code':1,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        d = mypartlist[-1]
+        antid = copy.copy(d)
+        antid.set('is_part', False)
+
+        # A u quark and its antiparticle
+        mypartlist.append(base_objects.Particle({'name':'u',
+                      'antiname':'u~',
+                      'spin':2,
+                      'color':3,
+                      'mass':'zero',
+                      'width':'zero',
+                      'texname':'u',
+                      'antitexname':'\bar u',
+                      'line':'straight',
+                      'charge':2. / 3.,
+                      'pdg_code':2,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        u = mypartlist[len(mypartlist) - 1]
+        antiu = copy.copy(u)
+        antiu.set('is_part', False)
+
+        # An s and its antiparticle
+        mypartlist.append(base_objects.Particle({'name':'s',
+                      'antiname':'s~',
+                      'spin':2,
+                      'color':1,
+                      'mass':'zero',
+                      'width':'zero',
+                      'texname':'d',
+                      'antitexname':'\bar d',
+                      'line':'straight',
+                      'charge':-1. / 3.,
+                      'pdg_code':3,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        s = mypartlist[-1]
+        antis = copy.copy(s)
+        antis.set('is_part', False)
+
+        # A c quark and its antiparticle
+        mypartlist.append(base_objects.Particle({'name':'c',
+                      'antiname':'c~',
+                      'spin':2,
+                      'color':3,
+                      'mass':'zero',
+                      'width':'zero',
+                      'texname':'c',
+                      'antitexname':'\bar c',
+                      'line':'straight',
+                      'charge':2. / 3.,
+                      'pdg_code':4,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        c = mypartlist[len(mypartlist) - 1]
+        antic = copy.copy(c)
+        antic.set('is_part', False)
+
+        # A b quark and its antiparticle
+        mypartlist.append(base_objects.Particle({'name':'b',
+                      'antiname':'b~',
+                      'spin':2,
+                      'color':1,
+                      'mass':'MB',
+                      'width':'zero',
+                      'texname':'b',
+                      'antitexname':'\bar b',
+                      'line':'straight',
+                      'charge':-1. / 3.,
+                      'pdg_code':5,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        b = mypartlist[-1]
+        antib = copy.copy(b)
+        antib.set('is_part', False)
+
+        # A t quark and its antiparticle
+        mypartlist.append(base_objects.Particle({'name':'t',
+                      'antiname':'t~',
+                      'spin':2,
+                      'color':3,
+                      'mass':'MT',
+                      'width':'zero',
+                      'texname':'t',
+                      'antitexname':'\bar t',
+                      'line':'straight',
+                      'charge':2. / 3.,
+                      'pdg_code':6,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        t = mypartlist[len(mypartlist) - 1]
+        antit = copy.copy(t)
+        antit.set('is_part', False)
+
+        # A funny Zprime
+        mypartlist.append(base_objects.Particle({
+            'name': 'Zp',
+            'antiname': 'Zp',
+            'spin': 3,
+            'color': 1,
+            'charge': 0.00,
+            'mass': 'MZp',
+            'width': 'WZp',
+            'pdg_code': 9900032,
+            'texname': 'Zp',
+            'antitexname': 'Zp',
+            'line': 'wavy',
+            'propagating': True,
+            'is_part': True,
+            'self_antipart': True}))
+
+        Zp = mypartlist[-1]
+
+        # A funny neutralino
+        mypartlist.append(base_objects.Particle({
+                    'name': '~n1',
+                    'antiname': '~n1',
+                    'spin': 2,
+                    'color': 1,
+                    'charge': 0.00,
+                    'mass': 'MnH1',
+                    'width': 'WnH1',
+                    'pdg_code': 9910012,
+                    'texname': '~n1',
+                    'antitexname': '~n1',
+                    'line': 'swavy',
+                    'propagating': True,
+                    'is_part': True,
+                    'self_antipart': True}))
+        n1 = mypartlist[-1]
+
+        # A W
+        mypartlist.append(base_objects.Particle({'name':'W+',
+                      'antiname':'W-',
+                      'spin':3,
+                      'color':1,
+                      'mass':'MW',
+                      'width':'WW',
+                      'texname':'W^+',
+                      'antitexname':'W^-',
+                     'line':'wavy',
+                      'charge':1.,
+                      'pdg_code':24,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        Wplus = mypartlist[len(mypartlist) - 1]
+        Wminus = copy.copy(Wplus)
+        Wminus.set('is_part', False)
+
+        # A electron and positron
+        mypartlist.append(base_objects.Particle({'name':'e-',
+                      'antiname':'e+',
+                      'spin':2,
+                      'color':1,
+                      'mass':'me',
+                      'width':'zero',
+                      'texname':'e^-',
+                      'antitexname':'e^+',
+                      'line':'straight',
+                      'charge':-1.,
+                      'pdg_code':11,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        eminus = mypartlist[len(mypartlist) - 1]
+        eplus = copy.copy(eminus)
+        eplus.set('is_part', False)
+
+        # Interactions
+
+        myinterlist.append(base_objects.Interaction({
+                    'id': 1,
+                    'particles': base_objects.ParticleList(\
+                        [antid,u,Wminus]),
+                    'color': [],
+                    'lorentz': ['FFV3'],
+                    'couplings': {(0, 0): 'GC_35'},
+                    'orders': {'QED': 1}}))
+
+        myinterlist.append(base_objects.Interaction({
+                    'id': 2,
+                    'particles': base_objects.ParticleList(\
+                        [antiu,d,Wplus]),
+                    'color': [],
+                    'lorentz': ['FFV3'],
+                    'couplings': {(0, 0): 'GC_112'},
+                    'orders': {'QED': 1}}))
+
+        myinterlist.append(base_objects.Interaction({
+                    'id': 3,
+                    'particles': base_objects.ParticleList(\
+                        [antis,c,Wminus]),
+                    'color': [],
+                    'lorentz': ['FFV3'],
+                    'couplings': {(0, 0): 'GC_35'},
+                    'orders': {'QED': 1}}))
+
+        myinterlist.append(base_objects.Interaction({
+                    'id': 4,
+                    'particles': base_objects.ParticleList(\
+                        [antic,s,Wplus]),
+                    'color': [],
+                    'lorentz': ['FFV3'],
+                    'couplings': {(0, 0): 'GC_112'},
+                    'orders': {'QED': 1}}))
+
+        myinterlist.append(base_objects.Interaction({
+                    'id': 5,
+                    'particles': base_objects.ParticleList(\
+                        [antib,t,Wminus]),
+                    'color': [],
+                    'lorentz': ['FFV3'],
+                    'couplings': {(0, 0): 'GC_35'},
+                    'orders': {'QED': 1}}))
+
+        myinterlist.append(base_objects.Interaction({
+                    'id': 6,
+                    'particles': base_objects.ParticleList(\
+                        [antit,b,Wplus]),
+                    'color': [],
+                    'lorentz': ['FFV3'],
+                    'couplings': {(0, 0): 'GC_112'},
+                    'orders': {'QED': 1}}))
+
+        myinterlist.append(base_objects.Interaction({
+                    'id': 7,
+                    'particles': base_objects.ParticleList(\
+                        [antid,d,Zp]),
+                    'color': [],
+                    'lorentz': ['FFV1'],
+                    'couplings': {(0, 0): 'GC_7'},
+                    'orders': {'QED': 1}
+                    }))
+        
+        myinterlist.append(base_objects.Interaction({
+                    'id': 8,
+                    'particles': base_objects.ParticleList(\
+                        [n1,n1,Zp]),
+                    'color': [],
+                    'lorentz': ['FFV2'],
+                    'couplings': {(0, 0): 'GC_22'},
+                    'orders': {'QED': 1}
+                    }))
+
+        myinterlist.append(base_objects.Interaction({
+                    'id': 9,
+                    'particles': base_objects.ParticleList(\
+                        [eplus,n1,Wminus]),
+                    'color': [],
+                    'lorentz': ['FFV3'],
+                    'couplings': {(0, 0): 'GC_46'},
+                    'orders': {'QED': 1}
+                    }))
+
+        myinterlist.append(base_objects.Interaction({
+                    'id': 10,
+                    'particles': base_objects.ParticleList(\
+                        [n1,eminus,Wplus]),
+                    'color': [],
+                    'lorentz': ['FFV3'],
+                    'couplings': {(0, 0): 'GC_46'},
+                    'orders': {'QED': 1}
+                    }))
+
+        mymodel = base_objects.Model()
+        mymodel.set('particles', mypartlist)
+        mymodel.set('interactions', myinterlist)        
+        mymodel.set('name', 'sm')
+
+        # Multiparticle labels
+        ds = [1,-1]
+        qs = [1,3,2,4,-1,-3,-2,-4]
+
+        my_leglist = base_objects.MultiLegList()
+        my_leglist.append(base_objects.MultiLeg({'ids': ds,
+                                                 'state': False}))
+        my_leglist.append(base_objects.MultiLeg({'ids': ds,
+                                                 'state': False}))
+        my_leglist.append(base_objects.MultiLeg({'ids': [n1.get('pdg_code')]}))
+        my_leglist.append(base_objects.MultiLeg({'ids': [n1.get('pdg_code')]}))
+
+        core_process = base_objects.ProcessDefinition({'legs':my_leglist,
+                                                       'model':mymodel})
+
+        decay1proc1 = [[n1.get('pdg_code')], 
+                      [11], [24]]
+        my_leglist = base_objects.MultiLegList([\
+                base_objects.MultiLeg({'ids': id}) for id in decay1proc1])
+        my_leglist[0].set('state', False)
+        decay1process1 = base_objects.ProcessDefinition({'legs':my_leglist,
+                                                        'model':mymodel})
+        decay1process2 = base_objects.ProcessDefinition({'legs':my_leglist,
+                                                        'model':mymodel})
+
+        decay2proc1 = [[24], qs, qs]
+        my_leglist = base_objects.MultiLegList([\
+                base_objects.MultiLeg({'ids': id}) for id in decay2proc1])
+        my_leglist[0].set('state', False)
+        decay2process1 = base_objects.ProcessDefinition({'legs':my_leglist,
+                                                         'model':mymodel})
+        decay2proc2 = [[24], [6], [-5]]
+        my_leglist = base_objects.MultiLegList([\
+                base_objects.MultiLeg({'ids': id}) for id in decay2proc2])
+        my_leglist[0].set('state', False)
+        decay2process2 = base_objects.ProcessDefinition({'legs':my_leglist,
+                                                         'model':mymodel})
+
+        decay1process1.get('decay_chains').append(decay2process1)
+        decay1process2.get('decay_chains').append(decay2process2)
+        core_process.get('decay_chains').append(decay1process1)
+        core_process.get('decay_chains').append(decay1process2)
+
+        my_amplitude = diagram_generation.DecayChainAmplitude(core_process)
+
+        dc_subproc_group = group_subprocs.DecayChainSubProcessGroup.\
+                          group_amplitudes(my_amplitude)
+
+        subproc_groups = \
+                       dc_subproc_group.generate_helas_decay_chain_subproc_groups()
+
+        self.assertEqual(len(subproc_groups), 1)
+
+        self.assertEqual(len(subproc_groups[0].get('matrix_elements')),2)
+
+        me_strings = ["""Process: d d~ > ~n1 ~n1 WEIGHTED=2
+  Decay: ~n1 > e- W+ WEIGHTED=1
+    Decay: W+ > u d~ WEIGHTED=1
+  Decay: ~n1 > e- W+ WEIGHTED=1
+    Decay: W+ > t b~ WEIGHTED=1""",
+                      """Process: d~ d > ~n1 ~n1 WEIGHTED=2
+  Decay: ~n1 > e- W+ WEIGHTED=1
+    Decay: W+ > u d~ WEIGHTED=1
+  Decay: ~n1 > e- W+ WEIGHTED=1
+    Decay: W+ > t b~ WEIGHTED=1"""]
+        
+
+        for i,me in enumerate(subproc_groups[0].get('matrix_elements')):
+            self.assertEqual(me.get('processes')[0].nice_string(),
+                             me_strings[i])
+            

=== modified file 'tests/unit_tests/various/test_aloha.py'
--- tests/unit_tests/various/test_aloha.py	2012-03-06 17:38:56 +0000
+++ tests/unit_tests/various/test_aloha.py	2012-05-16 04:17:21 +0000
@@ -3051,7 +3051,8 @@
         # Check that full identification symmetry works
         helas_suite = create_aloha.AbstractALOHAModel('sm')
         helas_suite.look_for_symmetries()
-        solution = {'VVVV2': {2: 1 ,4: 3}, 'SSS1': {2: 1, 3: 2}, 'VVSS1': {2: 1, 4: 3}, 'VVS1': {2: 1}}  
+        solution = {'VVVV2': {2: 1 ,4: 3}, 'SSS1': {2: 1, 3: 2}, 'VVSS1': {2: 1, 4: 3}, 
+                    'VVS1': {2: 1},'SSSS1': {2: 1, 3: 2, 4:3}}  
         self.assertEqual(solution, helas_suite.symmetries)
         
     def test_has_symmetries(self):

=== modified file 'tests/unit_tests/various/test_import_ufo.py'
--- tests/unit_tests/various/test_import_ufo.py	2011-12-14 17:09:28 +0000
+++ tests/unit_tests/various/test_import_ufo.py	2012-05-16 04:17:21 +0000
@@ -73,12 +73,12 @@
     def test_detect_special_parameters(self):
         """ check that detect zero parameters works"""        
         
-        expected = set(['etaWS', 'conjg__CKM13', 'conjg__CKM12', 'conjg__CKM32', 'conjg__CKM31', 'CKM23', 'WT', 'lamWS', 'WTau', 'AWS', 'ymc', 'ymb', 'yme', 'ymm', 'Me', 'MB', 'CKM32', 'CKM31', 'ym', 'CKM13', 'CKM12', 'lamWS__exp__2', 'lamWS__exp__3', 'yc', 'yb', 'ye', 'conjg__CKM21', 'CKM21', 'conjg__CKM23', 'MC', 'MM', 'rhoWS'])
+        expected = set(['etaWS', 'conjg__CKM1x3', 'conjg__CKM1x2', 'conjg__CKM3x2', 'conjg__CKM3x1', 'CKM2x3', 'WT', 'lamWS', 'WTau', 'AWS', 'ymc', 'ymb', 'yme', 'ymm', 'Me', 'MB', 'CKM3x2', 'CKM3x1', 'ym', 'CKM1x3', 'CKM1x2', 'lamWS__exp__2', 'lamWS__exp__3', 'yc', 'yb', 'ye', 'conjg__CKM2x1', 'CKM2x1', 'conjg__CKM2x3', 'MC', 'MM', 'rhoWS'])
         zero, one = self.model.detect_special_parameters()
         result = set(zero)
         self.assertEqual(expected, result)
         
-        expected = set(['CKM33', 'conjg__CKM11', 'conjg__CKM33', 'CKM22', 'CKM11', 'conjg__CKM22'])
+        expected = set(['CKM3x3', 'conjg__CKM1x1', 'conjg__CKM3x3', 'CKM2x2', 'CKM1x1', 'conjg__CKM2x2'])
         result = set(one)
         self.assertEqual(expected, result)
 
@@ -130,7 +130,7 @@
         zero, iden = self.model.detect_identical_couplings()
         
         # check what is the zero coupling
-        expected = set(['GC_17', 'GC_15', 'GC_14', 'GC_13', 'GC_40', 'GC_41', 'GC_19', 'GC_18', 'GC_46', 'GC_44', 'GC_45', 'GC_33', 'GC_35', 'GC_34', 'GC_42', 'GC_36'])
+        expected = set(['GC_18', 'GC_16', 'GC_15', 'GC_14', 'GC_41', 'GC_42', 'GC_20', 'GC_19', 'GC_47', 'GC_45', 'GC_46', 'GC_34', 'GC_36', 'GC_35', 'GC_43', 'GC_37'])
         result = set(zero)
         for name in result:
             self.assertEqual(self.model['coupling_dict'][name], 0)
@@ -138,7 +138,7 @@
         self.assertEqual(expected, result)        
         
         # check what are the identical coupling
-        expected = [['GC_16', 'GC_12', 'GC_11', 'GC_39', 'GC_47', 'GC_43', 'GC_20']]
+        expected = [['GC_17', 'GC_13', 'GC_12', 'GC_40', 'GC_44', 'GC_48', 'GC_21']]
         expected.sort()
         iden.sort()
         self.assertEqual(expected, iden)
@@ -146,11 +146,11 @@
     def test_locate_couplings(self):
         """ check the creation of the coupling to vertex dict """
         
-        target = ['GC_33', 'GC_29', 'GC_24', 'GC_25']
-        sol = {'GC_33': [26],
-               'GC_29': [11],
-               'GC_24': [56, 57, 58],
-               'GC_25': [4]}
+        target = ['GC_34', 'GC_30', 'GC_25', 'GC_26']
+        sol = {'GC_34': [21],
+               'GC_30': [12],
+               'GC_25': [40, 41, 42],
+               'GC_26': [5]}
         
         self.model.locate_coupling()
         for coup in target:
@@ -166,13 +166,15 @@
         zero, iden = self.model.detect_identical_couplings()
         
         # Check that All the code/model is the one intended for this test
-        target = ['GC_16', 'GC_12', 'GC_11', 'GC_39', 'GC_47', 'GC_43', 'GC_20']
+        target = ['GC_17', 'GC_13', 'GC_12', 'GC_40', 'GC_44', 'GC_48', 'GC_21']
         assert target in iden, 'test not up-to-date'
 
-        check_content = [['d', 'u', 'w+'], ['s', 'c', 'w+'], ['b', 't', 'w+'], ['u', 'd', 'w+'], ['c', 's', 'w+'], ['t', 'b', 'w+'], ['e-', 've', 'w+'], ['m-', 'vm', 'w+'], ['tt-', 'vt', 'w+'], ['ve', 'e-', 'w+'], ['vm', 'm-', 'w+'], ['vt', 'tt-', 'w+']]
+        check_content = [['u', 'd', 'w+'], ['c', 's', 'w+'], ['t', 'b', 'w+'], ['ve', 'e-', 'w+'], ['vm', 'm-', 'w+'], ['vt', 'tt-', 'w+'], ['d', 'u', 'w+'], ['s', 'c', 'w+'], ['b', 't', 'w+'], ['e-', 've', 'w+'], ['m-', 'vm', 'w+'], ['tt-', 'vt', 'w+']] 
+        
         content =  [[p.get('name') for p in v.get('particles')] \
                for v in self.model.get('interactions') \
                if any([c in target for c in v['couplings'].values()])]
+        
         assert check_content == content, 'test not up-to-date'      
 
         vertex_id = [v.get('id') \
@@ -190,12 +192,12 @@
         # check now that everything is fine        
         self.model.merge_iden_couplings(target)
         for id in vertex_id:
-            has_33 = False
+            has_coup = False
             for coup in self.model.get_interaction(id)['couplings'].values():
                 self.assertFalse(coup in target[1:])
-                if coup == 'GC_16':
-                    has_16 = True
-            self.assertTrue(has_16, True)
+                if coup == 'GC_17':
+                    has_coup = True
+            self.assertTrue(has_coup, True)
 
     def test_remove_couplings(self):
         """ check that the detection of irrelevant interactions works """
@@ -203,24 +205,24 @@
         # first test case where they are all deleted
         # check that we have the valid model
         input = self.model['interactions'][3]  # four gluon
-        input2 = self.model['interactions'][28] # b b~ h
-        self.assertTrue('GC_25' in input['couplings'].values())
-        self.assertTrue('GC_21' in input2['couplings'].values())
-        found_25 = 0
-        found_21 = 0
+        input2 = self.model['interactions'][20] # b b~ h
+        self.assertTrue('GC_6' in input['couplings'].values())
+        self.assertTrue('GC_34' in input2['couplings'].values())
+        found_gggg = 0
+        found_bbh = 0
         for dep,data in self.model['couplings'].items():
             for param in data:
-                if param.name == 'GC_25': found_25 +=1
-                elif param.name == 'GC_21': found_21 +=1
-        self.assertTrue(found_25>0)
-        self.assertTrue(found_21>0)
+                if param.name == 'GC_6': found_gggg +=1
+                elif param.name == 'GC_34': found_bbh +=1
+        self.assertTrue(found_gggg>0)
+        self.assertTrue(found_bbh>0)
         
         # make the real test
-        result = self.model.remove_couplings(['GC_25','GC_21'])
+        result = self.model.remove_couplings(['GC_6','GC_34'])
         
         for dep,data in self.model['couplings'].items():
             for param in data:
-                self.assertFalse(param.name in  ['GC_25', 'GC_21'])
+                self.assertFalse(param.name in  ['GC_6', 'GC_34'])
 
              
     def test_remove_interactions(self):
@@ -229,38 +231,38 @@
         
         # first test case where they are all deleted
         # check that we have the valid model
-        input = self.model['interactions'][2]  # four gluon
-        input2 = self.model['interactions'][25] # b b~ h
+        input = self.model['interactions'][3]  # four gluon
+        input2 = self.model['interactions'][20] # b b~ h
         self.assertTrue('GC_6' in input['couplings'].values())
-        self.assertTrue('GC_33' in input2['couplings'].values())
+        self.assertTrue('GC_34' in input2['couplings'].values())
         found_6 = 0
-        found_33 = 0
+        found_34 = 0
         for dep,data in self.model['couplings'].items():
             for param in data:
                 if param.name == 'GC_6': found_6 +=1
-                elif param.name == 'GC_33': found_33 +=1
+                elif param.name == 'GC_34': found_34 +=1
         self.assertTrue(found_6>0)
-        self.assertTrue(found_33>0)
+        self.assertTrue(found_34>0)
         
         # make the real test
         self.model.locate_coupling()
-        result = self.model.remove_interactions(['GC_6','GC_33'])
+        result = self.model.remove_interactions(['GC_6','GC_34'])
         self.assertFalse(input in self.model['interactions'])
         self.assertFalse(input2 in self.model['interactions'])
         
     
         # Now test case where some of them are deleted and some not
-        input = self.model['interactions'][26]  # d d~ Z
-        input2 = self.model['interactions'][55] # e+ e- Z
-        self.assertTrue('GC_23' in input['couplings'].values())
-        self.assertTrue('GC_21' in input['couplings'].values())
-        self.assertTrue('GC_21' in input2['couplings'].values())
-        self.assertTrue('GC_24' in input2['couplings'].values())
-        result = self.model.remove_interactions(['GC_21','GC_24'])
-        self.assertTrue('GC_23' in input['couplings'].values())
-        self.assertFalse('GC_21' in input['couplings'].values())
-        self.assertFalse('GC_21' in input2['couplings'].values())
-        self.assertFalse('GC_24' in input2['couplings'].values())
+        input = self.model['interactions'][21]  # d d~ Z
+        input2 = self.model['interactions'][39] # e+ e- Z
+        self.assertTrue('GC_24' in input['couplings'].values())
+        self.assertTrue('GC_22' in input['couplings'].values())
+        self.assertTrue('GC_22' in input2['couplings'].values())
+        self.assertTrue('GC_25' in input2['couplings'].values())
+        result = self.model.remove_interactions(['GC_22','GC_25'])
+        self.assertTrue('GC_24' in input['couplings'].values())
+        self.assertFalse('GC_22' in input['couplings'].values())
+        self.assertFalse('GC_22' in input2['couplings'].values())
+        self.assertFalse('GC_25' in input2['couplings'].values())
 
     def test_put_parameters_to_zero(self):
         """check that we remove parameters correctly"""
@@ -302,11 +304,11 @@
     def test_restrict_from_a_param_card(self):
         """ check the full restriction chain in one case b b~ h """
         
-        interaction = self.model['interactions'][25]
+        interaction = self.model['interactions'][20]
         #check sanity of the checks
         assert [p['pdg_code'] for p in interaction['particles']] == [5, 5, 25], \
              'Initial model not valid for this test => update the test'
-        assert interaction['couplings'] == {(0,0): 'GC_33'}
+        assert interaction['couplings'] == {(0,0): 'GC_34'}
         
         self.model.restrict_model(self.restrict_file)
         
@@ -321,7 +323,7 @@
         # check remove couplings
         for dep,data in self.model['couplings'].items():
             for param in data:
-                self.assertFalse(param.name in  ['GC_33'])
+                self.assertFalse(param.name in  ['GC_34'])
 
         # check masses
         part_b = self.model.get_particle(5)

=== modified file 'tests/unit_tests/various/test_process_checks.py'
--- tests/unit_tests/various/test_process_checks.py	2011-07-21 04:25:51 +0000
+++ tests/unit_tests/various/test_process_checks.py	2012-05-16 04:17:21 +0000
@@ -199,7 +199,8 @@
         """Test that check process fails for wrong color-Lorentz."""
 
         # Change 4g interaction so color and lorentz don't agree
-        gggg = self.base_model.get_interaction(3)
+        gggg = self.base_model.get_interaction(4)
+        assert [p['pdg_code'] for p in gggg['particles']] == [21,21,21,21]
         gggg.set('lorentz', ['VVVV1', 'VVVV4', 'VVVV3'])
 
         myleglist = base_objects.LegList()