Merge lp:~maddevelopers/mg5amcnlo/1.4.6 into lp:mg5amcnlo/lts

[Olivier Mattelaer]

See Updates Notes for the modifs.

In principle this doesn't modify anything deep in 2.0, so a fast overview of the changes should be enough in your case.

Cheers,

Olivier

[marco zaro (marco-zaro)]

Hi Olivier,
if i try to merge it with our FKS5 branch i get a bunch of conflicts:
they are mainly related to the non-inclusion of the fks/loop funtionalities..
Shall we fix them?
cheers
Marco

Text conflict in aloha/create_aloha.py
Text conflict in madgraph/core/helas_objects.py
Text conflict in madgraph/interface/launch_ext_program.py
Text conflict in madgraph/interface/madgraph_interface.py
Text conflict in madgraph/interface/master_interface.py
Text conflict in madgraph/iolibs/export_v4.py
Text conflict in madgraph/iolibs/helas_call_writers.py
Text conflict in models/import_ufo.py
Text conflict in models/sm/coupling_orders.py
Text conflict in models/sm/couplings.py
Text conflict in models/sm/lorentz.py
Text conflict in models/sm/parameters.py
Text conflict in models/sm/particles.py
Text conflict in models/sm/vertices.py
Text conflict in tests/acceptance_tests/test_cmd.py
Text conflict in tests/acceptance_tests/test_model_equivalence.py
Text conflict in tests/unit_tests/iolibs/test_export_cpp.py
Text conflict in tests/unit_tests/iolibs/test_export_v4.py
Text conflict in tests/unit_tests/iolibs/test_group_subprocs.py
Text conflict in tests/unit_tests/various/test_aloha.py
Text conflict in tests/unit_tests/various/test_import_ufo.py

On 16 May 2012, at 17:24, Olivier Mattelaer wrote:

> You have been requested to review the proposed merge of lp:~maddevelopers/madgraph5/1.4.6 into lp:madgraph5/2.0.
>
> For more details, see:
> https://code.launchpad.net/~maddevelopers/madgraph5/1.4.6/+merge/105999
>
> See Updates Notes for the modifs.
>
> In principle this doesn't modify anything deep in 2.0, so a fast overview of the changes should be enough in your case.
>
> Cheers,
>
> Olivier
>
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/1.4.6/+merge/105999
> You are requested to review the proposed merge of lp:~maddevelopers/madgraph5/1.4.6 into lp:madgraph5/2.0.
> === modified file 'Template/Cards/run_card.dat'
> --- Template/Cards/run_card.dat 2011-12-10 06:11:03 +0000
> +++ Template/Cards/run_card.dat 2012-05-16 15:22:19 +0000
> @@ -27,7 +27,8 @@
> .false. = gridpack !True = setting up the grid pack
> #*********************************************************************
> # Number of events and rnd seed *
> -# Warning: Do not generate more than 100K event in a single run *
> +# Warning: Do not generate more than 1M events in a single run *
> +# If you want to run Pythia, avoid more than 50k events in a run. *
> #*********************************************************************
> 10000 = nevents ! Number of unweighted events requested
> 0 = iseed ! rnd seed (0=assigned automatically=default))
> @@ -194,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...

[Olivier Mattelaer (olivier-mattelaer)]

> Shall we fix them?

yes we need to do that. They are a lot of those :-(

Do you want that we do that togheter via Skype?

Cheers,

Olivier

On May 16, 2012, at 10:46 AM, marco zaro wrote:

> Hi Olivier,
> if i try to merge it with our FKS5 branch i get a bunch of conflicts:
> they are mainly related to the non-inclusion of the fks/loop
> funtionalities..
> Shall we fix them?
> cheers
> Marco
>
> Text conflict in aloha/create_aloha.py
> Text conflict in madgraph/core/helas_objects.py
> Text conflict in madgraph/interface/launch_ext_program.py
> Text conflict in madgraph/interface/madgraph_interface.py
> Text conflict in madgraph/interface/master_interface.py
> Text conflict in madgraph/iolibs/export_v4.py
> Text conflict in madgraph/iolibs/helas_call_writers.py
> Text conflict in models/import_ufo.py
> Text conflict in models/sm/coupling_orders.py
> Text conflict in models/sm/couplings.py
> Text conflict in models/sm/lorentz.py
> Text conflict in models/sm/parameters.py
> Text conflict in models/sm/particles.py
> Text conflict in models/sm/vertices.py
> Text conflict in tests/acceptance_tests/test_cmd.py
> Text conflict in tests/acceptance_tests/test_model_equivalence.py
> Text conflict in tests/unit_tests/iolibs/test_export_cpp.py
> Text conflict in tests/unit_tests/iolibs/test_export_v4.py
> Text conflict in tests/unit_tests/iolibs/test_group_subprocs.py
> Text conflict in tests/unit_tests/various/test_aloha.py
> Text conflict in tests/unit_tests/various/test_import_ufo.py
>
>
> On 16 May 2012, at 17:24, Olivier Mattelaer wrote:
>
>> You have been requested to review the proposed merge of
>> lp:~maddevelopers/madgraph5/1.4.6 into lp:madgraph5/2.0.
>>
>> For more details, see:
>> https://code.launchpad.net/~maddevelopers/madgraph5/1.4.6/+merge/
>> 105999
>>
>> See Updates Notes for the modifs.
>>
>> In principle this doesn't modify anything deep in 2.0, so a fast
>> overview of the changes should be enough in your case.
>>
>> Cheers,
>>
>> Olivier
>>
>> --
>> https://code.launchpad.net/~maddevelopers/madgraph5/1.4.6/+merge/
>> 105999
>> You are requested to review the proposed merge of lp:~maddevelopers/
>> madgraph5/1.4.6 into lp:madgraph5/2.0.
>> === modified file 'Template/Cards/run_card.dat'
>> --- Template/Cards/run_card.dat 2011-12-10 06:11:03 +0000
>> +++ Template/Cards/run_card.dat 2012-05-16 15:22:19 +0000
>> @@ -27,7 +27,8 @@
>> .false. = gridpack !True = setting up the grid pack
>> #*********************************************************************
>> # Number of events and rnd
>> seed *
>> -# Warning: Do not generate more than 100K event in a single
>> run *
>> +# Warning: Do not generate more than 1M events in a single
>> run *
>> +# If you want to run Pythia, avoid more than 50k events in a
>> run. *
>> #*********************************************************************
>> 10000 = nevents ! Number of unweighted events requested
>> 0 = iseed ! rnd seed (0=assigned automatically=default))
>> @@ -194,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 cut...

[Valentin Hirschi (valentin-hirschi)]

Hi Marco,

Of course we shall wait for the complete review of our work before merging
it with madgraph 2.0 but �we still must make sure to stay up to date with
the latest versions of the trunk pushed in madgraph 2.0 so we should fix
the conflicts occurring when merging madgraph 2.0 into FKS5.

Cheers,

On Wed, May 16, 2012 at 5:46 PM, marco zaro <email address hidden> wrote:

> Hi Olivier,
> if i try to merge it with our FKS5 branch i get a bunch of conflicts:
> they are mainly related to the non-inclusion of the fks/loop
> funtionalities..
> Shall we fix them?
> cheers
> Marco
>
> Text conflict in aloha/create_aloha.py
> Text conflict in madgraph/core/helas_objects.py
> Text conflict in madgraph/interface/launch_ext_program.py
> Text conflict in madgraph/interface/madgraph_interface.py
> Text conflict in madgraph/interface/master_interface.py
> Text conflict in madgraph/iolibs/export_v4.py
> Text conflict in madgraph/iolibs/helas_call_writers.py
> Text conflict in models/import_ufo.py
> Text conflict in models/sm/coupling_orders.py
> Text conflict in models/sm/couplings.py
> Text conflict in models/sm/lorentz.py
> Text conflict in models/sm/parameters.py
> Text conflict in models/sm/particles.py
> Text conflict in models/sm/vertices.py
> Text conflict in tests/acceptance_tests/test_cmd.py
> Text conflict in tests/acceptance_tests/test_model_equivalence.py
> Text conflict in tests/unit_tests/iolibs/test_export_cpp.py
> Text conflict in tests/unit_tests/iolibs/test_export_v4.py
> Text conflict in tests/unit_tests/iolibs/test_group_subprocs.py
> Text conflict in tests/unit_tests/various/test_aloha.py
> Text conflict in tests/unit_tests/various/test_import_ufo.py
>
>
> On 16 May 2012, at 17:24, Olivier Mattelaer wrote:
>
> > You have been requested to review the proposed merge of
> lp:~maddevelopers/madgraph5/1.4.6 into lp:madgraph5/2.0.
> >
> > For more details, see:
> > https://code.launchpad.net/~maddevelopers/madgraph5/1.4.6/+merge/105999
> >
> > See Updates Notes for the modifs.
> >
> > In principle this doesn't modify anything deep in 2.0, so a fast
> overview of the changes should be enough in your case.
> >
> > Cheers,
> >
> > Olivier
> >
> > --
> > https://code.launchpad.net/~maddevelopers/madgraph5/1.4.6/+merge/105999
> > You are requested to review the proposed merge of
> lp:~maddevelopers/madgraph5/1.4.6 into lp:madgraph5/2.0.
> > === modified file 'Template/Cards/run_card.dat'
> > --- Template/Cards/run_card.dat � � � 2011-12-10 06:11:03 +0000
> > +++ Template/Cards/run_card.dat � � � 2012-05-16 15:22:19 +0000
> > @@ -27,7 +27,8 @@
> > � .false. � � = gridpack �!True = setting up the grid pack
> > #*********************************************************************
> > # Number of events and rnd seed � � � � � � � � � � � � � � � � � � �*
> > -# Warning: Do not generate more than 100K event in a single run � � �*
> > +# Warning: Do not generate more than 1M events in a single run � � � *
> > +# If you want to run Pythia, avoid more than 50k events in a run. � �*
> > #*********************************************************************
> > � 10000 = nevents ! Number of unweighted events requested
> > � � � 0 � � � = iseed � ! rnd ...

=== modified file 'Template/Cards/run_card.dat'
--- Template/Cards/run_card.dat	2011-12-10 06:11:03 +0000
+++ Template/Cards/run_card.dat	2012-05-16 15:22:19 +0000
@@ -27,7 +27,8 @@
   .false.     = gridpack  !True = setting up the grid pack
 #*********************************************************************
 # Number of events and rnd seed                                      *
-# Warning: Do not generate more than 100K event in a single run      *
+# Warning: Do not generate more than 1M events in a single run       *
+# If you want to run Pythia, avoid more than 50k events in a run.    *
 #*********************************************************************
   10000 = nevents ! Number of unweighted events requested 
       0       = iseed   ! rnd seed (0=assigned automatically=default))
@@ -194,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	2011-07-06 23:13:41 +0000
+++ Template/README	2012-05-16 15:22:19 +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,10 +47,88 @@
 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.
+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
+input/mg5_configuration.txt file before you generate your process):
+
+# Default Running mode 
+# 0: single machine/ 1: cluster / 2: multicore
+run_mode = 0
+
+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.
+
+
+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/PDF/pdfwrap.f'
--- Template/Source/PDF/pdfwrap.f	2010-10-30 03:26:37 +0000
+++ Template/Source/PDF/pdfwrap.f	2012-05-16 15:22:19 +0000
@@ -250,13 +250,13 @@
      .'cteq5f3,','cteq5f4,','cteq5m1,','ctq5hq1,','cteq5l1,',
      .'cteq6_m,','cteq6_d,','cteq6_l,','cteq6l1,'
 c
-c
-	   write(6,*) 'Setting it to default cteq6l1'
-       pdlabel='cteq6l1'
-       asmz=0.130d0
-       nloop=1
-       Call SetCtq6(4)
-
+c     make madgraph to stop evaluating
+      stop 1
+c	   write(6,*) 'Setting it to default cteq6l1'
+c       pdlabel='cteq6l1'
+c       asmz=0.130d0
+c       nloop=1
+c       Call SetCtq6(4)
       endif      
       return
       end

=== modified file 'Template/Source/PDF/pdfwrap_lhapdf.f'
--- Template/Source/PDF/pdfwrap_lhapdf.f	2010-10-30 03:26:37 +0000
+++ Template/Source/PDF/pdfwrap_lhapdf.f	2012-05-16 15:22:19 +0000
@@ -54,7 +54,7 @@
          if(exists)return
       enddo
       print*,'Could not find PDFsets directory, quitting'
-      stop
+      stop 1
       
       return
       end

=== modified file 'Template/Source/cuts.inc'
--- Template/Source/cuts.inc	2011-06-02 20:40:32 +0000
+++ Template/Source/cuts.inc	2012-05-16 15:22:19 +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/genps.inc'
--- Template/Source/genps.inc	2011-05-29 07:23:58 +0000
+++ Template/Source/genps.inc	2012-05-16 15:22:19 +0000
@@ -32,4 +32,4 @@
       REAL*8 LIMHEL
       PARAMETER(LIMHEL=1e-6)
       INTEGER MAXTRIES
-      PARAMETER(MAXTRIES=10)
+      PARAMETER(MAXTRIES=100)

=== modified file 'Template/Source/setrun.f'
--- Template/Source/setrun.f	2011-10-05 16:27:00 +0000
+++ Template/Source/setrun.f	2012-05-16 15:22:19 +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 15:22:19 +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 15:22:19 +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 15:22:19 +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 15:22:19 +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/internal/addmasses.py'
--- Template/bin/internal/addmasses.py	2011-07-26 16:15:01 +0000
+++ Template/bin/internal/addmasses.py	2012-05-16 15:22:19 +0000
@@ -174,7 +174,6 @@
             event.append(Particle(nup,t))
         counter=counter+1
 
-
 #default is to skip this
     if motherFlag:
 
@@ -223,41 +222,20 @@
                 mySub = re.compile(s1)
                 event_description = mySub.sub(str(nup),event_description)
 
-
     if nAdded>0:
-        totalLength = len(event)+1
-        newPosition = []
-        iPos=0
-        while iPos<totalLength:           
-            for p in event:
-                if p.mo1==iPos:
-                    newPosition.append(p.no)
-            iPos=iPos+1
-
-        iUp=1
-        event0=[]
-        for ip in newPosition:
-            event0.append(event[ip-1])
-
-        iUp=0
-        for p in event0:
-            iUp=iUp+1
-            if p.no != iUp:
-                ip=iUp                
-                while ip<totalLength-1:
-                    pp=event0[ip]
-                    if pp.mo1==p.no and pp.mo1>pp.no:
-                        pp.mo1=pp.mo2=iUp
-                    ip=ip+1
-            p.no=iUp
-
-        iUp=0
-        for p in event0:
-            event[iUp]=event0[iUp]
-            iUp=iUp+1
-
-
-
+        for ip in range(len(event)):
+            l=event[ip]
+            if l.mo1 > ip + 1:
+                nmo=l.mo1
+                event.insert(ip, event.pop(l.mo1-1))
+                event[ip].no = ip + 1
+                for l2 in event[ip + 1:]:
+                    if l2.no > ip and l2.no < nmo + 1:
+                        l2.no += 1
+                    if l2.mo1 == nmo:
+                        l2.mo1 = l2.mo2 = ip + 1
+                    elif l2.mo1 > ip and l2.mo1 < nmo:
+                        l2.mo1 = l2.mo2 = l2.mo1 + 1
 
 # identify mothers
     particleDict={}
@@ -268,14 +246,15 @@
                 pass
             else:
                 if p.mo1 in particleDict:
-                    l=[particleDict[p.mo1]]
+                    l=particleDict[p.mo1]
                     l.append(p.no)
                 else:
-                    l=p.no
+                    l=[p.no]
                 particleDict[p.mo1]=l
 
 # repair kinematics
     for k in particleDict:
+        if len(particleDict[k]) != 2: continue
         t=particleDict[k]
         p1=event[t[0]-1]
         p1.mom.boost(event[k-1].mom,-1)

=== modified file 'Template/bin/internal/run_pythia'
--- Template/bin/internal/run_pythia	2011-10-18 03:42:31 +0000
+++ Template/bin/internal/run_pythia	2012-05-16 15:22:19 +0000
@@ -19,4 +19,5 @@
 echo "      LHAPATH=$pydir/PDFsets" >> ../Cards/pythia_card.dat
 export PDG_MASS_TBL=$pydir/mass_width_2004.mc
 
-$pydir/pythia && touch pythia.done
\ No newline at end of file
+$pydir/pythia && touch pythia.done
+

=== modified file 'Template/bin/madevent'
--- Template/bin/madevent	2012-02-08 05:31:40 +0000
+++ Template/bin/madevent	2012-05-16 15:22:19 +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,23 +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)
-            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)
-            sys.exit()
+            cmd_line.run_cmd('quit')
+    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-03-08 17:26:21 +0000
+++ UpdateNotes.txt	2012-05-16 15:22:19 +0000
@@ -1,5 +1,63 @@
 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 
+		  OM: Adding the 4 higgs interactions in the standard model UFO model
+                  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) 
+                      Thanks to Sho Iwamoto
+                  OM: Improve cluster support (more secure and complete version)
+                  JA: Increased the number of events tested for non-zero helicity
+                      configurations (needed for goldstino processes).
+                  OM: Add a command to remove the file RunWeb which were not always
+                      deleted correctly
+                  OM+JA: Correct the display of number of events and error for Pythia 
+                     in the html files.
+                  OM: Changed the way the stdout/stderr are treated on the cluster
+                      since some cluster cann't support to have the same output file
+                      for both. (thanks abhishek)
+
+1.4.4 (29/03/12)  OM: Added a command: "output aloha" which allows to creates a 
+                      subset (or all) of the aloha routines linked to the
+                      current model
+                  OM: allow to choose the duration of the timer for the questions.
+                      (via ./input/mg5_configuration.txt)
+                  OM: Allow UFO model where G is not defined.
+                  OM: allow to use ~,~user, ${var} in the path. Improve support
+                      for path containing spaces.
+                  JA: Fixed LHAPDF functionality which was broken in v. 1.4.0
+                  JA: Allow non-equal mixing angles in mssm restrict cards
+                      (as needed for cards from some spectrum generators)
+                  JA: Fixed script addmasses.py for complicated events such as
+                      p p > t t~ + jets with decays of t and t~.
+                  JA: Added GE cluster to the list in cluster.py.
+                  JA: Allow up to 1M events in a single run. Note that the 
+                      unweighting (combine events) step gets quite slow with
+                      so many events. Also note that if Pythia is run, still
+                      maximum 50k events is recommended in a single run. 
+                  OM: Fix problem linked to filesystem which makes new files
+                      non executables by default. (bug #958616)
+                  JA: Fixed buffer overflow in gen_ximprove when number of
+                      configs > number of diagrams due to competing resonances
+                      (introduced in v. 1.4.3).
+
 1.4.3 (08/03/12)  JA: Reintroduced the possibility to completely forbid
                       s-channel diagrams, using the $$ notation. Note that
                       this should be used with great care, since the result

=== modified file 'aloha/aloha_fct.py'
--- aloha/aloha_fct.py	2012-02-06 19:57:04 +0000
+++ aloha/aloha_fct.py	2012-05-16 15:22:19 +0000
@@ -73,4 +73,41 @@
                         raise WrongFermionFlow, 'Not coherent Incoming/outcoming fermion flow'
                     elif pos == i+1:
                         break
-        
+   
+def guess_routine_from_name(names):
+    """ return (UFO name, tag , offshell) from a given name """
+    
+    output =[]
+    for name in names:
+        data = name.split('_')
+        if len(data) == 2:
+            main, offshell = data
+            multiple = []
+        else:
+            main, multiple, offshell = data[0], data[1:-1],data[-1]
+        
+        # search for tag allow tag [L, C$]
+        allow_tag = ['C1','C2','C3','C4','C5','C6','C7']    
+        tags = []
+        len_tag = -1
+        while len(tags) != len_tag:
+            len_tag = len(tags)
+            for tag in allow_tag:
+                if main.endswith(tag):
+                    main = main[:-len(tag)]
+                    tags.append(int(tag[1:]))
+                    break
+        
+        # create the correct lorentz
+        lorentz = [main]
+        if multiple:
+            base = main
+            while base[-1].isdigit():
+                base = base[:-1]
+            for nb in multiple:
+                lorentz.append('%s%s' % (base, nb))
+        
+        # add in the results
+        output.append((tuple(lorentz), tuple(tags), int(offshell)))
+    return output
+         

=== modified file 'aloha/aloha_writers.py'
--- aloha/aloha_writers.py	2012-03-07 17:49:58 +0000
+++ aloha/aloha_writers.py	2012-05-16 15:22:19 +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-01 21:47:03 +0000
+++ aloha/create_aloha.py	2012-05-16 15:22:19 +0000
@@ -236,7 +236,7 @@
                         lorentz *= SpinorPropagator(id, 'I2', outgoing)
                     else:
                         #propagator incoming
-                        lorentz *= SpinorPropagator('I2', id, outgoing) 
+                        lorentz *= SpinorPropagator('I2', id, outgoing)
                 elif spin == 3 :
                     lorentz *= VectorPropagator(id, 'I2', id)
                 elif spin == 5 :
@@ -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 'input/mg5_configuration.txt'
--- input/mg5_configuration.txt	2012-02-03 23:38:43 +0000
+++ input/mg5_configuration.txt	2012-05-16 15:22:19 +0000
@@ -20,10 +20,9 @@
 #
 ################################################################################
 
-# Pythia8 Path.
-# Define the path to the pythia8 directory.
-# relative path start from mg5 directory
-pythia8_path = ./pythia8
+# Prefered Fortran Compiler
+# If None: try to find g77 or gfortran on the system
+fortran_compiler = None
 
 # Prefered Text Editor
 #  Default: use the shell default Editor
@@ -39,10 +38,14 @@
 # If None: try to find one available on the system
 eps_viewer = None
 
-# Prefered Fortran Compiler
-# If None: try to find g77 or gfortran on the system
-fortran_compiler = None
+# Time allowed to answer question (if no answer takes default value)
+# 0: No time limit
+timeout = 20
 
+# Pythia8 Path.
+# Define the path to the pythia8 directory.
+# relative path start from mg5 directory
+pythia8_path = ./pythia8
 
 ################################################################################
 #  INFO FOR MADEVENT 
@@ -59,7 +62,7 @@
 # 0: single machine/ 1: cluster / 2: multicore
 run_mode = 0
 
-# Cluster Type [pbs|sge|condor] Use for cluster run only
+# Cluster Type [pbs|sge|condor|lsf|ge] Use for cluster run only
 # And cluster queue
 cluster_type = condor
 cluster_queue = madgraph

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2012-03-08 17:26:21 +0000
+++ madgraph/VERSION	2012-05-16 15:22:19 +0000
@@ -1,3 +1,3 @@
-version = 1.4.3
-date = 2012-03-08
+version = 1.4.6
+date = 2012-05-16
 

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2012-02-24 06:55:34 +0000
+++ madgraph/core/base_objects.py	2012-05-16 15:22:19 +0000
@@ -1473,7 +1473,20 @@
         this diagram"""
 
         return [len(v.get('legs')) for v in self.get('vertices')]
+
+    def get_num_configs(self, model, ninitial):
+        """Return the maximum number of configs from this diagram,
+        given by 2^(number of non-zero width s-channel propagators)"""
+
+        s_channels = [v.get_s_channel_id(model,ninitial) for v in \
+                              self.get('vertices')[:-1]]
+        num_props = len([i for i in s_channels if i != 0 and \
+                         model.get_particle(i).get('width').lower() != 'zero'])
         
+        if num_props <= 1:
+            return 1
+        else:
+            return 2**num_props
 #===============================================================================
 # DiagramList
 #===============================================================================
@@ -1976,7 +1989,11 @@
         tmp = [(k,v) for (k,v) in expansion_orders.items() if 0 < v < 99]
         for (k,v) in tmp:  
             if k in orders:
-                orders[k] = min(orders[k], v)
+                if v < orders[k]:
+                    logger.warning('''The coupling order (%s=%s) specified is larger than the one allowed 
+             by the model builder. The maximal value allowed is %s. 
+             We set the %s order to this value''' % (k,orders[k],v,k))
+                    orders[k] = v
             else:
                 orders[k] = v
 

=== modified file 'madgraph/core/helas_objects.py'
--- madgraph/core/helas_objects.py	2011-11-22 09:18:50 +0000
+++ madgraph/core/helas_objects.py	2012-05-16 15:22:19 +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"""
@@ -3387,7 +3387,13 @@
         """Get number of diagrams, which is always more than number of
         configs"""
 
-        return len(self.get('diagrams'))    
+        model = self.get('processes')[0].\
+                get('model')
+        
+        next, nini = self.get_nexternal_ninitial()
+
+        return sum([d.get_num_configs(model, nini) for d in \
+                    self.get('base_amplitude').get('diagrams')])
 
     def get_number_of_wavefunctions(self):
         """Gives the total number of wavefunctions for this ME"""
@@ -3546,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-08 20:38:22 +0000
+++ madgraph/interface/extended_cmd.py	2012-05-16 15:22:19 +0000
@@ -38,7 +38,9 @@
     import madgraph.various.misc as misc
     from madgraph import MG5DIR
     MADEVENT = False
-except:
+except Exception, error:
+    if __debug__:
+        print error
     import internal.misc as misc
     MADEVENT = True
 
@@ -47,6 +49,24 @@
 class TimeOutError(Exception):
     """Class for run-time error"""
 
+def debug(debug_only=True):
+
+    def deco_debug(f):
+        
+        if debug_only and not __debug__:
+            return f
+        
+        def deco_f(*args, **opt):
+            try:
+                return f(*args, **opt)
+            except Exception, error:
+                print error
+                print traceback.print_exc(file=sys.stdout)
+                return
+        return deco_f
+    return deco_debug
+            
+
 #===============================================================================
 # CmdExtended
 #===============================================================================
@@ -90,7 +110,8 @@
         if valid == 1:
             out = out[1:]
         return out
-
+    
+    @debug()
     def print_suggestions(self, substitution, matches, longest_match_length) :
         """print auto-completions by category"""
         longest_match_length += len(self.completion_prefix)
@@ -162,6 +183,7 @@
          If a command has not been entered, then complete against command list.
          Otherwise try to call complete_<command> to get list of completions.
         """
+                
         if state == 0:
             import readline
             origline = readline.get_line_buffer()
@@ -188,8 +210,18 @@
                         compfunc = self.completedefault
             else:
                 compfunc = self.completenames
+                
+            # correct wrong splittion with '\ '
+            if line and begidx > 2 and line[begidx-2:begidx] == '\ ':
+                Ntext = line.split(os.path.sep)[-1]
+                self.completion_prefix = Ntext.rsplit('\ ', 1)[0] + '\ '
+                to_rm = len(self.completion_prefix) - 1
+                Nbegidx = len(line.rsplit(os.path.sep, 1)[0]) + 1
+                data = compfunc(Ntext.replace('\ ', ' '), line, Nbegidx, endidx)
+                self.completion_matches = [p[to_rm:] for p in data 
+                                              if len(p)>to_rm]                
             # correct wrong splitting with '-'
-            if line and line[begidx-1] == '-':
+            elif line and line[begidx-1] == '-':
              try:    
                 Ntext = line.split()[-1]
                 self.completion_prefix = Ntext.rsplit('-',1)[0] +'-'
@@ -244,12 +276,12 @@
         
         if len(args) > 2:
             self.help_save()
-            raise self.InvalidCmd, '\'%s\' is not recoginzed as first argument.'
+            raise self.InvalidCmd, 'too many arguments for save command.'
         
         if len(args) == 2:
             if args[0] != 'options':
                 self.help_save()
-                raise self.InvalidCmd, '\'%s\' is not recoginzed as first argument.' % \
+                raise self.InvalidCmd, '\'%s\' is not recognized as first argument.' % \
                                                 args[0]
             else:
                 args.pop(0)           
@@ -336,7 +368,6 @@
     next_possibility = {} # command : [list of suggested command]
     history_header = ""
     
-    timeout = 1 # time authorize to answer question [0 is no time limit]
     _display_opts = ['options','variable']
     
     class InvalidCmd(Exception):
@@ -428,7 +459,7 @@
         if os.path.exists(self.debug_output):
             os.remove(self.debug_output)
         try:
-            cmd.Cmd.onecmd(self, 'history %s' % self.debug_output)
+            cmd.Cmd.onecmd(self, 'history %s' % self.debug_output.replace(' ', '\ '))
         except Exception, error:
             print error
             
@@ -587,7 +618,9 @@
             if data[-1] == '\\':
                 tmp += data[:-1]+' '
             elif tmp:
-                out.append(tmp+data)
+                tmp += data
+                tmp = os.path.expanduser(os.path.expandvars(tmp))
+                out.append(tmp)
             else:
                 out.append(data)
         return out
@@ -674,7 +707,6 @@
         # remove this call from history
         if self.history:
             self.history.pop()
-        self.timeout, old_time_out = 20, self.timeout
         
         # Read the lines of the file and execute them
         self.inputfile = open(filepath)
@@ -691,7 +723,6 @@
         if self.child:
             self.child.exec_cmd('quit')        
                 
-        self.timeout = old_time_out
         return
     
     def get_history_header(self):
@@ -771,7 +802,7 @@
     # Ask a question with nice options handling
     #===============================================================================    
     def ask(self, question, default, choices=[], path_msg=None, 
-            timeout = None, fct_timeout=None):
+            timeout = True, fct_timeout=None):
         """ ask a question with some pre-define possibility
             path info is
         """
@@ -780,6 +811,12 @@
             path_msg = [path_msg]
         else:
             path_msg = []
+            
+        if timeout:
+            try:
+                timeout = self.options['timeout']
+            except:
+                pass
                     
         # add choice info to the question
         if choices + path_msg:
@@ -796,16 +833,18 @@
             question = question[:-2]+']'
                 
         if path_msg:
-            fct = lambda q: raw_path_input(q, allow_arg=choices, default=default)
+            f = lambda q: raw_path_input(q, allow_arg=choices, default=default)
         else:
-            fct = lambda q: smart_input(q, allow_arg=choices, default=default)
+            f = lambda q: smart_input(q, allow_arg=choices, default=default)
 
         answer = self.check_answer_in_input_file(choices, path_msg)
         if answer is not None:
             return answer
         
-        return  Cmd.timed_input(question, default, timeout=timeout,
-                                    fct=fct, fct_timeout=fct_timeout)
+        value =   Cmd.timed_input(question, default, timeout=timeout,
+                                    fct=f, fct_timeout=fct_timeout)
+
+        return value
         
     def check_answer_in_input_file(self, options, path=False):
         """Questions can have answer in output file (or not)"""
@@ -1093,10 +1132,12 @@
     def path_completion(text, base_dir = None, only_dirs = False, 
                                                                  relative=True):
         """Propose completions of text to compose a valid path"""
-        
+
         if base_dir is None:
             base_dir = os.getcwd()
-            
+
+        base_dir = os.path.expanduser(os.path.expandvars(base_dir))
+        
         prefix, text = os.path.split(text)
         base_dir = os.path.join(base_dir, prefix)
         if prefix:
@@ -1128,7 +1169,8 @@
         if relative:
             completion += [prefix + f for f in ['.'+os.path.sep, '..'+os.path.sep] if \
                        f.startswith(text) and not prefix.startswith('.')]
-
+        
+        completion = [a.replace(' ','\ ') for a in completion]
         return completion
     
 
@@ -1252,7 +1294,7 @@
 #===============================================================================
 class OneLinePathCompletion(SmartQuestion):
     """ a class for answering a question with the path autocompletion"""
-
+    
 
     def completenames(self, text, line, begidx, endidx):
         prev_timer = signal.alarm(0) # avoid timer if any

=== modified file 'madgraph/interface/launch_ext_program.py'
--- madgraph/interface/launch_ext_program.py	2012-02-17 06:01:41 +0000
+++ madgraph/interface/launch_ext_program.py	2012-05-16 15:22:19 +0000
@@ -43,13 +43,12 @@
     
     force = False
     
-    def __init__(self, cmd, running_dir, card_dir='', timeout=None,
+    def __init__(self, cmd, running_dir, card_dir='', 
                  **options):
         """ initialize an object """
         
         self.running_dir = running_dir
         self.card_dir = os.path.join(self.running_dir, card_dir)
-        self.timeout = timeout
         self.cmd_int = cmd
         #include/overwrite options
         for key,value in options.items():
@@ -87,15 +86,13 @@
         if timeout:
             # avoid to always wait a given time for the next answer
             self.force = True
-        else:
-            self.timeout = None # answer at least one question so wait...
    
     def ask(self, question, default, choices=[], path_msg=None):
         """nice handling of question"""
      
         if not self.force:
-            return self.cmd_int.ask(question, default, choices=choices, path_msg=path_msg,
-                               timeout=self.timeout, fct_timeout=self.timeout_fct)
+            return self.cmd_int.ask(question, default, choices=choices, 
+                                path_msg=path_msg, fct_timeout=self.timeout_fct)
         else:
             return str(default)
          
@@ -135,10 +132,10 @@
 class SALauncher(ExtLauncher):
     """ A class to launch a simple Standalone test """
     
-    def __init__(self, cmd_int, running_dir, timeout, **options):
+    def __init__(self, cmd_int, running_dir, **options):
         """ initialize the StandAlone Version"""
         
-        ExtLauncher.__init__(self, cmd_int, running_dir, './Cards', timeout, **options)
+        ExtLauncher.__init__(self, cmd_int, running_dir, './Cards', **options)
         self.cards = ['param_card.dat']
 
     
@@ -158,11 +155,13 @@
 class MELauncher(ExtLauncher):
     """A class to launch MadEvent run"""
     
-    def __init__(self, running_dir, timeout, cmd_int , unit='pb', **option):
+    def __init__(self, running_dir, cmd_int , unit='pb', **option):
         """ initialize the StandAlone Version"""
 
-        ExtLauncher.__init__(self, cmd_int, running_dir, './Cards', timeout, **option)
+        ExtLauncher.__init__(self, cmd_int, running_dir, './Cards', **option)
         #self.executable = os.path.join('.', 'bin','generate_events')
+        self.pythia = cmd_int.options['pythia-pgs_path']
+        self.delphes = cmd_int.options['delphes_path'],
 
         assert hasattr(self, 'cluster')
         assert hasattr(self, 'multicore')
@@ -267,11 +266,11 @@
 class Pythia8Launcher(ExtLauncher):
     """A class to launch Pythia8 run"""
     
-    def __init__(self, running_dir, timeout, cmd_int, **option):
+    def __init__(self, running_dir, cmd_int, **option):
         """ initialize launching Pythia 8"""
 
         running_dir = os.path.join(running_dir, 'examples')
-        ExtLauncher.__init__(self, cmd_int, running_dir, '.', timeout, **option)
+        ExtLauncher.__init__(self, cmd_int, running_dir, '.', **option)
         self.cards = []
     
     def prepare_run(self):

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2012-03-05 14:54:21 +0000
+++ madgraph/interface/madevent_interface.py	2012-05-16 15:22:19 +0000
@@ -24,6 +24,7 @@
 import optparse
 import os
 import pydoc
+import random
 import re
 import shutil
 import subprocess
@@ -108,10 +109,12 @@
     InvalidCmd = InvalidCmd
     ConfigurationError = MadGraph5Error
 
-    
     def __init__(self, *arg, **opt):
         """Init history and line continuation"""
         
+        # Tag allowing/forbiding question
+        self.force = False
+        
         # If possible, build an info line with current version number 
         # and date, from the VERSION text file
         info = misc.get_pkg_info()
@@ -196,7 +199,10 @@
     
     def postcmd(self, stop, line):
         """ Update the status of  the run for finishing interactive command """
-                        
+        
+        # relaxing the tag forbidding question
+        self.force = False
+        
         if not self.use_rawinput:
             return stop
         
@@ -206,9 +212,9 @@
         arg = line.split()
         if  len(arg) == 0:
             return stop
-        if self.results.status.startswith('Error'):
+        if isinstance(self.results.status, str) and self.results.status.startswith('Error'):
             return stop
-        if self.results.status == 'Stop by the user':
+        if isinstance(self.results.status, str) and self.results.status == 'Stop by the user':
             self.update_status('%s Stop by the user' % arg[0], level=None, error=True)
             return stop        
         elif not self.results.status:
@@ -247,7 +253,7 @@
         """If a ME run is currently running add a link in the html output"""
 
         self.add_error_log_in_html()
-        cmd.Cmd.nice_user_error(self, error, line)
+        cmd.Cmd.nice_user_error(self, error, line)            
         
     def nice_config_error(self, error, line):
         """If a ME run is currently running add a link in the html output"""
@@ -291,7 +297,9 @@
         logger.info("-- set options")
         logger.info("   stdout_level DEBUG|INFO|WARNING|ERROR|CRITICAL")
         logger.info("     change the default level for printed information")
-        
+        logger.info("   timeout VALUE")
+        logger.info("      (default 20) Seconds allowed to answer questions.")
+        logger.info("      Note that pressing tab always stops the timer.")        
 
     def run_options_help(self, data):
         if data:
@@ -349,9 +357,9 @@
         
     def help_combine_events(self):
         """ """
-        logger.info("syntax: combine_events [--run_options]")
+        logger.info("syntax: combine_events [run_name] [--tag=tag_name] [--run_options]")
         logger.info("-- Combine the last run in order to write the number of events")
-        logger.info("   require in the run_card.")
+        logger.info("   asked in the run_card.")
         self.run_options_help([])
 
     def help_store_events(self):
@@ -504,6 +512,11 @@
             if args[1] not in ['DEBUG','INFO','WARNING','ERROR','CRITICAL']:
                 raise self.InvalidCmd('output_level needs ' + \
                                       'a valid level')  
+                
+        if args[0] in ['timeout']:
+            if not args[1].isdigit():
+                raise self.InvalidCmd('timeout values should be a integer')   
+            
     def check_open(self, args):
         """ check the validity of the line """
         
@@ -520,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
             
@@ -578,11 +591,7 @@
     def check_generate_events(self, args):
         """check that the argument for generate_events are valid"""
         
-        force = False
         run = None
-        if '-f' in args:
-            force = True
-            args.remove('-f')
         if args and args[-1].startswith('--laststep='):
             run = args[-1].split('=')[-1]
             if run not in ['auto','parton', 'pythia', 'pgs', 'delphes']:
@@ -600,19 +609,16 @@
             self.help_generate_events()
             raise self.InvalidCmd('Too many argument for generate_events command: %s' % cmd)
                     
-        return force, run
+        return run
 
     def check_calculate_decay_widths(self, args):
         """check that the argument for calculate_decay_widths are valid"""
         
         if self.ninitial != 1:
             raise self.InvalidCmd('Can only calculate decay widths for decay processes A > B C ...')
-        force = False
+
         accuracy = 0.01
         run = None
-        if '-f' in args:
-            force = True
-            args.remove('-f')
         if args and args[-1].startswith('--accuracy='):
             try:
                 accuracy = float(args[-1].split('=')[-1])
@@ -623,18 +629,14 @@
             self.help_calculate_decay_widths()
             raise self.InvalidCmd('Too many argument for calculate_decay_widths command: %s' % cmd)
                     
-        return force, accuracy
+        return accuracy
 
 
 
     def check_multi_run(self, args):
         """check that the argument for survey are valid"""
 
-        force = False
         run = None
-        if '-f' in args:
-            force = True
-            args.remove('-f')
         
         if not len(args):
             self.help_multi_run()
@@ -662,7 +664,7 @@
         self.check_survey(args, cmd='multi_run')
         args.insert(0, int(nb_run))
         
-        return force, run
+        return run
 
     def check_refine(self, args):
         """check that the argument for survey are valid"""
@@ -682,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()
@@ -699,16 +701,28 @@
     def check_combine_events(self, arg):
         """ Check the argument for the combine events command """
         
-        if len(arg):
+        tag = [a for a in arg if a.startswith('--tag=')]
+        if tag: 
+            args.remove(tag[0])
+            tag = tag[0][6:]
+        elif not self.run_tag:
+            tag = 'tag_1'
+        else:
+            tag = self.run_tag
+        self.run_tag = tag
+     
+        if len(arg) > 1:
             self.help_combine_events()
             raise self.InvalidCmd('Too many argument for combine_events command')
         
+        if len(arg) == 1:
+            self.set_run_name(arg[0], self.run_tag, 'parton', True)
+        
         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)
-            self.set_run_name(arg[0])
         
         return True
     
@@ -728,18 +742,32 @@
         elif laststep:
             raise self.InvalidCmd('only one laststep argument is allowed')
      
+        # If not pythia-pgs path
+        if not self.options['pythia-pgs_path']:
+            logger.info('Retry to read configuration file to find pythia-pgs path')
+            self.set_configuration()
+            
+        if not self.options['pythia-pgs_path'] or not \
+            os.path.exists(pjoin(self.options['pythia-pgs_path'],'src')):
+            error_msg = 'No pythia-pgs path correctly set.'
+            error_msg += 'Please use the set command to define the path and retry.'
+            error_msg += 'You can also define it in the configuration file.'
+            raise self.InvalidCmd(error_msg)
+     
+     
+     
         tag = [a for a in args if a.startswith('--tag=')]
         if tag: 
             args.remove(tag[0])
             tag = tag[0][6:]
-     
+        
         if len(args) == 0 and not self.run_name:
             if self.results.lastrun:
                 args.insert(0, self.results.lastrun)
             else:
                 raise self.InvalidCmd('No run name currently define. Please add this information.')             
         
-        if len(args) == 1:
+        if len(args) >= 1:
             if args[0] != self.run_name and\
              not os.path.exists(pjoin(self.me_dir,'Events',args[0], 'unweighted_events.lhe.gz')):
                 raise self.InvalidCmd('No events file corresponding to %s run. '% args[0])
@@ -748,7 +776,6 @@
             if tag:
                 self.run_card['run_tag'] = tag
             self.set_run_name(self.run_name, tag, 'pythia')
-            
 
         if  not os.path.exists(pjoin(self.me_dir,'Events',self.run_name,'unweighted_events.lhe.gz')):
             raise self.InvalidCmd('No events file corresponding to %s run. '% self.run_name)
@@ -757,19 +784,6 @@
         input_file = pjoin(self.me_dir,'Events',self.run_name, 'unweighted_events.lhe')
         output_file = pjoin(self.me_dir, 'Events', 'unweighted_events.lhe')
         os.system('gunzip -c %s > %s' % (input_file, output_file))
-            
-
-        # If not pythia-pgs path
-        if not self.options['pythia-pgs_path']:
-            logger.info('Retry to read configuration file to find pythia-pgs path')
-            self.set_configuration()
-            
-        if not self.options['pythia-pgs_path'] or not \
-            os.path.exists(pjoin(self.options['pythia-pgs_path'],'src')):
-            error_msg = 'No pythia-pgs path correctly set.'
-            error_msg += 'Please use the set command to define the path and retry.'
-            error_msg += 'You can also define it in the configuration file.'
-            raise self.InvalidCmd(error_msg)
         
         args.append(mode)
     
@@ -783,14 +797,6 @@
             tag = tag[0]
             tmp_args.remove('--tag=%s' % tag)
 
-        try:
-            tmp_args.remove('-f')
-        except:
-            pass
-        else:
-            if args[0] == '-f':
-                args.pop(0)
-                args.append('-f')
 
         if len(tmp_args) == 0:
             self.help_remove()
@@ -799,7 +805,7 @@
             return tmp_args[0], tag, ['all']
         else:
             for arg in tmp_args[1:]:
-                if arg not in self._clean_mode and arg != '-f':
+                if arg not in self._clean_mode:
                     self.help_clean()
                     raise self.InvalidCmd('%s is not a valid options for clean command'\
                                               % arg)
@@ -837,10 +843,6 @@
             args.append('all')
             return
 
-        force = False
-        if '-f' in args:
-            args.remove('-f')
-            force = True
         
         if args[0] not in self._plot_mode:
             self.set_run_name(args[0], level='plot')
@@ -856,9 +858,6 @@
                  self.help_plot()
                  raise self.InvalidCmd('unknown options %s' % arg)        
     
-        if force:
-            args.append('-f')
-    
     
     def check_pgs(self, arg):
         """Check the argument for pythia command
@@ -886,7 +885,7 @@
         
         if len(arg) == 0 and not self.run_name:
             if self.results.lastrun:
-                args.insert(0, self.results.lastrun)
+                arg.insert(0, self.results.lastrun)
             else:
                 raise self.InvalidCmd('No run name currently define. Please add this information.')             
         
@@ -1270,7 +1269,7 @@
     _run_options = ['--cluster','--multicore','--nb_core=','--nb_core=2', '-c', '-m']
     _generate_options = ['-f', '--laststep=parton', '--laststep=pythia', '--laststep=pgs', '--laststep=delphes']
     _calculate_decay_options = ['-f', '--accuracy=0.']
-    _set_options = ['stdout_level','fortran_compiler']
+    _set_options = ['stdout_level','fortran_compiler','timeout']
     _plot_mode = ['all', 'parton','pythia','pgs','delphes','channel', 'banner']
     _clean_mode = _plot_mode
     _display_opts = ['run_name', 'options', 'variable']
@@ -1326,13 +1325,13 @@
         # 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'))
-            subprocess.Popen([pjoin(self.dirbin, 'gen_cardhtml-pl')], cwd=me_dir)
+            misc.Popen([pjoin(self.dirbin, 'gen_cardhtml-pl')], cwd=me_dir)
       
         self.to_store = []
         self.run_name = None
@@ -1351,7 +1350,6 @@
             
         # Load the configuration file
         self.set_configuration()
-        self.timeout = 20
         self.nb_refine=0
         if self.web:
             os.system('touch %s' % pjoin(self.me_dir,'Online'))
@@ -1360,13 +1358,12 @@
         # 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.resetall()
+            self.results.resetall(self.me_dir)
         else:
             model = self.find_model_name()
             process = self.process # define in find_model_name
             self.results = gen_crossxhtml.AllResults(model, process, self.me_dir)
         self.results.def_web_mode(self.web)
-
         
         self.configured = 0 # time for reading the card
         self._options = {} # for compatibility with extended_cmd
@@ -1385,7 +1382,7 @@
             elif arg == '-m':
                 self.cluster_mode = 2
             elif arg == '-f':
-                continue
+                self.force = True
             elif not arg.startswith('--'):
                 if error:
                     raise self.InvalidCmd('%s argument cannot start with - symbol' % arg)
@@ -1402,8 +1399,7 @@
                 self.web = True
                 self.cluster_mode = 1
                 self.results.def_web_mode(True)
-                if not '-f' in args:
-                    args.append('-f')
+                self.force = True
             else:
                 continue
             args.remove(arg)
@@ -1446,7 +1442,8 @@
                               'automatic_html_opening':True,
                               'run_mode':0,
                               'cluster_queue':'madgraph',
-                              'nb_core':None}
+                              'nb_core':None,
+                              'timeout':20}
         
         if os.environ.has_key('MADGRAPH_BASE'):
             config_file = open(os.path.join(os.environ['MADGRAPH_BASE'],'mg5_configuration.txt'))
@@ -1526,11 +1523,7 @@
         
         args = self.split_arg(line)
         #check the validity of the arguments
-        self.check_banner_run(args)
-        if '-f' in args:
-            force = True
-        else:
-            force = False     
+        self.check_banner_run(args)    
              
         banner_mod.split_banner(args[0], self.me_dir, proc_card=False)
         
@@ -1544,14 +1537,13 @@
         
         
         # Check if we want to modify the run
-        if not force:
-            ans = self.ask('Do you want to modify the Cards?', 'n', ['y','n'], 
-                                                           timeout=self.timeout)
+        if not self.force:
+            ans = self.ask('Do you want to modify the Cards?', 'n', ['y','n'])
             if ans == 'n':
-                force = True
+                self.force = True
         
         # Call Generate events
-        self.exec_cmd('generate_events %s %s' % (self.run_name, force and '-f' or ''))
+        self.exec_cmd('generate_events %s %s' % (self.run_name, self.force and '-f' or ''))
  
  
  
@@ -1644,6 +1636,8 @@
                 raise self.InvalidCmd('nb_core should be a positive number') 
             self.nb_core = int(args[1])
             self.options['nb_core'] = self.nb_core
+        elif args[0] == 'timeout':
+            self.options[args[0]] = int(args[1]) 
         elif args[0] in self.options:
             if args[1] in ['None','True','False']:
                 self.options[args[0]] = eval(args[1])
@@ -1685,8 +1679,8 @@
         
         args = self.split_arg(line)
         # Check argument's validity
-        force, mode = self.check_generate_events(args)
-        self.ask_run_configuration(mode, force)
+        mode = self.check_generate_events(args)
+        self.ask_run_configuration(mode)
         if not args:
             # No run name assigned -> assigned one automaticaly 
             self.set_run_name(self.find_available_run_name(self.me_dir), None, 'parton')
@@ -1729,13 +1723,13 @@
             self.exec_cmd('refine %s' % nb_event, postcmd=False)
             self.exec_cmd('refine %s' % nb_event, postcmd=False)
             self.exec_cmd('combine_events', postcmd=False)
+            self.print_results_in_shell(self.results.current)
             self.create_plot('parton')
             self.exec_cmd('store_events', postcmd=False)
             self.exec_cmd('pythia --no_default', postcmd=False, printcmd=False)
             # pythia launches pgs/delphes if needed
             self.store_result()
-        
-        self.print_results_in_shell(self.results.current)
+            
             
             
     def print_results_in_shell(self, data):
@@ -1748,21 +1742,13 @@
         else:
             logger.info("     Cross-section :   %.4g +- %.4g pb" % (data['cross'], data['error']))
         logger.info("     Nb of events :  %s" % data['nb_event'] )
-        if data['cross_pythia']:
-            error = data.get_pythia_error(data['cross'], data['error'], 
-                                        data['cross_pythia'], data['nb_event'])
-            nb_event = 0
-            if data['cross']:
-                nb_event = int(0.5+(data['nb_event'] * data['cross_pythia'] /data['cross']))
-            
+        if data['cross_pythia'] and data['nb_event_pythia']:
             if self.ninitial == 1:
-                logger.info("     Matched Width :   %.4g +- %.4g GeV" % (data['cross_pythia'], error))
+                logger.info("     Matched Width :   %.4g +- %.4g GeV" % (data['cross_pythia'], data['error_pythia']))
             else:
-                logger.info("     Matched Cross-section :   %.4g +- %.4g pb" % (data['cross'], error))            
-            logger.info("     Nb of events after Matching :  %s" % nb_event)
+                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):
@@ -1771,8 +1757,8 @@
         
         args = self.split_arg(line)
         # Check argument's validity
-        force, accuracy = self.check_calculate_decay_widths(args)
-        self.ask_run_configuration('parton', force)
+        accuracy = self.check_calculate_decay_widths(args)
+        self.ask_run_configuration('parton')
         if not args:
             # No run name assigned -> assigned one automaticaly 
             self.set_run_name(self.find_available_run_name(self.me_dir))
@@ -1907,8 +1893,8 @@
         
         args = self.split_arg(line)
         # Check argument's validity
-        force, mode = self.check_multi_run(args)
-        self.ask_run_configuration(mode, force)
+        mode = self.check_multi_run(args)
+        self.ask_run_configuration(mode)
         main_name = self.run_name
         nb_run = args.pop(0)
         crossoversig = 0
@@ -1924,8 +1910,12 @@
             crossoversig+=cross/error**2
             inv_sq_err+=1.0/error**2
             self.results[main_name][-1]['cross'] = crossoversig/inv_sq_err
-            self.results[main_name][-1]['error'] = math.sqrt(1.0/inv_sq_err) 
-
+            self.results[main_name][-1]['error'] = math.sqrt(1.0/inv_sq_err)
+            if self.run_card['iseed'] != 0:
+                seed = self.random + 1
+                text = open(pjoin(self.me_dir, 'Cards','run_card.dat')).read()
+                (t,n) = re.subn(r'\s\d+\s*= iseed','   %s       = iseed' % seed,text)
+                open(pjoin(self.me_dir, 'Cards','run_card.dat'),'w').write(t)
         
         self.run_name = main_name
         self.results.def_current(main_name)
@@ -1998,7 +1988,7 @@
                 raise MadEventError, 'Error make gensym not successful'
 
             # Launch gensym
-            p = subprocess.Popen(['./gensym'], stdin=subprocess.PIPE,
+            p = misc.Popen(['./gensym'], stdin=subprocess.PIPE,
                                  stdout=subprocess.PIPE, 
                                  stderr=subprocess.STDOUT, cwd=Pdir)
             sym_input = "%(points)d %(iterations)d %(accuracy)f %(gridpack)s\n" % self.opts
@@ -2061,7 +2051,7 @@
                 if os.path.basename(match)[:4] in ['ajob', 'wait', 'run.', 'done']:
                     os.remove(pjoin(Pdir, match))
             
-            proc = subprocess.Popen([pjoin(bindir, 'gen_ximprove')],
+            proc = misc.Popen([pjoin(bindir, 'gen_ximprove')],
                                     stdout=devnull,
                                     stdin=subprocess.PIPE,
                                     cwd=Pdir)
@@ -2087,7 +2077,7 @@
             pass
         
         bindir = pjoin(os.path.relpath(self.dirbin, pjoin(self.me_dir,'SubProcesses')))
-        subprocess.call([pjoin(bindir, 'combine_runs')], 
+        misc.call([pjoin(bindir, 'combine_runs')], 
                                           cwd=pjoin(self.me_dir,'SubProcesses'),
                                           stdout=devnull)
         
@@ -2111,7 +2101,7 @@
                                         cwd=pjoin(self.me_dir,'SubProcesses'),
                                         stdout=pjoin(self.me_dir,'SubProcesses', 'combine.log'))
         else:
-            out = subprocess.call(['../bin/internal/run_combine'],
+            out = misc.call(['../bin/internal/run_combine'],
                          cwd=pjoin(self.me_dir,'SubProcesses'), 
                          stdout=open(pjoin(self.me_dir,'SubProcesses','combine.log'),'w'))
             
@@ -2124,7 +2114,13 @@
         
         # Define The Banner
         tag = self.run_card['run_tag']
+        # Update the banner with the pythia card
+        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)):
             os.mkdir(pjoin(self.me_dir, 'Events', self.run_name))
@@ -2134,15 +2130,10 @@
         self.banner.add(pjoin(self.me_dir, 'Cards', 'run_card.dat'))
         
         
-        subprocess.call(['%s/put_banner' % self.dirbin, 'events.lhe'],
-                            cwd=pjoin(self.me_dir, 'Events'))
-        subprocess.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')):
-        #    subprocess.call(['%s/extract_banner-pl' % self.dirbin, 
-        #                     'unweighted_events.lhe', 'banner.txt'],
-        #                    cwd=pjoin(self.me_dir, 'Events'))
+        misc.call(['%s/put_banner' % self.dirbin, 'events.lhe'],
+                            cwd=pjoin(self.me_dir, 'Events'))
+        misc.call(['%s/put_banner'% self.dirbin, 'unweighted_events.lhe'],
+                            cwd=pjoin(self.me_dir, 'Events'))
         
         eradir = self.options['exrootanalysis_path']
         madir = self.options['madanalysis_path']
@@ -2197,7 +2188,7 @@
                         input = pjoin(G_path, name)
                         output = pjoin(G_path, '%s_%s' % (run,name))
                         files.mv(input, output) 
-                        subprocess.call(['gzip', output], stdout=devnull, 
+                        misc.call(['gzip', output], stdout=devnull, 
                                         stderr=devnull, cwd=G_path)
         
         # 2) restore links in local this is require due to chrome over-security
@@ -2210,7 +2201,7 @@
             open(results, 'w').write(text)
             
         # 3) Update the index.html
-        subprocess.call(['%s/gen_cardhtml-pl' % self.dirbin],
+        misc.call(['%s/gen_cardhtml-pl' % self.dirbin],
                             cwd=pjoin(self.me_dir))
         
         # 4) Move the Files present in Events directory
@@ -2224,9 +2215,8 @@
                 input = pjoin(E_path, name)
                 output = pjoin(O_path, name)
                 files.mv(input, output) 
-                subprocess.call(['gzip', output], stdout=devnull, stderr=devnull, 
-                                                                     cwd=O_path)
-                
+                misc.call(['gzip', output], stdout=devnull, stderr=devnull, 
+                                                                     cwd=O_path) 
         self.update_status('End Parton', level='parton', makehtml=False)
 
     ############################################################################ 
@@ -2236,14 +2226,15 @@
         self.update_status('Creating gridpack', level='parton')
         args = self.split_arg(line)
         self.check_combine_events(args)
+        if not self.run_tag: self.run_tag = 'tag_1'
         os.system("sed -i.bak \"s/ *.false.*=.*GridRun/  .true.  =  GridRun/g\" %s/Cards/grid_card.dat" \
                   % self.me_dir)
-        subprocess.call(['./bin/internal/restore_data', self.run_name],
+        misc.call(['./bin/internal/restore_data', self.run_name],
                         cwd=self.me_dir)
-        subprocess.call(['./bin/internal/store4grid',
+        misc.call(['./bin/internal/store4grid',
                          self.run_name, self.run_tag],
                         cwd=self.me_dir)
-        subprocess.call(['./bin/internal/clean'], cwd=self.me_dir)
+        misc.call(['./bin/internal/clean'], cwd=self.me_dir)
         misc.compile(['gridpack.tar.gz'], cwd=self.me_dir)
         files.mv(pjoin(self.me_dir, 'gridpack.tar.gz'), 
                 pjoin(self.me_dir, '%s_gridpack.tar.gz' % self.run_name))
@@ -2257,24 +2248,18 @@
         
         # Check argument's validity
         args = self.split_arg(line)
-        if '-f' in args:
-            force = True
-            args.remove('-f')
-        else:
-            force = False
         if '--no_default' in args:
             if not os.path.exists(pjoin(self.me_dir, 'Cards', 'pythia_card.dat')):
                 return
-            force = True
             no_default = True
             args.remove('--no_default')
         else:
             no_default = False
                                     
         self.check_pythia(args)        
-        # the args are modify and the last arg is always the mode
-        
-        self.ask_pythia_run_configuration(args[-1], force)
+        # the args are modify and the last arg is always the mode 
+        if not no_default:
+            self.ask_pythia_run_configuration(args[-1])
 
         # Update the banner with the pythia card
         if not self.banner:
@@ -2283,15 +2268,6 @@
         # initialize / remove lhapdf mode        
         self.configure_directory()
 
-        #if not force:
-        #    if os.path.exists(pjoin(self.me_dir, 'Events', self.run_name, '%s_pythia.log' % tag)):
-        #        question = 'Previous run of pythia detected. Do you want to remove it?'
-        #        ans = self.ask(question, 'y', choices=['y','n'], timeout = 20)
-        #        if ans == 'n':
-        #            return
-         
-        #self.exec_cmd('remove %s pythia -f' % self.run_name)
-        
         pythia_src = pjoin(self.options['pythia-pgs_path'],'src')
         
         self.update_status('Running Pythia', 'pythia')
@@ -2311,7 +2287,7 @@
                         cwd=pjoin(self.me_dir,'Events'))
         else:
             pythia_log = open(pjoin(self.me_dir, 'Events',  self.run_name , '%s_pythia.log' % tag), 'w')
-            subprocess.call(['../bin/internal/run_pythia', pythia_src],
+            misc.call(['../bin/internal/run_pythia', pythia_src],
                            stdout=pythia_log,
                            stderr=subprocess.STDOUT,
                            cwd=pjoin(self.me_dir,'Events'))
@@ -2328,12 +2304,36 @@
         self.to_store.append('pythia')
         
         # Find the matched cross-section
-        if int(self.run_card['ickkw']):    
-            pythia_log = open(pjoin(self.me_dir,'Events', self.run_name, '%s_pythia.log' % tag))
-            cs_info = misc.get_last_line(pythia_log)
-            # line should be of type: Cross section (pb):    1840.20000000006 
-            cs_info = cs_info.split(':')[1]
-            self.results.add_detail('cross_pythia', cs_info)
+        if int(self.run_card['ickkw']):
+            # read the line from the bottom of the file
+            pythia_log = misc.BackRead(pjoin(self.me_dir,'Events', self.run_name, 
+                                                         '%s_pythia.log' % tag))
+            pythiare = re.compile("\s*I\s+0 All included subprocesses\s+I\s+(?P<generated>\d+)\s+(?P<tried>\d+)\s+I\s+(?P<xsec>[\d\.D\-+]+)\s+I")            
+            for line in pythia_log:
+                info = pythiare.search(line)
+                if not info:
+                    continue
+                try:
+                    # Pythia cross section in mb, we want pb
+                    sigma_m = float(info.group('xsec').replace('D','E')) *1e9
+                    Nacc = int(info.group('generated'))
+                    Ntry = int(info.group('tried'))
+                except ValueError:
+                    # xsec is not float - this should not happen
+                    self.results.add_detail('cross_pythia', 0)
+                    self.results.add_detail('nb_event_pythia', 0)
+                    self.results.add_detail('error_pythia', 0)
+                else:
+                    self.results.add_detail('cross_pythia', sigma_m)
+                    self.results.add_detail('nb_event_pythia', Nacc)
+                    #compute pythia error
+                    error = self.results[self.run_name].return_tag(self.run_tag)['error']                    
+                    error_m = math.sqrt((error * Nacc/Ntry)**2 + sigma_m**2 *(1-Nacc/Ntry)/Nacc)
+                    # works both for fixed number of generated events and fixed accepted events
+                    self.results.add_detail('error_pythia', error_m)
+                break                 
+
+            pythia_log.close()
         
         pydir = pjoin(self.options['pythia-pgs_path'], 'src')
         eradir = self.options['exrootanalysis_path']
@@ -2363,13 +2363,13 @@
                                          argument= [pydir],
                                         cwd=pjoin(self.me_dir,'Events'))
             else:
-                subprocess.call([self.dirbin+'/run_hep2lhe', pydir],
+                misc.call([self.dirbin+'/run_hep2lhe', pydir],
                              cwd=pjoin(self.me_dir,'Events'))
                 
             # Creating ROOT file
             if eradir and misc.is_executable(pjoin(eradir, 'ExRootLHEFConverter')):
                 self.update_status('Creating Pythia LHE Root File', level='pythia')
-                subprocess.call([eradir+'/ExRootLHEFConverter', 
+                misc.call([eradir+'/ExRootLHEFConverter', 
                              'pythia_events.lhe', 
                              pjoin(self.run_name, '%s_pythia_lhe_events.root' % tag)],
                             cwd=pjoin(self.me_dir,'Events')) 
@@ -2377,15 +2377,15 @@
 
         if int(self.run_card['ickkw']):
             self.update_status('Create matching plots for Pythia', level='pythia')
-            subprocess.call([self.dirbin+'/create_matching_plots.sh', self.run_name, tag],
+            misc.call([self.dirbin+'/create_matching_plots.sh', self.run_name, tag],
                             stdout = os.open(os.devnull, os.O_RDWR),
                             cwd=pjoin(self.me_dir,'Events'))
             #Clean output
-            subprocess.call(['gzip','-f','events.tree'], 
+            misc.call(['gzip','-f','events.tree'], 
                                                 cwd=pjoin(self.me_dir,'Events'))          
             files.mv(pjoin(self.me_dir,'Events','events.tree.gz'), 
                      pjoin(self.me_dir,'Events',self.run_name, tag + '_pythia_events.tree.gz'))
-            subprocess.call(['gzip','-f','beforeveto.tree'], 
+            misc.call(['gzip','-f','beforeveto.tree'], 
                                                 cwd=pjoin(self.me_dir,'Events'))
             files.mv(pjoin(self.me_dir,'Events','beforeveto.tree.gz'), 
                      pjoin(self.me_dir,'Events',self.run_name, tag+'_pythia_beforeveto.tree.gz'))
@@ -2407,6 +2407,8 @@
         self.exec_cmd('pgs --no_default', postcmd=False, printcmd=False)
         if self.options['delphes_path']:
             self.exec_cmd('delphes --no_default', postcmd=False, printcmd=False)
+
+        self.print_results_in_shell(self.results.current)
     
     def get_available_tag(self):
         """create automatically a tag"""
@@ -2451,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:
@@ -2466,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 '-f' not in args and len(to_suppress):
-            question = 'Do you want to suppress the following files?\n     %s' % \
-                               '\n    '.join(to_suppress)
-            ans = self.ask(question, 'y', choices=['y','n'], timeout = self.timeout)
+        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))
@@ -2516,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 '-f' in args 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)
-                    ans = self.ask(question, 'y', choices=['y','n'], timeout = self.timeout)
+                    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:
@@ -2543,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
@@ -2661,11 +2663,6 @@
         
         args = self.split_arg(line)
         # Check argument's validity
-        if '-f' in args:
-            force = True
-            args.remove('-f')
-        else:
-            force = False
         if '--no_default' in args:
             no_default = True
             args.remove('--no_default')
@@ -2688,7 +2685,7 @@
                      pjoin(self.me_dir, 'Cards', 'pgs_card.dat'))
             logger.info('No pgs card found. Take the default one.')        
         
-        if not (no_default or force):
+        if not (no_default or self.force):
             self.ask_edit_cards(['pgs'], args)
             
         self.update_status('prepare PGS run', level=None)  
@@ -2743,7 +2740,7 @@
                             stdout=pgs_log, stderr=subprocess.STDOUT)
         else:
             pgs_log = open(pjoin(self.me_dir, 'Events', self.run_name,"%s_pgs.log" % tag),'w')
-            subprocess.call([self.dirbin+'/run_pgs', pgsdir], stdout= pgs_log,
+            misc.call([self.dirbin+'/run_pgs', pgsdir], stdout= pgs_log,
                                                stderr=subprocess.STDOUT,
                                                cwd=pjoin(self.me_dir, 'Events')) 
         
@@ -2754,14 +2751,14 @@
             os.remove(pjoin(self.me_dir, 'Events', 'pgs.done'))
             
         if os.path.getsize(banner_path) == os.path.getsize(pjoin(self.me_dir, 'Events','pgs_events.lhco')):
-            subprocess.call(['cat pgs_uncleaned_events.lhco >>  pgs_events.lhco'], 
+            misc.call(['cat pgs_uncleaned_events.lhco >>  pgs_events.lhco'], 
                             cwd=pjoin(self.me_dir, 'Events'))
             os.remove(pjoin(self.me_dir, 'Events', 'pgs_uncleaned_events.lhco '))
 
         # Creating Root file
         if eradir and misc.is_executable(pjoin(eradir, 'ExRootLHCOlympicsConverter')):
             self.update_status('Creating PGS Root File', level='pgs')
-            subprocess.call([eradir+'/ExRootLHCOlympicsConverter', 
+            misc.call([eradir+'/ExRootLHCOlympicsConverter', 
                              'pgs_events.lhco',pjoin('%s/%s_pgs_events.root' % (self.run_name, tag))],
                             cwd=pjoin(self.me_dir, 'Events')) 
         
@@ -2770,7 +2767,7 @@
             self.create_plot('PGS')
             files.mv(pjoin(self.me_dir, 'Events', 'pgs_events.lhco'), 
                     pjoin(self.me_dir, 'Events', self.run_name, '%s_pgs_events.lhco' % tag))
-            subprocess.call(['gzip','-f', pjoin(self.me_dir, 'Events', 
+            misc.call(['gzip','-f', pjoin(self.me_dir, 'Events', 
                                                 self.run_name, '%s_pgs_events.lhco' % tag)])
 
 
@@ -2783,11 +2780,6 @@
  
         args = self.split_arg(line)
         # Check argument's validity
-        if '-f' in args:
-            force = True
-            args.remove('-f')
-        else:
-            force = False
         if '--no_default' in args:
             no_default = True
             args.remove('--no_default')
@@ -2809,7 +2801,7 @@
         if not os.path.exists(pjoin(self.me_dir, 'Cards', 'delphes_trigger.dat')):    
             files.cp(pjoin(self.me_dir, 'Cards', 'delphes_trigger_default.dat'),
                      pjoin(self.me_dir, 'Cards', 'delphes_trigger.dat'))
-        if not (no_default or force):
+        if not (no_default or self.force):
             self.ask_edit_cards(['delphes', 'trigger'], args)
             
         self.update_status('Running Delphes', level=None)  
@@ -2835,7 +2827,7 @@
                         cwd=pjoin(self.me_dir,'Events'))
         else:
             delphes_log = open(pjoin(self.me_dir, 'Events', self.run_name, "%s_delphes.log" % tag),'w')
-            subprocess.call(['../bin/internal/run_delphes', delphes_dir, 
+            misc.call(['../bin/internal/run_delphes', delphes_dir, 
                                 self.run_name, tag, str(cross)],
                                 stdout= delphes_log, stderr=subprocess.STDOUT,
                                 cwd=pjoin(self.me_dir,'Events'))
@@ -2858,7 +2850,7 @@
         self.create_plot('Delphes')
 
         if os.path.exists(pjoin(self.me_dir, 'Events', self.run_name,  '%s_delphes_events.lhco' % tag)):
-            subprocess.call(['gzip','-f', pjoin(self.me_dir, 'Events', self.run_name, '%s_delphes_events.lhco' % tag)])
+            misc.call(['gzip','-f', pjoin(self.me_dir, 'Events', self.run_name, '%s_delphes_events.lhco' % tag)])
 
 
         
@@ -2877,7 +2869,7 @@
             start = time.time()
             if (cwd and os.path.exists(pjoin(cwd, exe))) or os.path.exists(exe):
                 exe = './' + exe
-            subprocess.call([exe] + argument, cwd=cwd, stdout=stdout,
+            misc.call([exe] + argument, cwd=cwd, stdout=stdout,
                         stderr=subprocess.STDOUT, **opt)
             #logger.info('%s run in %f s' % (exe, time.time() -start))
             
@@ -2899,7 +2891,7 @@
                                 self.total_jobs - remaining -1, run_type), level=None, force=False)
             start = time.time()
             #os.system('cd %s; ./%s' % (cwd,exe))
-            status = subprocess.call(['./'+exe] + argument, cwd=cwd, 
+            status = misc.call(['./'+exe] + argument, cwd=cwd, 
                                                            stdout=stdout, **opt)
             logger.info('%s run in %f s' % (exe, time.time() -start))
             if status:
@@ -2960,8 +2952,19 @@
                     self.update_status((idle, run, finish, run_type), level=None)
             else:
                 update_status = lambda idle, run, finish: None
-            self.cluster.wait(self.me_dir, update_status)            
-
+            try:    
+                self.cluster.wait(self.me_dir, update_status)            
+            except Exception, error:
+                logger.info(error)
+                if not self.force:
+                    ans = self.ask('Cluster Error detected. Do you want to clean the queue?',
+                             default = 'y', answers=['y','n'])
+                else:
+                    ans = 'y'
+                if ans:
+                    self.cluster.remove()
+                raise
+                    
         if mode == 2:
             # Wait that all thread finish
             if not self.control_thread[2]:
@@ -3047,16 +3050,16 @@
         self.check_nb_events()
 
         # set environment variable for lhapdf.
-        if self.run_card['pdlabel'] == "'lhapdf'":
+        if self.run_card['pdlabel'] == "lhapdf":
             os.environ['lhapdf'] = 'True'
         elif 'lhapdf' in os.environ.keys():
             del os.environ['lhapdf']
         
         # Compile
-        out = subprocess.call([pjoin(self.dirbin, 'compile_Source')],
+        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':
@@ -3228,13 +3231,13 @@
 
         
         nb_event = int(self.run_card['nevents'])
-        if nb_event > 100000:
-            logger.warning("Attempting to generate more than 100K events")
-            logger.warning("Limiting number to 100K. Use multi_run for larger statistics.")
+        if nb_event > 1000000:
+            logger.warning("Attempting to generate more than 1M events")
+            logger.warning("Limiting number to 1M. Use multi_run for larger statistics.")
             path = pjoin(self.me_dir, 'Cards', 'run_card.dat')
-            os.system(r"""perl -p -i.bak -e "s/\d+\s*=\s*nevents/100000 = nevents/" %s""" \
+            os.system(r"""perl -p -i.bak -e "s/\d+\s*=\s*nevents/1000000 = nevents/" %s""" \
                                                                          % path)
-            self.run_card['nevents'] = 100000
+            self.run_card['nevents'] = 1000000
 
         return
 
@@ -3270,7 +3273,7 @@
         except Exception, error:         
             pass
         try:
-            subprocess.call(['./bin/internal/gen_cardhtml-pl'], cwd=self.me_dir,
+            misc.call(['./bin/internal/gen_cardhtml-pl'], cwd=self.me_dir,
                         stdout=devnull, stderr=devnull)
         except:
             pass
@@ -3343,7 +3346,7 @@
         self.update_status('Creating root files', level='parton')
 
         eradir = self.options['exrootanalysis_path']
-        subprocess.call(['%s/ExRootLHEFConverter' % eradir, 
+        misc.call(['%s/ExRootLHEFConverter' % eradir, 
                              input, output],
                             cwd=pjoin(self.me_dir, 'Events'))
         
@@ -3380,7 +3383,10 @@
             
             
         if not os.path.exists(event_path):
-            raise self.InvalidCmd, 'Events file %s does not exits' % event_path
+            if os.path.exists(event_path+'.gz'):
+                os.system('gzip -f %s.gz ' % event_path)
+            else:
+                raise self.InvalidCmd, 'Events file %s does not exits' % event_path
         
         self.update_status('Creating Plots for %s level' % mode, level = mode.lower())
                
@@ -3390,28 +3396,31 @@
             os.makedirs(plot_dir) 
         
         files.ln(pjoin(self.me_dir, 'Cards','plot_card.dat'), plot_dir, 'ma_card.dat')
-        proc = subprocess.Popen([os.path.join(madir, 'plot_events')],
+        try:
+            proc = misc.Popen([os.path.join(madir, 'plot_events')],
                             stdout = open(pjoin(plot_dir, 'plot.log'),'w'),
                             stderr = subprocess.STDOUT,
                             stdin=subprocess.PIPE,
                             cwd=plot_dir)
-        proc.communicate('%s\n' % event_path)
-        del proc
-        #proc.wait()
-        subprocess.call(['%s/plot' % self.dirbin, madir, td],
+            proc.communicate('%s\n' % event_path)
+            del proc
+            #proc.wait()
+            misc.call(['%s/plot' % self.dirbin, madir, td],
                             stdout = open(pjoin(plot_dir, 'plot.log'),'a'),
                             stderr = subprocess.STDOUT,
                             cwd=plot_dir)
     
-        subprocess.call(['%s/plot_page-pl' % self.dirbin, 
+            misc.call(['%s/plot_page-pl' % self.dirbin, 
                                 os.path.basename(plot_dir),
                                 mode],
                             stdout = open(pjoin(plot_dir, 'plot.log'),'a'),
                             stderr = subprocess.STDOUT,
                             cwd=pjoin(self.me_dir, 'HTML', self.run_name))
-       
-        shutil.move(pjoin(self.me_dir, 'HTML',self.run_name ,'plots.html'),
+            shutil.move(pjoin(self.me_dir, 'HTML',self.run_name ,'plots.html'),
                                                                          output)
+
+        except OSError, error:
+            logger.error('fail to create plot: %s. Please check that MadAnalysis is correctly installed.' % error)
         
         self.update_status('End Plots for %s level' % mode, level = mode.lower(),
                                                                  makehtml=False)
@@ -3435,7 +3444,7 @@
 
 
     ############################################################################
-    def ask_run_configuration(self, mode=None, force=False):
+    def ask_run_configuration(self, mode=None):
         """Ask the question when launching generate_events/multi_run"""
         
         available_mode = ['0', '1']
@@ -3460,9 +3469,9 @@
             if '4' in available_mode:
                 question += """  4 / delphes :  MadEvent + Pythia + Delphes.\n"""
 
-            if not force:
+            if not self.force:
                 if not mode:
-                    mode = self.ask(question, '0', options, timeout=self.timeout)
+                    mode = self.ask(question, '0', options)
             elif not mode:
                 mode = 'auto'
                 
@@ -3497,7 +3506,7 @@
             self.add_card_to_run('trigger')
             cards.append('delphes_card.dat')
 
-        if force:
+        if self.force:
             return
 
         def get_question(mode):
@@ -3536,7 +3545,7 @@
         answer = 'no'
         while answer != 'done':
             question, possible_answer, card = get_question(mode)
-            answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.timeout), path_msg='enter path')
+            answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.options['timeout']), path_msg='enter path')
             if answer.isdigit():
                 answer = card[int(answer)]
             if answer == 'done':
@@ -3546,7 +3555,6 @@
                     path = pjoin(self.me_dir,'Cards','%s_card.dat' % answer)
                 else:
                     path = pjoin(self.me_dir,'Cards','delphes_trigger.dat')
-                    print path
                 self.exec_cmd('open %s' % path)                    
             else:
                 # detect which card is provide
@@ -3573,7 +3581,7 @@
                     
                     
     ############################################################################
-    def ask_pythia_run_configuration(self, mode=None, force=False):
+    def ask_pythia_run_configuration(self, mode=None):
         """Ask the question when launching pythia"""
         
         available_mode = ['0', '1', '2']
@@ -3588,9 +3596,9 @@
         if '3' in available_mode:
             question += """  3 / delphes  : Pythia + Delphes.\n"""
 
-        if not force:
+        if not self.force:
             if not mode:
-                mode = self.ask(question, '0', options, timeout=self.timeout)
+                mode = self.ask(question, '0', options)
         elif not mode:
             mode = 'auto'
             
@@ -3621,7 +3629,7 @@
             self.add_card_to_run('trigger')
             cards.append('delphes_card.dat')
         
-        if force:
+        if self.force:
             return mode
         
         # Ask the user if he wants to edit any of the files
@@ -3655,7 +3663,7 @@
         # Loop as long as the user is not done.
         answer = 'no'
         while answer != 'done':
-             answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.timeout), path_msg='enter path')
+             answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.options['timeout']), path_msg='enter path')
              if answer.isdigit():
                  answer = card[int(answer)]
              if answer == 'done':
@@ -3682,7 +3690,7 @@
     def ask_edit_cards(self, cards, fct_args):
         """Question for cards editions (used for pgs/delphes)"""
 
-        if '-f' in fct_args or '--no_default' in fct_args:
+        if self.force or '--no_default' in fct_args:
             return
         
         card_name = {'pgs': 'pgs_card.dat',
@@ -3714,7 +3722,7 @@
         # Loop as long as the user is not done.
         answer = 'no'
         while answer != 'done':
-             answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.timeout), path_msg='enter path')
+             answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.options['timeout']), path_msg='enter path')
              if answer.isdigit():
                  answer = card[int(answer)]
              if answer == 'done':
@@ -3739,7 +3747,7 @@
 
 
         question = """Do you want to edit the %s?""" % card
-        answer = self.ask(question, 'n', ['y','n'], timeout=self.timeout,path_msg='enter path')
+        answer = self.ask(question, 'n', ['y','n'],path_msg='enter path')
         if answer == 'y':
             path = pjoin(self.me_dir,'Cards', card)
             self.exec_cmd('open %s' % path)
@@ -3928,13 +3936,13 @@
         logger.info('generate %s events' % nb_event)
         self.set_run_name('GridRun_%s' % seed)
         self.update_status('restoring default data', level=None)
-        subprocess.call([pjoin(self.me_dir,'bin','internal','restore_data'),
+        misc.call([pjoin(self.me_dir,'bin','internal','restore_data'),
                          'default'],
             cwd=self.me_dir)
 
         # 2) Run the refine for the grid
         self.update_status('Generating Events', level=None)
-        #subprocess.call([pjoin(self.me_dir,'bin','refine4grid'),
+        #misc.call([pjoin(self.me_dir,'bin','refine4grid'),
         #                str(nb_event), '0', 'Madevent','1','GridRun_%s' % seed],
         #                cwd=self.me_dir)
         self.refine4grid(nb_event)
@@ -3942,7 +3950,6 @@
         # 3) Combine the events/pythia/...
         self.exec_cmd('combine_events')
         self.exec_cmd('store_events')
-        self.exec_cmd('pythia --no_default -f')
         self.print_results_in_shell(self.results.current)
 
     def refine4grid(self, nb_event):
@@ -3974,7 +3981,7 @@
             
             devnull = os.open(os.devnull, os.O_RDWR)
             logfile = pjoin(Pdir, 'gen_ximprove.log')
-            proc = subprocess.Popen([pjoin(bindir, 'gen_ximprove')],
+            proc = misc.Popen([pjoin(bindir, 'gen_ximprove')],
                                     stdin=subprocess.PIPE,
                                     stdout=open(logfile,'w'),
                                     cwd=Pdir)
@@ -3990,7 +3997,7 @@
                 for i, job in enumerate(alljobs):
                     job = os.path.basename(job)
                     self.launch_job('./%s' % job, cwd=Pdir, remaining=(nb_tot-i-1), 
-                             run_type='Refine number %s on %s (%s/%s)' % (self.nb_refine, subdir, nb_proc+1, len(subproc)))
+                                 run_type='Refine number %s on %s (%s/%s)' % (self.nb_refine, subdir, nb_proc+1, len(subproc)))
         self.monitor(run_type='All job submitted for refine number %s' % self.nb_refine,
                      html=True)
         
@@ -4001,11 +4008,11 @@
             pass
         
         bindir = pjoin(os.path.relpath(self.dirbin, pjoin(self.me_dir,'SubProcesses')))
-        subprocess.call([pjoin(bindir, 'combine_runs')], 
+        misc.call([pjoin(bindir, 'combine_runs')], 
                                           cwd=pjoin(self.me_dir,'SubProcesses'),
                                           stdout=devnull)
         
-        #subprocess.call([pjoin(self.dirbin, 'sumall')], 
+        #misc.call([pjoin(self.dirbin, 'sumall')], 
         #                                 cwd=pjoin(self.me_dir,'SubProcesses'),
         #                                 stdout=devnull)
         

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2012-03-08 23:53:29 +0000
+++ madgraph/interface/madgraph_interface.py	2012-05-16 15:22:19 +0000
@@ -24,6 +24,7 @@
 import re
 import subprocess
 import sys
+import shutil
 import traceback
 import time
 
@@ -69,6 +70,9 @@
 import models as ufomodels
 import models.import_ufo as import_ufo
 
+import aloha.aloha_fct as aloha_fct
+import aloha.create_aloha as create_aloha
+
 # Special logger for the Cmd Interface
 logger = logging.getLogger('cmdprint') # -> stdout
 logger_stderr = logging.getLogger('fatalerror') # ->stderr
@@ -313,6 +317,11 @@
         logger.info("     the processes using Pythia 8. The files are written in")
         logger.info("     the Pythia 8 directory (default).")
         logger.info("     NOTE: The Pythia 8 directory is set in the ./input/mg5_configuration.txt")
+        logger.info("   - If mode is aloha: Special syntax output:")
+        logger.info("     syntax: aloha [ROUTINE] [--options]" )
+        logger.info("     valid options for aloha output are:")
+        logger.info("      --format=Fortran|Python|Cpp : defining the output language")
+        logger.info("      --output= : defining output directory")
         logger.info("   path: The path of the process directory.")
         logger.info("     If you put '.' as path, your pwd will be used.")
         logger.info("     If you put 'auto', an automatic directory PROC_XX_n will be created.")
@@ -403,7 +412,9 @@
         logger.info("   fortran_compiler NAME")
         logger.info("      (default None) Force a specific fortran compiler.")
         logger.info("      If None, it tries first g77 and if not present gfortran.")
-
+        logger.info("   timeout VALUE")
+        logger.info("      (default 20) Seconds allowed to answer questions.")
+        logger.info("      Note that pressing tab always stops the timer.")
 
 #===============================================================================
 # CheckValidForCmd
@@ -797,6 +808,11 @@
             if args[1] not in ['DEBUG','INFO','WARNING','ERROR','CRITICAL']:
                 raise self.InvalidCmd('output_level needs ' + \
                                       'a valid level')       
+
+        if args[0] in ['timeout']:
+            if not args[1].isdigit():
+                raise self.InvalidCmd('timeout values should be a integer')   
+
     
     def check_open(self, args):
         """ check the validity of the line """
@@ -845,10 +861,6 @@
         else:
             self._export_format = 'madevent'
 
-        if not self._curr_amps:
-            text = 'No processes generated. Please generate a process first.'
-            raise self.InvalidCmd(text)
-
         if not self._curr_model:
             text = 'No model found. Please import a model first and then retry.'
             raise self.InvalidCmd(text)
@@ -862,9 +874,25 @@
             logger.warning(text)
             raise self.InvalidCmd('')
 
+        if self._export_format == 'aloha':
+            return
+
+
+        if not self._curr_amps:
+            text = 'No processes generated. Please generate a process first.'
+            raise self.InvalidCmd(text)
+
+
+
+
+
         if args and args[0][0] != '-':
             # This is a path
             path = args.pop(0)
+            forbiden_chars = ['>','<',';','&']
+            for char in forbiden_chars:
+                if char in path:
+                    raise self.invalidCmd('%s is not allowed in the output path' % char)
             # Check for special directory treatment
             if path == 'auto' and self._export_format in \
                      ['madevent', 'standalone', 'standalone_cpp']:
@@ -1126,8 +1154,7 @@
 
         # Directory continuation
         if args[-1].endswith(os.path.sep):
-            return self.path_completion(text,
-                                        pjoin('.',*[a for a in args \
+            return self.path_completion(text, pjoin(*[a for a in args \
                                                     if a.endswith(os.path.sep)]))
         # autocompletion for particles/couplings
         model_comp = self.model_completion(text, ' '.join(args[2:]))
@@ -1159,7 +1186,7 @@
             return self.list_completion(text, self._display_opts)
 
         if len(args) == 2 and args[1] == 'checks':
-            return self.list_completion(text, 'failed')
+            return self.list_completion(text, ['failed'])
 
         if len(args) == 2 and args[1] == 'particles':
             return self.model_completion(text, line[begidx:])
@@ -1172,7 +1199,7 @@
         # Directory continuation
         if args[-1].endswith(os.path.sep):
             return self.path_completion(text,
-                                        pjoin('.',*[a for a in args if a.endswith(os.path.sep)]),
+                                        pjoin(*[a for a in args if a.endswith(os.path.sep)]),
                                         only_dirs = True)
         # Format
         if len(args) == 1:
@@ -1192,7 +1219,7 @@
         # Directory continuation
         if args[-1].endswith(os.path.sep):
             return self.path_completion(text,
-                                        pjoin('.',*[a for a in args if a.endswith(os.path.sep)]),
+                                        pjoin(*[a for a in args if a.endswith(os.path.sep)]),
                                         only_dirs = True)
         # Format
         if len(args) == 1:
@@ -1233,7 +1260,7 @@
         # Directory continuation
         if args[-1].endswith(os.path.sep):
             return self.path_completion(text,
-                                        pjoin('.',*[a for a in args if \
+                                        pjoin(*[a for a in args if \
                                                       a.endswith(os.path.sep)]))
 
         # Filename if directory is not given
@@ -1252,22 +1279,23 @@
         # Directory continuation
         if args[-1].endswith(os.path.sep):
             return self.path_completion(text,
-                                        pjoin('.',*[a for a in args if a.endswith(os.path.sep)]),
+                                        pjoin(*[a for a in args if a.endswith(os.path.sep)]),
                                         only_dirs = True)
 
         # Filename if directory is not given
         if len(args) == 2:
             return self.path_completion(text)
-        
+
+    @cmd.debug()    
     def complete_open(self, text, line, begidx, endidx): 
         """ complete the open command """
-
+        
         args = self.split_arg(line[0:begidx])
         
         # Directory continuation
         if os.path.sep in args[-1] + text:
             return self.path_completion(text,
-                                    pjoin('.',*[a for a in args if \
+                                    pjoin(*[a for a in args if \
                                                       a.endswith(os.path.sep)]))
 
         possibility = []
@@ -1290,7 +1318,8 @@
             possibility.append('ME5_debug')            
 
         return self.list_completion(text, possibility)
-       
+    
+    @cmd.debug()
     def complete_output(self, text, line, begidx, endidx,
                         possible_options = ['f', 'noclean', 'nojpeg'],
                         possible_options_full = ['-f', '-noclean', '-nojpeg']):
@@ -1301,15 +1330,20 @@
         forbidden_names = ['MadGraphII', 'Template', 'pythia-pgs', 'CVS',
                             'Calculators', 'MadAnalysis', 'SimpleAnalysis',
                             'mg5', 'DECAY', 'EventConverter', 'Models',
-                            'ExRootAnalysis', 'HELAS', 'Transfer_Fct']
+                            'ExRootAnalysis', 'HELAS', 'Transfer_Fct', 'aloha']
         
         #name of the run =>proposes old run name
         args = self.split_arg(line[0:begidx])
         if len(args) >= 1: 
+            if len(args) > 1 and args[1] == 'aloha':
+                try:
+                    return self.aloha_complete_output(text, line, begidx, endidx)
+                except Exception, error:
+                    print error
             # Directory continuation
             if args[-1].endswith(os.path.sep):
                 return [name for name in self.path_completion(text,
-                        pjoin('.',*[a for a in args if a.endswith(os.path.sep)]),
+                        pjoin(*[a for a in args if a.endswith(os.path.sep)]),
                         only_dirs = True) if name not in forbidden_names]
             # options
             if args[-1][0] == '-' or len(args) > 1 and args[-2] == '-':
@@ -1318,11 +1352,8 @@
                 return self.list_completion(text, possible_options_full)
             # Formats
             if len(args) == 1:
-                if any([p.startswith(text) for p in possible_format]):
-                    return [name for name in \
-                            self.list_completion(text, possible_format) + \
-                            ['.' + os.path.sep, '..' + os.path.sep, 'auto'] \
-                            if name.startswith(text)]
+                format = possible_format + ['.' + os.path.sep, '..' + os.path.sep, 'auto']
+                return self.list_completion(text, format)
 
             # directory names
             content = [name for name in self.path_completion(text, '.', only_dirs = True) \
@@ -1330,6 +1361,46 @@
             content += ['auto']
             return self.list_completion(text, content)
 
+    def aloha_complete_output(self, text, line, begidx, endidx):
+        "Complete the output aloha command"
+        args = self.split_arg(line[0:begidx])
+        completion_categories = {}
+        
+        forbidden_names = ['MadGraphII', 'Template', 'pythia-pgs', 'CVS',
+                            'Calculators', 'MadAnalysis', 'SimpleAnalysis',
+                            'mg5', 'DECAY', 'EventConverter', 'Models',
+                            'ExRootAnalysis', 'Transfer_Fct', 'aloha',
+                            'apidoc','vendor']
+        
+        
+        # options
+        options = ['--format=Fortran', '--format=Python','--format=CPP','--output=']
+        options = self.list_completion(text, options)
+        if options:
+            completion_categories['options'] = options
+        
+        if args[-1] == '--output=' or args[-1].endswith(os.path.sep):
+            # Directory continuation
+            completion_categories['path'] =  [name for name in self.path_completion(text,
+                        pjoin(*[a for a in args if a.endswith(os.path.sep)]),
+                        only_dirs = True) if name not in forbidden_names]
+
+        else:
+            ufomodel = ufomodels.load_model(self._curr_model.get('name'))
+            wf_opt = []
+            amp_opt = []
+            opt_conjg = []
+            for lor in ufomodel.all_lorentz:
+                amp_opt.append('%s_0' % lor.name)
+                for i in range(len(lor.spins)):
+                    wf_opt.append('%s_%i' % (lor.name,i+1))
+                    if i % 2 == 0 and lor.spins[i] == 2:
+                        opt_conjg.append('%sC%i_%i' % (lor.name,i //2 +1,i+1))
+            completion_categories['amplitude routines'] = self.list_completion(text, amp_opt) 
+            completion_categories['Wavefunctions routines'] = self.list_completion(text, wf_opt)        
+            completion_categories['conjugate_routines'] = self.list_completion(text, opt_conjg)
+            
+        return self.deal_multiple_categories(completion_categories)
 
     def complete_set(self, text, line, begidx, endidx):
         "Complete the set command"
@@ -1368,7 +1439,7 @@
                 return self.list_completion(text, first_set + second_set)
         elif len(args) >2 and args[-1].endswith(os.path.sep):
                 return self.path_completion(text,
-                        pjoin('.',*[a for a in args if a.endswith(os.path.sep)]),
+                        pjoin(*[a for a in args if a.endswith(os.path.sep)]),
                         only_dirs = True)
         
     def complete_import(self, text, line, begidx, endidx):
@@ -1460,7 +1531,7 @@
                                       or os.path.exists(pjoin(MG5DIR,'models',p,'particles.dat')) \
                                       or os.path.exists(pjoin(self._mgme_dir,'Models',p,'particles.dat')) 
             else:
-                cur_path = pjoin('.',*[a for a in args \
+                cur_path = pjoin(*[a for a in args \
                                                    if a.endswith(os.path.sep)])
                 all_path =  self.path_completion(text, cur_path)
                 completion_categories['model name'] = all_path
@@ -1482,7 +1553,7 @@
                         all_name += self.find_restrict_card(model_name, 
                                             base_dir=pjoin(MG5DIR,'models'))
                 if mode == 'all':
-                    cur_path = pjoin('.',*[a for a in args \
+                    cur_path = pjoin(*[a for a in args \
                                                         if a.endswith(os.path.sep)])
                     all_path =  self.path_completion(text, cur_path)
                     completion_categories['model name'] = all_path + all_name 
@@ -1553,7 +1624,6 @@
     """The command line processor of MadGraph"""    
 
     writing_dir = '.'
-    timeout = 0 # time authorize to answer question [0 is no time limit]
   
     # Options and formats available
     _display_opts = ['particles', 'interactions', 'processes', 'diagrams', 
@@ -1566,7 +1636,7 @@
     _import_formats = ['model_v4', 'model', 'proc_v4', 'command', 'banner']
     _install_opts = ['pythia-pgs', 'Delphes', 'MadAnalysis', 'ExRootAnalysis']
     _v4_export_formats = ['madevent', 'standalone', 'matrix'] 
-    _export_formats = _v4_export_formats + ['standalone_cpp', 'pythia8']
+    _export_formats = _v4_export_formats + ['standalone_cpp', 'pythia8', 'aloha']
     _set_options = ['group_subprocesses',
                     'ignore_six_quark_processes',
                     'stdout_level',
@@ -1827,7 +1897,6 @@
                 # check if a particle is asked more than once
                 if len(request_part) > len(set(request_part)):
                     for p in request_part:
-                        print p, request_part.count(p),present_part.count(p)
                         if request_part.count(p) > present_part.count(p):
                             continue
                         
@@ -2709,11 +2778,11 @@
         # Load that path
         logger.info('Downloading %s' % path[args[0]])
         if sys.platform == "darwin":
-            subprocess.call(['curl', path[args[0]], '-o%s.tgz' % name], cwd=MG5DIR)
+            misc.call(['curl', path[args[0]], '-o%s.tgz' % name], cwd=MG5DIR)
         else:
-            subprocess.call(['wget', path[args[0]], '--output-document=%s.tgz'% name], cwd=MG5DIR)
+            misc.call(['wget', path[args[0]], '--output-document=%s.tgz'% name], cwd=MG5DIR)
         # Untar the file
-        returncode = subprocess.call(['tar', '-xzpvf', '%s.tgz' % name], cwd=MG5DIR, 
+        returncode = misc.call(['tar', '-xzpvf', '%s.tgz' % name], cwd=MG5DIR, 
                                      stdout=open(os.devnull, 'w'))
         if returncode:
             raise MadGraph5Error, 'Fail to download correctly the File. Stop'
@@ -2739,7 +2808,9 @@
         # Compile the file
         # Check for F77 compiler
         if 'FC' not in os.environ or not os.environ['FC']:
-            if misc.which('gfortran'):
+            if self.options['fortran_compiler']:
+                compiler = self.options['fortran_compiler']
+            elif misc.which('gfortran'):
                  compiler = 'gfortran'
             elif misc.which('g77'):
                 compiler = 'g77'
@@ -2749,16 +2820,24 @@
                 path = os.path.join(MG5DIR, 'pythia-pgs', 'src', 'make_opts')
                 text = open(path).read()
                 text = text.replace('FC=g77','FC=gfortran')
-                open(path, 'w').writelines(text)            
-        
-        if logger.level <= logging.INFO: 
-            subprocess.call(['make', 'clean'], )
-            status = subprocess.call(['make'], cwd = os.path.join(MG5DIR, name))
+                open(path, 'w').writelines(text)    
+            elif compiler == 'gfortran' and args[0] == 'MadAnalysis':
+                path = os.path.join(MG5DIR, 'MadAnalysis', 'makefile')
+                text = open(path).read()
+                text = text.replace('FC=g77','FC=gfortran')
+                open(path, 'w').writelines(text)
+                            
+        if logger.level <= logging.INFO:
+            devnull = open(os.devnull,'w') 
+            misc.call(['make', 'clean'], stdout=devnull, stderr=-2)
+            status = misc.call(['make'], cwd = os.path.join(MG5DIR, name))
         else:
             misc.compile(['clean'], mode='', cwd = os.path.join(MG5DIR, name))
             status = misc.compile(mode='', cwd = os.path.join(MG5DIR, name))
         if not status:
             logger.info('compilation succeeded')
+        else:
+            logger.warning('Error detected during the compilation. Please check the compilation error and run make manually.')
 
 
         # Special treatment for TD program (require by MadAnalysis)
@@ -2773,15 +2852,15 @@
             if sys.platform == "darwin":
                 logger.info('Downloading TD for Mac')
                 target = 'http://theory.fnal.gov/people/parke/TD/td_mac_intel.tar.gz'
-                subprocess.call(['curl', target, '-otd.tgz'], 
+                misc.call(['curl', target, '-otd.tgz'], 
                                                   cwd=pjoin(MG5DIR,'td'))      
-                subprocess.call(['tar', '-xzpvf', 'td.tgz'], 
+                misc.call(['tar', '-xzpvf', 'td.tgz'], 
                                                   cwd=pjoin(MG5DIR,'td'))
                 files.mv(MG5DIR + '/td/td_mac_intel',MG5DIR+'/td/td')
             else:
                 logger.info('Downloading TD for Linux 32 bit')
                 target = 'http://madgraph.phys.ucl.ac.be/Downloads/td'
-                subprocess.call(['wget', target], cwd=pjoin(MG5DIR,'td'))      
+                misc.call(['wget', target], cwd=pjoin(MG5DIR,'td'))      
                 os.chmod(pjoin(MG5DIR,'td','td'), 0775)
                 if sys.maxsize > 2**32:
                     logger.warning('''td program (needed by MadAnalysis) is not compile for 64 bit computer
@@ -2794,6 +2873,7 @@
             ./input/mg5_configuration.txt. assign to default if not define """
             
         self.options = {'pythia8_path': './pythia8',
+                              'timeout': 20,
                               'web_browser':None,
                               'eps_viewer':None,
                               'text_editor':None,
@@ -2895,8 +2975,7 @@
         # args is now MODE PATH
         
         if args[0].startswith('standalone'):
-            ext_program = launch_ext.SALauncher(self, args[1], self.timeout,
-                                                **options)
+            ext_program = launch_ext.SALauncher(self, args[1], **options)
         elif args[0] == 'madevent':
             if options['interactive']:
                 if hasattr(self, 'do_shell'):
@@ -2921,23 +3000,17 @@
                 generate_info = self._generate_info
             
             if len(generate_info.split('>')[0].strip().split())>1:
-                ext_program = launch_ext.MELauncher(args[1], self.timeout, self,
-                                pythia=self.options['pythia-pgs_path'],
-                                delphes=self.options['delphes_path'],
+                ext_program = launch_ext.MELauncher(args[1], self,
                                 shell = hasattr(self, 'do_shell'),
                                 **options)
             else:
                 # This is a width computation
-                ext_program = launch_ext.MELauncher(args[1], self.timeout, self, 
-                                unit='GeV',
-                                pythia=self.options['pythia-pgs_path'],
-                                delphes=self.options['delphes_path'],
+                ext_program = launch_ext.MELauncher(args[1], self, unit='GeV',
                                 shell = hasattr(self, 'do_shell'),
                                 **options)
 
         elif args[0] == 'pythia8':
-            ext_program = launch_ext.Pythia8Launcher( args[1], self.timeout, self,
-                                                **options)
+            ext_program = launch_ext.Pythia8Launcher( args[1], self, **options)
         else:
             os.chdir(start_cwd) #ensure to go to the initial path
             raise self.InvalidCmd , '%s cannot be run from MG5 interface' % args[0]
@@ -3092,11 +3165,8 @@
                 self.options['fortran_compiler'] = args[1]
             else:
                 self.options['fortran_compiler'] = None
-        elif args[0] in self.options:
-            if args[1] in  ['None','True', 'False']:
-                self.options[args[0]] = eval(args[1])
-            else:
-                self.options[args[0]] = args[1] 
+        elif args[0] == 'timeout':
+                self.options[args[0]] = int(args[1]) 
         elif args[0] in self.options:
             if args[1] in ['None','True','False']:
                 self.options[args[0]] = eval(args[1])
@@ -3134,16 +3204,54 @@
             main_file_name = args[args.index('-name') + 1]
         except:
             pass
-            
+        
+        ################
+        # ALOHA OUTPUT #
+        ################
+        if self._export_format == 'aloha':
+            # catch format
+            format = [d[9:] for d in args if d.startswith('--format=')]
+            if not format:
+                format = 'Fortran'
+            else:
+                format = format[-1]
+            # catch output dir
+            output = [d for d in args if d.startswith('--output=')]
+            if not output:
+                output = import_ufo.find_ufo_path(self._curr_model['name'])
+                output = pjoin(output, format)
+                if not os.path.isdir(output):
+                    os.mkdir(output)
+            else:
+                output = output[-1]
+                if not os.path.isdir(output):
+                    raise self.InvalidCmd('%s is not a valid directory' % output)
+            logger.info('creating routines in directory %s ' % output)
+            # build the calling list for aloha
+            names = [d for d in args if not d.startswith('-')]
+            wanted_lorentz = aloha_fct.guess_routine_from_name(names)
+            # Create and write ALOHA Routine
+            aloha_model = create_aloha.AbstractALOHAModel(self._curr_model.get('name'))
+            if wanted_lorentz:
+                aloha_model.compute_subset(wanted_lorentz)
+            else:
+                aloha_model.compute_all(save=False)
+            aloha_model.write(output, format)
+            return
+        
+        #################
+        ## Other Output #
+        #################
         if not force and not noclean and os.path.isdir(self._export_dir)\
                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')
-            answer = self.ask('Do you want to continue?', 'y', ['y','n'], 
-                                                           timeout=self.timeout)
+            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
@@ -3434,7 +3542,7 @@
         elif self._export_format == 'madevent':          
             # Create configuration file [path to executable] for madevent
             filename = os.path.join(self._export_dir, 'Cards', 'me5_configuration.txt')
-            self.do_save('options %s' % filename, check=False)
+            self.do_save('options %s' % filename.replace(' ', '\ '), check=False)
 
         if self._export_format in ['madevent', 'standalone']:
             

=== modified file 'madgraph/interface/master_interface.py'
--- madgraph/interface/master_interface.py	2012-03-08 23:53:29 +0000
+++ madgraph/interface/master_interface.py	2012-05-16 15:22:19 +0000
@@ -38,6 +38,7 @@
 import madgraph
 import madgraph.interface.extended_cmd as cmd
 import madgraph.interface.madgraph_interface as MGcmd
+import madgraph.iolibs.files as files
 import madgraph.interface.Loop_interface as LoopCmd
 
 from madgraph import MG4DIR, MG5DIR, MadGraph5Error
@@ -393,6 +394,8 @@
         #standard initialization
         Switcher.__init__(self, mgme_dir = '', *arg, **opt)
         
+        self.options['timeout'] = 1 # time authorize to answer question [0 is no time limit]
+        
     def change_principal_cmd(self, name):
         if name == 'MadGraph':
             self.cmd = MGcmd.MadGraphCmdWeb
@@ -440,3 +443,22 @@
         config_path = pjoin(os.environ['MADGRAPH_BASE'], 'mg5_configuration.txt')
         return Switcher.set_configuration(self, config_path=config_path)
     
+
+    def do_save(self, line, check=True):
+        """Save information to file"""
+        
+        if check:
+            self.check_save([])
+            raise #useless but full security
+        
+        args = self.split_arg(line)
+        if args[0] != 'options':
+            Switcher.do_save(self, line,check)
+        else:
+            # put default options since 
+            # in the web the local file is not used
+            # in download the default file is more usefull
+            files.cp(pjoin(MG5DIR,'input','mg5_configuration.txt'), args[1])
+            
+
+

=== 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 15:22:19 +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/export_v4.py'
--- madgraph/iolibs/export_v4.py	2012-03-06 03:20:37 +0000
+++ madgraph/iolibs/export_v4.py	2012-05-16 15:22:19 +0000
@@ -1380,7 +1380,12 @@
             logger.info("Generate jpeg diagrams")
             for Pdir in P_dir_list:
                 os.chdir(Pdir)
-                subprocess.call([os.path.join(old_pos, self.dir_path, 'bin', 'internal', 'gen_jpeg-pl')],
+                try:
+                    subprocess.call([os.path.join(old_pos, self.dir_path, 'bin', 'internal', 'gen_jpeg-pl')],
+                                stdout = devnull)
+                except:
+                    os.system('chmod +x %s ' % os.path.join(old_pos, self.dir_path, 'bin', 'internal', '*'))
+                    subprocess.call([os.path.join(old_pos, self.dir_path, 'bin', 'internal', 'gen_jpeg-pl')],
                                 stdout = devnull)
                 os.chdir(os.path.pardir)
 
@@ -2843,11 +2848,14 @@
                 
         # MG4 use G and not aS as it basic object for alphas related computation
         #Pass G in the  independant list
-        index = self.params_dep.index('G')
-        self.params_indep.insert(0, self.params_dep.pop(index))
-        index = self.params_dep.index('sqrt__aS')
-        self.params_indep.insert(0, self.params_dep.pop(index))
-        
+        if 'G' in self.params_dep:
+            index = self.params_dep.index('G')
+            G = self.params_dep.pop(index)
+        #    G.expr = '2*cmath.sqrt(as*pi)'
+        #    self.params_indep.insert(0, self.params_dep.pop(index))
+        # No need to add it if not defined   
+            
+            
     def build(self, wanted_couplings = [], full=True):
         """modify the couplings to fit with MG4 convention and creates all the 
         different files"""
@@ -2987,7 +2995,7 @@
             already_def.add(particle.get('mass').lower())
             already_def.add(particle.get('width').lower())
 
-        is_valid = lambda name: name!='G' and name.lower() not in already_def
+        is_valid = lambda name: name !='G' and name.lower() not in already_def
         
         real_parameters = [param.name for param in self.params_dep + 
                             self.params_indep if param.type == 'real'
@@ -3017,7 +3025,7 @@
         fsock.write_comments(\
                 "Parameters that should not be recomputed event by event.\n")
         fsock.writelines("if(readlha) then\n")
-        
+        fsock.writelines("G = 2 * DSQRT(AS*PI) ! for the first init\n")
         for param in self.params_indep:
             if param.name == 'ZERO':
                 continue
@@ -3027,6 +3035,7 @@
         fsock.writelines('endif')
         
         fsock.write_comments('\nParameters that should be recomputed at an event by even basis.\n')
+        fsock.writelines("aS = G**2/4/pi\n")
         for param in self.params_dep:
             fsock.writelines("%s = %s\n" % (param.name,
                                             self.p_to_f.parse(param.expr)))

=== modified file 'madgraph/iolibs/group_subprocs.py'
--- madgraph/iolibs/group_subprocs.py	2012-02-17 06:01:41 +0000
+++ madgraph/iolibs/group_subprocs.py	2012-05-16 15:22:19 +0000
@@ -258,7 +258,13 @@
     def get_num_configs(self):
         """Get number of configs for this group"""
 
-        return len(self.get('mapping_diagrams'))
+        model = self.get('matrix_elements')[0].get('processes')[0].\
+                get('model')
+        
+        next, nini = self.get_nexternal_ninitial()
+        
+        return sum([md.get_num_configs(model, nini) for md in 
+                    self.get('mapping_diagrams')])
 
     def find_mapping_diagrams(self):
         """Find all unique diagrams for all processes in this
@@ -514,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:
@@ -550,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
 
@@ -578,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 15:22:19 +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/iolibs/template_files/madevent_combine_events.f'
--- madgraph/iolibs/template_files/madevent_combine_events.f	2012-03-06 03:20:37 +0000
+++ madgraph/iolibs/template_files/madevent_combine_events.f	2012-05-16 15:22:19 +0000
@@ -10,7 +10,7 @@
       integer    maxsubprocesses
       parameter (maxsubprocesses=9999)
       integer    cmax_events
-      parameter (cmax_events=500000)
+      parameter (cmax_events=5000000)
       integer    sfnum
       parameter (sfnum=17)   !Unit number for scratch file
       include 'maxparticles.inc'

=== modified file 'madgraph/iolibs/template_files/matrix_madevent_group_v4.inc'
--- madgraph/iolibs/template_files/matrix_madevent_group_v4.inc	2011-05-30 17:37:49 +0000
+++ madgraph/iolibs/template_files/matrix_madevent_group_v4.inc	2012-05-16 15:22:19 +0000
@@ -117,7 +117,7 @@
                GOODHEL(I,IMIRROR)=.TRUE.
                NGOOD(IMIRROR) = NGOOD(IMIRROR) +1
                IGOOD(NGOOD(IMIRROR),IMIRROR) = I
-               PRINT *,'Added good helicity ',I,TS(I)*NCOMB/ANS
+               PRINT *,'Added good helicity ',I,TS(I)*NCOMB/ANS,' in event ',NTRY(IMIRROR)
             ENDIF
          ENDDO
       ENDIF

=== modified file 'madgraph/various/banner.py'
--- madgraph/various/banner.py	2012-02-24 16:52:39 +0000
+++ madgraph/various/banner.py	2012-05-16 15:22:19 +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/cluster.py'
--- madgraph/various/cluster.py	2012-03-06 20:10:09 +0000
+++ madgraph/various/cluster.py	2012-05-16 15:22:19 +0000
@@ -28,8 +28,10 @@
 class ClusterManagmentError(MadGraph5Error):
     pass
 
+class NotImplemented(MadGraph5Error):
+    pass
 
-def multiple_try(nb_try=5, sleep=1):
+def multiple_try(nb_try=5, sleep=20):
 
     def deco_retry(f):
         def deco_f_retry(*args, **opt):
@@ -39,7 +41,7 @@
                 except KeyboardInterrupt:
                     raise
                 except:
-                    time.sleep(sleep)
+                    time.sleep(sleep * (i+1))
             raise
         return deco_f_retry
     return deco_retry
@@ -56,7 +58,6 @@
         return deco_f_interupt
     return deco_interupt
 
-
 class Cluster(object):
     """Basic Class for all cluster type submission"""
     name = 'mother class'
@@ -105,6 +106,7 @@
             if fail:
                 raise ClusterManagmentError('Some Jobs are in a Hold/... state. Please try to investigate or contact the IT team')
             if idle + run == 0:
+                time.sleep(20) #security to ensure that the file are really written on the disk
                 logger.info('All jobs finished')
                 break
             fct(idle, run, finish)
@@ -116,13 +118,38 @@
     def launch_and_wait(self, prog, argument=[], cwd=None, stdout=None, 
                                                          stderr=None, log=None):
         """launch one job on the cluster and wait for it"""
+        
+        special_output = False # tag for concatanate the error with the output.
+        if stderr == -2 and stdout: 
+            #We are suppose to send the output to stdout
+            special_output = True
+            stderr = stdout + '.err'
         id = self.submit(prog, argument, cwd, stdout, stderr, log)
         while 1:        
             status = self.control_one_job(id)
             if not status in ['R','I']:
+                time.sleep(20) #security to ensure that the file are really written on the disk
                 break
             time.sleep(30)
-            
+        
+        if special_output:
+            # combine the stdout and the stderr
+            #wait up to 50 s to see if those files exists
+            for i in range(5):
+                if os.path.exists(stdout):
+                    if not os.path.exists(stderr):
+                        time.sleep(5)
+                    if os.path.exists(stderr):
+                        err_text = open(stderr).read()
+                        if not err_text:
+                            return
+                        logger.warning(err_text)                        
+                        text = open(stdout).read()
+                        open(stdout,'w').write(text + err_text)
+                    else:
+                        return
+                time.sleep(10)
+                        
     def remove(self, *args):
         """ """
         logger.warning("""This cluster didn't support job removal, 
@@ -195,7 +222,12 @@
     def control_one_job(self, id):
         """ control the status of a single job with it's cluster id """
         cmd = 'condor_q '+str(id)+" -format \'%-2s \\n\' \'ifThenElse(JobStatus==0,\"U\",ifThenElse(JobStatus==1,\"I\",ifThenElse(JobStatus==2,\"R\",ifThenElse(JobStatus==3,\"X\",ifThenElse(JobStatus==4,\"C\",ifThenElse(JobStatus==5,\"H\",ifThenElse(JobStatus==6,\"E\",string(JobStatus))))))))\'"
-        status = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE)
+        status = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE, 
+                                                         stderr=subprocess.PIPE)
+        if status.returncode:
+            raise ClusterManagmentError, 'condor_q returns error: %s' % \
+                                                            status.stderr.read()
+
         return status.stdout.readline().strip()
     
     @check_interupt()
@@ -207,16 +239,22 @@
             return 0, 0, 0, 0
         
         cmd = "condor_q " + ' '.join(self.submitted_ids) + " -format \'%-2s \\n\' \'ifThenElse(JobStatus==0,\"U\",ifThenElse(JobStatus==1,\"I\",ifThenElse(JobStatus==2,\"R\",ifThenElse(JobStatus==3,\"X\",ifThenElse(JobStatus==4,\"C\",ifThenElse(JobStatus==5,\"H\",ifThenElse(JobStatus==6,\"E\",string(JobStatus))))))))\'"
-        status = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE)
+        status = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE, 
+                                                         stderr=subprocess.PIPE)
 
+        if status.returncode:
+            raise ClusterManagmentError, 'condor_q returns error: %s' % \
+                                                            status.stderr.read()
+            
+            
         idle, run, fail = 0, 0, 0
         for line in status.stdout:
             status = line.strip()
-            if status == 'I':
+            if status in ['I','U']:
                 idle += 1
             elif status == 'R':
                 run += 1
-            else:
+            elif status != 'C':
                 fail += 1
 
         return idle, run, self.submitted - (idle+run+fail), fail
@@ -237,6 +275,7 @@
     name = 'pbs'
     idle_tag = ['Q']
     running_tag = ['T','E','R']
+    complete_tag = ['C']
 
     @multiple_try()
     def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
@@ -321,8 +360,9 @@
                     idle += 1
                 elif status in self.running_tag:
                     run += 1
+                elif status in self.complete_tag:
+                    continue
                 else:
-                    print line
                     fail += 1
 
         return idle, run, self.submitted - (idle+run+fail), fail
@@ -465,6 +505,7 @@
                     fail += 1
 
         return idle, run, self.submitted - (idle+run+fail), fail
+
     
     
     @multiple_try()
@@ -476,6 +517,7 @@
         cmd = "qdel %s" % ' '.join(self.submitted_ids)
         status = subprocess.Popen([cmd], shell=True, stdout=open(os.devnull,'w'))
 
+
 class LSFCluster(Cluster):
     """Basic class for dealing with cluster submission"""
     
@@ -595,8 +637,127 @@
         cmd = "bdel %s" % ' '.join(self.submitted_ids)
         status = subprocess.Popen([cmd], shell=True, stdout=open(os.devnull,'w'))
 
+class GECluster(Cluster):
+    """Class for dealing with cluster submission on a GE cluster"""
+    
+    name = 'ge'
+    idle_tag = ['qw']
+    running_tag = ['r']
+
+    @multiple_try()
+    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
+        """Submit the prog to the cluser"""
+        
+        text = ""
+        if cwd is None:
+            cwd = os.getcwd()
+        else: 
+            text = " cd %s; bash " % cwd
+        if stdout is None:
+            stdout = os.path.join(cwd, "log.%s" % prog.split('/')[-1])
+        if stderr is None:
+            stderr = os.path.join(cwd, "err.%s" % prog.split('/')[-1])
+        elif stderr == -2: # -2 is subprocess.STDOUT
+            stderr = stdout
+        if log is None:
+            log = '/dev/null'
+
+        text += prog
+        if argument:
+            text += ' ' + ' '.join(argument)
+        text += '\n'
+        tmp_submit = os.path.join(cwd, 'tmp_submit')
+        open(tmp_submit,'w').write(text)
+
+        a = subprocess.Popen(['qsub','-o', stdout,
+                                     '-e', stderr,
+                                     tmp_submit],
+                                     stdout=subprocess.PIPE, 
+                                     stderr=subprocess.STDOUT,
+                                     stdin=subprocess.PIPE, cwd=cwd)
+
+        output = a.communicate()[0]
+        #Your job 874511 ("test.sh") has been submitted
+        pat = re.compile("Your job (\d*) \(",re.MULTILINE)
+        try:
+            id = pat.search(output).groups()[0]
+        except:
+            raise ClusterManagmentError, 'fail to submit to the cluster: \n%s' \
+                                                                        % output 
+        self.submitted += 1
+        self.submitted_ids.append(id)
+        return id
+
+    @multiple_try()
+    def control_one_job(self, id):
+        """ control the status of a single job with it's cluster id """
+        cmd = 'qstat | grep '+str(id)
+        status = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE)
+        if not status:
+            return 'F'
+        #874516 0.00000 test.sh    alwall       qw    03/04/2012 22:30:35                                    1
+        pat = re.compile("^(\d+)\s+[\d\.]+\s+[\w\d\.]+\s+[\w\d\.]+\s+(\w+)\s")
+        stat = ''
+        for line in status.stdout.read().split('\n'):
+            if not line:
+                continue
+            line = line.strip()
+            try:
+                groups = pat.search(line).groups()
+            except:
+                raise ClusterManagmentError, 'bad syntax for stat: \n\"%s\"' % line
+            if groups[0] != id: continue
+            stat = groups[1]
+        if not stat:
+            return 'F'
+        if stat in self.idle_tag:
+            return 'I' 
+        if stat in self.running_tag:                
+            return 'R' 
+        
+    @multiple_try()
+    def control(self, me_dir=None):
+        """Check the status of job associated to directory me_dir. return (idle, run, finish, fail)"""
+        if not self.submitted_ids:
+            return 0, 0, 0, 0
+        idle, run, fail = 0, 0, 0
+        ongoing = []
+        for statusflag in ['p', 'r', 'sh']:
+            cmd = 'qstat -s %s' % statusflag
+            status = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE)
+            #874516 0.00000 test.sh    alwall       qw    03/04/2012 22:30:35                                    1
+            pat = re.compile("^(\d+)")
+            for line in status.stdout.read().split('\n'):
+                line = line.strip()
+                try:
+                    id = pat.search(line).groups()[0]
+                except:
+                    pass
+                else:
+                    if id not in self.submitted_ids:
+                        continue
+                    ongoing.append(id)
+                    if statusflag == 'p':
+                        idle += 1
+                    if statusflag == 'r':
+                        run += 1
+                    if statusflag == 'sh':
+                        fail += 1
+
+        self.submitted_ids = ongoing
+
+        return idle, run, self.submitted - idle - run - fail, fail
+
+    @multiple_try()
+    def remove(self, *args):
+        """Clean the jobs on the cluster"""
+        
+        if not self.submitted_ids:
+            return
+        cmd = "qdel %s" % ' '.join(self.submitted_ids)
+        status = subprocess.Popen([cmd], shell=True, stdout=open(os.devnull,'w'))
+
 from_name = {'condor':CondorCluster, 'pbs': PBSCluster, 'sge': SGECluster, 
-             'lsf': LSFCluster}
-
-
-    
+             'lsf': LSFCluster, 'ge':GECluster}
+
+

=== modified file 'madgraph/various/gen_crossxhtml.py'
--- madgraph/various/gen_crossxhtml.py	2012-03-06 03:20:37 +0000
+++ madgraph/various/gen_crossxhtml.py	2012-05-16 15:22:19 +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:
@@ -278,7 +284,12 @@
 
     def add_detail(self, name, value, run=None, tag=None):
         """ add information to current run (cross/error/event)"""
-        assert name in ['cross', 'error', 'nb_event', 'cross_pythia']
+        assert name in ['cross', 'error', 'nb_event', 'cross_pythia',
+                        'nb_event_pythia','error_pythia']
+
+        if not run and not self.current:
+            return
+
         if not run:
             run = self.current
         else:
@@ -288,6 +299,8 @@
             run['cross_pythia'] = float(value)
         elif name == 'nb_event':
             run[name] = int(value)
+        elif name == 'nb_event_pythia':
+            run[name] = int(value)
         else:    
             run[name] = float(value)    
     
@@ -407,6 +420,13 @@
         except:
             self.web = False
 
+        # check if more than one parton output
+        parton = [r for r in self if r.parton]
+        # clean wrong previous run link
+        if len(parton)>1:
+            for p in parton[:-1]:
+                p.parton = []
+
         dico = self.info
         dico['run_span'] = sum([tag.get_nb_line() for tag in self], 1) -1
         dico['tag_data'] = '\n'.join([tag.get_html(self) for tag in self])
@@ -461,11 +481,10 @@
             output['cross'] = self[-2]['cross']
             output['error'] = self[-2]['error']
         elif (current.pgs or current.delphes) and not current['nb_event'] and len(self) > 1:
-            if self[-2]['cross_pythia']:
+            if self[-2]['cross_pythia'] and self[-2]['nb_event_pythia']:
                 output['cross'] = self[-2]['cross_pythia']
-                output['nb_event'] = int(0.5+(self[-2]['nb_event'] * current['cross'] /self[-2]['cross']))                           
-                output['error'] = current.get_pythia_error(self[-2]['cross'], 
-                       self[-2]['error'], current['cross'], current['nb_event'])
+                output['nb_event'] = self[-2]['nb_event_pythia']
+                output['error'] = self[-2]['error_pythia']
             else:
                 output['nb_event'] = self[-2]['nb_event']
                 output['cross'] = self[-2]['cross']
@@ -510,6 +529,7 @@
         self['nb_event'] = 0
         self['cross'] = 0
         self['cross_pythia'] = ''
+        self['nb_event_pythia'] = 0
         self['error'] = 0
         self.parton = [] 
         self.pythia = []
@@ -634,20 +654,7 @@
         
          return " <a  id='%(id)s' href='%(link1)s' onClick=\"check_link('%(link1)s','%(link2)s','%(id)s')\">%(name)s</a>" \
               % {'link1': link1, 'link2':link2, 'id': id, 'name':name}       
-    
-    def get_pythia_error(self, cross, error, pythia_cross, nb_event):
-        """compute the error associate to pythie"""
-        # pythia_cross = cross * n_acc / n_gen
-        # error_pythia = error * n_acc /n_gen + cross * sqrt(n_acc) / n_gen
         
-        if cross and nb_event: 
-            n_acc = int(0.5 + pythia_cross / cross * nb_event)
-            error_pythia = error * n_acc / nb_event 
-            error_pythia += cross * math.sqrt(n_acc) / nb_event
-        else:
-            error_pythia = 0
-        return error_pythia
-    
     def get_links(self, level):
         """ Get the links for a given level"""
         
@@ -770,11 +777,10 @@
                 pass
                 
         elif (self.pgs or self.delphes) and not self['nb_event']:
-            if runresults[-2]['cross_pythia']:
+            if runresults[-2]['cross_pythia'] and runresults[-2]['cross']:
                 self['cross'] = runresults[-2]['cross_pythia']
-                self['nb_event'] = int(0.5+(runresults[-2]['nb_event'] * self['cross'] /runresults[-2]['cross']))                           
-                self['error'] = self.get_pythia_error(runresults[-2]['cross'], 
-                       runresults[-2]['error'], self['cross'], self['nb_event'])
+                self['error'] = runresults[-2]['error_pythia']
+                self['nb_event'] = runresults[-2]['nb_event_pythia']                           
             else:
                 self['nb_event'] = runresults[-2]['nb_event']
                 self['cross'] = runresults[-2]['cross']
@@ -803,13 +809,12 @@
                         local_dico['cross_span'] = nb_line -1
                     else:
                         local_dico['cross_span'] = nb_line
-                    if self['cross']:
-                        local_dico['nb_event'] = int(0.5+(self['nb_event'] * self['cross_pythia'] /self['cross']))
+                    if self['nb_event_pythia']:
+                        local_dico['nb_event'] = self['nb_event_pythia']
                     else:
                         local_dico['nb_event'] = 0
                     local_dico['cross'] = self['cross_pythia']
-                    local_dico['err'] = self.get_pythia_error(self['cross'],
-                           self['error'],self['cross_pythia'], self['nb_event']) 
+                    local_dico['err'] = self['error_pythia']
                 else:
                     local_dico['cross_span'] = nb_line
                     local_dico['cross'] = self['cross']
@@ -820,16 +825,15 @@
                 template = sub_part_template_parton
                 if self.parton:           
                     local_dico['cross_span'] = nb_line - 1
-                    if self['cross']:
-                        local_dico['nb_event'] = int(0.5+(self['nb_event'] * self['cross_pythia'] /self['cross']))
+                    if self['nb_event_pythia']:
+                        local_dico['nb_event'] = self['nb_event_pythia']
                     else:
                         local_dico['nb_event'] = 0
                 else:
                     local_dico['cross_span'] = nb_line
                     local_dico['nb_event'] = self['nb_event']
                 local_dico['cross'] = self['cross_pythia']
-                local_dico['err'] = self.get_pythia_error(self['cross'],
-                           self['error'],self['cross_pythia'], self['nb_event'])
+                local_dico['err'] = self['error_pythia']
             else:
                template = sub_part_template_pgs             
             

=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2012-03-02 17:16:45 +0000
+++ madgraph/various/misc.py	2012-05-16 15:22:19 +0000
@@ -37,7 +37,7 @@
     import internal.files as files
     
 logger = logging.getLogger('cmdprint.ext_program')
-
+pjoin = os.path.join
    
 #===============================================================================
 # parse_info_str
@@ -194,6 +194,50 @@
         raise MadGraph5Error, error_text
     return p.returncode
 
+# Control
+def check_system_error(value=1):
+    def deco_check(f):
+        def deco_f(arg, *args, **opt):
+            try:
+                return f(arg, *args, **opt)
+            except OSError, error:
+                if isinstance(arg, list):
+                    prog =  arg[0]
+                else:
+                    prog = arg[0]
+                
+                # Permission denied
+                if error.errno == 13:     
+                    if os.path.exists(prog):
+                        os.system('chmod +x %s' % prog)
+                    elif 'cwd' in opt and opt['cwd'] and \
+                                       os.path.isfile(pjoin(opt['cwd'],arg[0])):
+                        os.system('chmod +x %s' % pjoin(opt['cwd'],arg[0]))
+                    return f(arg, *args, **opt)
+                # NO such file or directory
+                elif error.errno == 2:
+                    # raise a more meaningfull error message
+                    raise Exception, '%s fails with no such file or directory' \
+                                                                           % arg            
+                else:
+                    raise
+        return deco_f
+    return deco_check
+
+
+@check_system_error()
+def call(arg, *args, **opt):
+    """nice way to call an external program with nice error treatment"""
+    return subprocess.call(arg, *args, **opt)
+
+@check_system_error()
+def Popen(arg, *args, **opt):
+    """nice way to call an external program with nice error treatment"""
+    return subprocess.Popen(arg, *args, **opt)
+
+                
+
+
 
 ################################################################################
 # TAIL FUNCTION
@@ -217,6 +261,7 @@
         if len(lines) >= to_read or pos == 0:
             return lines[-to_read:offset and -offset or None]
         avg_line_length *= 1.3
+        avg_line_length = int(avg_line_length)
 
 ################################################################################
 # LAST LINE FUNCTION
@@ -226,6 +271,60 @@
     
     return tail(fsock, 1)[0]
     
+class BackRead(file):
+    """read a file returning the lines in reverse order for each call of readline()
+This actually just reads blocks (4096 bytes by default) of data from the end of
+the file and returns last line in an internal buffer."""
+
+
+    def readline(self):
+        """ readline in a backward way """
+        
+        while len(self.data) == 1 and ((self.blkcount * self.blksize) < self.size):
+          self.blkcount = self.blkcount + 1
+          line = self.data[0]
+          try:
+            self.seek(-self.blksize * self.blkcount, 2) # read from end of file
+            self.data = (self.read(self.blksize) + line).split('\n')
+          except IOError:  # can't seek before the beginning of the file
+            self.seek(0)
+            data = self.read(self.size - (self.blksize * (self.blkcount-1))) + line
+            self.data = data.split('\n')
+    
+        if len(self.data) == 0:
+          return ""
+    
+        line = self.data.pop()
+        return line + '\n'
+
+    def __init__(self, filepos, blksize=4096):
+        """initialize the internal structures"""
+
+        # get the file size
+        self.size = os.stat(filepos)[6]
+        # how big of a block to read from the file...
+        self.blksize = blksize
+        # how many blocks we've read
+        self.blkcount = 1
+        file.__init__(self, filepos, 'rb')
+        # if the file is smaller than the blocksize, read a block,
+        # otherwise, read the whole thing...
+        if self.size > self.blksize:
+          self.seek(-self.blksize * self.blkcount, 2) # read from end of file
+        self.data = self.read(self.blksize).split('\n')
+        # strip the last item if it's empty...  a byproduct of the last line having
+        # a newline at the end of it
+        if not self.data[-1]:
+          self.data.pop()
+        
+    def next(self):
+        line = self.readline()
+        if line:
+            return line
+        else:
+            raise StopIteration
+
+
 
 
 #

=== modified file 'madgraph/various/sum_html.py'
--- madgraph/various/sum_html.py	2012-02-27 22:22:51 +0000
+++ madgraph/various/sum_html.py	2012-05-16 15:22:19 +0000
@@ -20,7 +20,10 @@
 logger = logging.getLogger('madevent.stdout') # -> stdout
 
 pjoin = os.path.join
-
+try:
+    import madgraph.various.cluster as cluster
+except:
+    import internal.cluster as cluster
 
 class OneResult(object):
     
@@ -41,6 +44,7 @@
         self.yerr_iter = []
         return
     
+    @cluster.multiple_try(nb_try=4,sleep=5)
     def read_results(self, filepath):
         """read results.dat and fullfill information"""
         

=== added directory 'models/EWdim6'
=== added file 'models/EWdim6/EWdim6.log'
--- models/EWdim6/EWdim6.log	1970-01-01 00:00:00 +0000
+++ models/EWdim6/EWdim6.log	2012-05-16 15:22:19 +0000
@@ -0,0 +1,75 @@
+# This file was automatically created by FeynRules $Revision: 1167 $
+# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
+# Date: Fri 4 May 2012 16:18:13
+
+
+# 
+# This is the logfile for the model EWdim6
+
+# Authors: C. Degrande
+# Model version: 1.0
+# Checking the Quantum numbers
+   * Electric charge defined.
+# Checking the Lagrangians
+   * All Lagrangians are ok.
+#
+# Particle definitions
+#
+
+   * No particles removed. All particles correspond to GenInt setup.
+
+# Automatically assigned PDG numbers
+   * Assigned PDG number 9000001 to particle ghA
+   * Assigned PDG number 9000002 to particle ghZ
+   * Assigned PDG number 9000003 to particle ghWp
+   * Assigned PDG number 9000004 to particle ghWm
+   * Assigned PDG number 9000005 to particle ghG
+
+
+# Compulsory PDG codes:
+   * Class SM leptons complete.
+   * Class SM neutrinos complete.
+   * Class SM quarks complete.
+   * Class SM gauge bosons complete.
+#
+# Parameter definitions
+#
+
+   * All parameters are ok.
+
+
+# Vertices
+   * Calling FeynmanRules for 1 Lagrangians.
+   * Number of classes vertices: 70
+   * Number of flavored vertices: 138
+   * Saved vertices in InterfaceRun[ 1 ].
+   * Checked QNumber conservation.
+      - Quantum number GhostNumber conserved in all vertices.
+      - Quantum number LeptonNumber conserved in all vertices.
+      - Quantum number Q conserved in all vertices.
+   * particles.py written.
+   * parameters.py written.
+#
+# Vertex definitions
+#
+
+   * 138 vertices written.
+   * vertices.py written.
+#
+# Lorentz structure definitions
+#
+
+   * 81 lorentz structures written.
+   * lorentz.py written.
+#
+# Coupling definitions
+#
+
+   * 161 couplings written.
+   * couplings.py written.
+#
+# Coupling order definitions
+#
+
+   * 0 couplings orders written.
+   * coupling_orders.py written.

=== added file 'models/EWdim6/__init__.py'
--- models/EWdim6/__init__.py	1970-01-01 00:00:00 +0000
+++ models/EWdim6/__init__.py	2012-05-16 15:22:19 +0000
@@ -0,0 +1,22 @@
+
+import particles
+import couplings
+import lorentz
+import parameters
+import vertices
+import coupling_orders
+import write_param_card
+
+
+all_particles = particles.all_particles
+all_vertices = vertices.all_vertices
+all_couplings = couplings.all_couplings
+all_lorentz = lorentz.all_lorentz
+all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
+all_functions = function_library.all_functions
+
+
+__author__ = "C. Degrande"
+__version__ = "1.0"
+__email__ = "[e-mail]"

=== added file 'models/EWdim6/coupling_orders.py'
--- models/EWdim6/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/EWdim6/coupling_orders.py	2012-05-16 15:22:19 +0000
@@ -0,0 +1,20 @@
+# This file was automatically created by FeynRules $Revision: 1167 $
+# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
+# Date: Fri 4 May 2012 16:30:01
+
+
+from object_library import all_orders, CouplingOrder
+
+
+NP = CouplingOrder(name = 'NP',
+                   expansion_order = 2,
+                   hierarchy = 1)
+
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = 99,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = 99,
+                    hierarchy = 2)
+

=== added file 'models/EWdim6/couplings.py'
--- models/EWdim6/couplings.py	1970-01-01 00:00:00 +0000
+++ models/EWdim6/couplings.py	2012-05-16 15:22:19 +0000
@@ -0,0 +1,655 @@
+# This file was automatically created by FeynRules $Revision: 1167 $
+# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
+# Date: Fri 4 May 2012 16:30:01
+
+
+from object_library import all_couplings, Coupling
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+
+
+
+GC_1 = Coupling(name = 'GC_1',
+                value = '-(ee*complex(0,1))/3.',
+                order = {'QED':1})
+
+GC_2 = Coupling(name = 'GC_2',
+                value = '(2*ee*complex(0,1))/3.',
+                order = {'QED':1})
+
+GC_3 = Coupling(name = 'GC_3',
+                value = '-(ee*complex(0,1))',
+                order = {'QED':1})
+
+GC_4 = Coupling(name = 'GC_4',
+                value = '-G',
+                order = {'QCD':1})
+
+GC_5 = Coupling(name = 'GC_5',
+                value = 'complex(0,1)*G',
+                order = {'QCD':1})
+
+GC_6 = Coupling(name = 'GC_6',
+                value = 'complex(0,1)*G**2',
+                order = {'QCD':2})
+
+GC_7 = Coupling(name = 'GC_7',
+                value = 'cw*complex(0,1)*gw',
+                order = {'QED':1})
+
+GC_8 = Coupling(name = 'GC_8',
+                value = '-(complex(0,1)*gw**2)',
+                order = {'QED':2})
+
+GC_9 = Coupling(name = 'GC_9',
+                value = 'cw**2*complex(0,1)*gw**2',
+                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 = '(C3phiq*complex(0,1)*gw*cmath.sqrt(2))/Lambda**2',
+                 order = {'NP':2,'QED':2})
+
+GC_12 = Coupling(name = 'GC_12',
+                 value = '(CPW*cw*complex(0,1)*gw)/(2.*Lambda**2)',
+                 order = {'NP':2})
+
+GC_13 = Coupling(name = 'GC_13',
+                 value = '-(CPW*cw**2*complex(0,1)*g1*gw)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_14 = Coupling(name = 'GC_14',
+                 value = '-(CPW*complex(0,1)*gw**2)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_15 = Coupling(name = 'GC_15',
+                 value = '(CPW*cw*complex(0,1)*g1*gw**2)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_16 = Coupling(name = 'GC_16',
+                 value = '-(CPW*cw*complex(0,1)*gw**3)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_17 = Coupling(name = 'GC_17',
+                 value = '(CPW*cw*complex(0,1)*gw**3)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_18 = Coupling(name = 'GC_18',
+                 value = '(3*cw*CWWW*complex(0,1)*gw**3)/(2.*Lambda**2)',
+                 order = {'NP':2})
+
+GC_19 = Coupling(name = 'GC_19',
+                 value = '-((CPW*complex(0,1)*gw**4)/Lambda**2)',
+                 order = {'NP':2,'QED':3})
+
+GC_20 = Coupling(name = 'GC_20',
+                 value = '(CPW*cw**2*complex(0,1)*gw**4)/Lambda**2',
+                 order = {'NP':2,'QED':3})
+
+GC_21 = Coupling(name = 'GC_21',
+                 value = '(-3*CWWW*complex(0,1)*gw**4)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_22 = Coupling(name = 'GC_22',
+                 value = '(3*cw**2*CWWW*complex(0,1)*gw**4)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_23 = Coupling(name = 'GC_23',
+                 value = '(-2*CPW*cw*complex(0,1)*gw**5)/Lambda**2',
+                 order = {'NP':2,'QED':4})
+
+GC_24 = Coupling(name = 'GC_24',
+                 value = '(-2*CPW*cw**3*complex(0,1)*gw**5)/Lambda**2',
+                 order = {'NP':2,'QED':4})
+
+GC_25 = Coupling(name = 'GC_25',
+                 value = '(-3*cw*CWWW*complex(0,1)*gw**5)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_26 = Coupling(name = 'GC_26',
+                 value = '(-3*cw**3*CWWW*complex(0,1)*gw**5)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_27 = Coupling(name = 'GC_27',
+                 value = '(6*cw**2*CWWW*complex(0,1)*gw**6)/Lambda**2',
+                 order = {'NP':2,'QED':3})
+
+GC_28 = Coupling(name = 'GC_28',
+                 value = '-(cw*complex(0,1)*g1*gw**2*HB)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_29 = Coupling(name = 'GC_29',
+                 value = '(complex(0,1)*gw**2*HW)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_30 = Coupling(name = 'GC_30',
+                 value = '-(cw*complex(0,1)*g1*gw**2*HW)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_31 = Coupling(name = 'GC_31',
+                 value = '-(cw*complex(0,1)*gw**3*HW)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_32 = Coupling(name = 'GC_32',
+                 value = '(complex(0,1)*gw**4*HW)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':3})
+
+GC_33 = Coupling(name = 'GC_33',
+                 value = '(ee**2*complex(0,1))/(2.*sw**2)',
+                 order = {'QED':2})
+
+GC_34 = Coupling(name = 'GC_34',
+                 value = '(ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_35 = Coupling(name = 'GC_35',
+                 value = '(CKM1x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_36 = Coupling(name = 'GC_36',
+                 value = '(CKM1x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_37 = Coupling(name = 'GC_37',
+                 value = '(CKM1x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_38 = Coupling(name = 'GC_38',
+                 value = '(CKM2x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_39 = Coupling(name = 'GC_39',
+                 value = '(CKM2x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_40 = Coupling(name = 'GC_40',
+                 value = '(CKM2x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_41 = Coupling(name = 'GC_41',
+                 value = '(CKM3x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_42 = Coupling(name = 'GC_42',
+                 value = '(CKM3x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_43 = Coupling(name = 'GC_43',
+                 value = '(CKM3x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_44 = Coupling(name = 'GC_44',
+                 value = '-(cw*ee*complex(0,1))/(2.*sw)',
+                 order = {'QED':1})
+
+GC_45 = Coupling(name = 'GC_45',
+                 value = '(cw*ee*complex(0,1))/(2.*sw)',
+                 order = {'QED':1})
+
+GC_46 = Coupling(name = 'GC_46',
+                 value = '-(ee*complex(0,1)*sw)/(6.*cw)',
+                 order = {'QED':1})
+
+GC_47 = Coupling(name = 'GC_47',
+                 value = '(ee*complex(0,1)*sw)/(2.*cw)',
+                 order = {'QED':1})
+
+GC_48 = Coupling(name = 'GC_48',
+                 value = 'complex(0,1)*gw*sw',
+                 order = {'QED':1})
+
+GC_49 = Coupling(name = 'GC_49',
+                 value = '-2*cw*complex(0,1)*gw**2*sw',
+                 order = {'QED':2})
+
+GC_50 = Coupling(name = 'GC_50',
+                 value = '(CPW*complex(0,1)*gw*sw)/(2.*Lambda**2)',
+                 order = {'NP':2})
+
+GC_51 = Coupling(name = 'GC_51',
+                 value = '-(CPW*cw*complex(0,1)*gw**2*sw)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_52 = Coupling(name = 'GC_52',
+                 value = '-(CPW*complex(0,1)*g1*gw**2*sw)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_53 = Coupling(name = 'GC_53',
+                 value = '-(CPW*complex(0,1)*gw**3*sw)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_54 = Coupling(name = 'GC_54',
+                 value = '(CPW*complex(0,1)*gw**3*sw)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_55 = Coupling(name = 'GC_55',
+                 value = '(3*CWWW*complex(0,1)*gw**3*sw)/(2.*Lambda**2)',
+                 order = {'NP':2})
+
+GC_56 = Coupling(name = 'GC_56',
+                 value = '(CPW*cw*complex(0,1)*gw**4*sw)/Lambda**2',
+                 order = {'NP':2,'QED':3})
+
+GC_57 = Coupling(name = 'GC_57',
+                 value = '(-3*cw*CWWW*complex(0,1)*gw**4*sw)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_58 = Coupling(name = 'GC_58',
+                 value = '(2*CPW*complex(0,1)*gw**5*sw)/Lambda**2',
+                 order = {'NP':2,'QED':4})
+
+GC_59 = Coupling(name = 'GC_59',
+                 value = '(-2*CPW*cw**2*complex(0,1)*gw**5*sw)/Lambda**2',
+                 order = {'NP':2,'QED':4})
+
+GC_60 = Coupling(name = 'GC_60',
+                 value = '(-3*CWWW*complex(0,1)*gw**5*sw)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_61 = Coupling(name = 'GC_61',
+                 value = '(-3*cw**2*CWWW*complex(0,1)*gw**5*sw)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_62 = Coupling(name = 'GC_62',
+                 value = '(6*cw*CWWW*complex(0,1)*gw**6*sw)/Lambda**2',
+                 order = {'NP':2,'QED':3})
+
+GC_63 = Coupling(name = 'GC_63',
+                 value = '(complex(0,1)*g1*gw**2*HB*sw)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_64 = Coupling(name = 'GC_64',
+                 value = '-(complex(0,1)*g1*gw**2*HW*sw)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_65 = Coupling(name = 'GC_65',
+                 value = '-(complex(0,1)*gw**3*HW*sw)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_66 = Coupling(name = 'GC_66',
+                 value = 'complex(0,1)*gw**2*sw**2',
+                 order = {'QED':2})
+
+GC_67 = Coupling(name = 'GC_67',
+                 value = '-(CPW*complex(0,1)*g1*gw*sw**2)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_68 = Coupling(name = 'GC_68',
+                 value = '(CPW*complex(0,1)*gw**4*sw**2)/Lambda**2',
+                 order = {'NP':2,'QED':3})
+
+GC_69 = Coupling(name = 'GC_69',
+                 value = '(3*CWWW*complex(0,1)*gw**4*sw**2)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_70 = Coupling(name = 'GC_70',
+                 value = '(-2*CPW*cw*complex(0,1)*gw**5*sw**2)/Lambda**2',
+                 order = {'NP':2,'QED':4})
+
+GC_71 = Coupling(name = 'GC_71',
+                 value = '(-3*cw*CWWW*complex(0,1)*gw**5*sw**2)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':2})
+
+GC_72 = Coupling(name = 'GC_72',
+                 value = '(6*CWWW*complex(0,1)*gw**6*sw**2)/Lambda**2',
+                 order = {'NP':2,'QED':3})
+
+GC_73 = Coupling(name = 'GC_73',
+                 value = '(-2*CPW*complex(0,1)*gw**5*sw**3)/Lambda**2',
+                 order = {'NP':2,'QED':4})
+
+GC_74 = Coupling(name = 'GC_74',
+                 value = '(-3*CWWW*complex(0,1)*gw**5*sw**3)/Lambda**2',
+                 order = {'NP':2,'QED':2})
+
+GC_75 = Coupling(name = 'GC_75',
+                 value = '(cw*ee*complex(0,1))/(2.*sw) + (ee*complex(0,1)*sw)/(2.*cw)',
+                 order = {'QED':1})
+
+GC_76 = Coupling(name = 'GC_76',
+                 value = '-((C3phiq*cw*complex(0,1)*gw)/Lambda**2) - (Cphid*cw*complex(0,1)*gw)/Lambda**2 - (Cphiq*cw*complex(0,1)*gw)/Lambda**2 - (C3phiq*complex(0,1)*g1*sw)/Lambda**2 - (Cphid*complex(0,1)*g1*sw)/Lambda**2 - (Cphiq*complex(0,1)*g1*sw)/Lambda**2',
+                 order = {'NP':2,'QED':2})
+
+GC_77 = Coupling(name = 'GC_77',
+                 value = '(C3phiq*cw*complex(0,1)*gw)/Lambda**2 - (Cphiq*cw*complex(0,1)*gw)/Lambda**2 - (Cphiu*cw*complex(0,1)*gw)/Lambda**2 + (C3phiq*complex(0,1)*g1*sw)/Lambda**2 - (Cphiq*complex(0,1)*g1*sw)/Lambda**2 - (Cphiu*complex(0,1)*g1*sw)/Lambda**2',
+                 order = {'NP':2,'QED':2})
+
+GC_78 = Coupling(name = 'GC_78',
+                 value = '(C3phiq*cw*complex(0,1)*g1)/Lambda**2 + (Cphid*cw*complex(0,1)*g1)/Lambda**2 + (Cphiq*cw*complex(0,1)*g1)/Lambda**2 - (C3phiq*complex(0,1)*gw*sw)/Lambda**2 - (Cphid*complex(0,1)*gw*sw)/Lambda**2 - (Cphiq*complex(0,1)*gw*sw)/Lambda**2',
+                 order = {'NP':2,'QED':2})
+
+GC_79 = Coupling(name = 'GC_79',
+                 value = '-((C3phiq*cw*complex(0,1)*g1)/Lambda**2) + (Cphiq*cw*complex(0,1)*g1)/Lambda**2 + (Cphiu*cw*complex(0,1)*g1)/Lambda**2 + (C3phiq*complex(0,1)*gw*sw)/Lambda**2 - (Cphiq*complex(0,1)*gw*sw)/Lambda**2 - (Cphiu*complex(0,1)*gw*sw)/Lambda**2',
+                 order = {'NP':2,'QED':2})
+
+GC_80 = Coupling(name = 'GC_80',
+                 value = '-(CPW*cw**2*complex(0,1)*gw**2)/(2.*Lambda**2) - (CPW*cw*complex(0,1)*g1*gw*sw)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_81 = Coupling(name = 'GC_81',
+                 value = '-(cw*complex(0,1)*g1**2*HB*sw)/(4.*Lambda**2) + (cw*complex(0,1)*gw**2*HW*sw)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_82 = Coupling(name = 'GC_82',
+                 value = '-(cw**2*complex(0,1)*gw**4*HW)/(2.*Lambda**2) - (cw*complex(0,1)*g1*gw**3*HW*sw)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':3})
+
+GC_83 = Coupling(name = 'GC_83',
+                 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_84 = Coupling(name = 'GC_84',
+                 value = '(CPW*cw*complex(0,1)*g1*gw*sw)/(2.*Lambda**2) - (CPW*complex(0,1)*gw**2*sw**2)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_85 = Coupling(name = 'GC_85',
+                 value = '(cw**2*complex(0,1)*gw**2*HW)/(4.*Lambda**2) + (cw*complex(0,1)*g1*gw*HB*sw)/(4.*Lambda**2) + (cw*complex(0,1)*g1*gw*HW*sw)/(4.*Lambda**2) + (complex(0,1)*g1**2*HB*sw**2)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_86 = Coupling(name = 'GC_86',
+                 value = '-(cw**2*complex(0,1)*g1*gw*HW)/(4.*Lambda**2) + (complex(0,1)*g1*gw*HB*sw**2)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_87 = Coupling(name = 'GC_87',
+                 value = '-(cw**2*complex(0,1)*g1*gw*HB)/(4.*Lambda**2) + (complex(0,1)*g1*gw*HW*sw**2)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_88 = Coupling(name = 'GC_88',
+                 value = '(cw**2*complex(0,1)*g1**2*HB)/(4.*Lambda**2) - (cw*complex(0,1)*g1*gw*HB*sw)/(4.*Lambda**2) - (cw*complex(0,1)*g1*gw*HW*sw)/(4.*Lambda**2) + (complex(0,1)*gw**2*HW*sw**2)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_89 = Coupling(name = 'GC_89',
+                 value = '-(cw**2*complex(0,1)*g1*gw**3*HW)/(2.*Lambda**2) + (cw*complex(0,1)*gw**4*HW*sw)/Lambda**2 + (complex(0,1)*g1*gw**3*HW*sw**2)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':3})
+
+GC_90 = Coupling(name = 'GC_90',
+                 value = '(cw*complex(0,1)*g1*gw**3*HW*sw)/(2.*Lambda**2) - (complex(0,1)*gw**4*HW*sw**2)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':3})
+
+GC_91 = Coupling(name = 'GC_91',
+                 value = '-6*complex(0,1)*lam*v',
+                 order = {'QED':1})
+
+GC_92 = Coupling(name = 'GC_92',
+                 value = '(C3phiq*complex(0,1)*gw*v*cmath.sqrt(2))/Lambda**2',
+                 order = {'NP':2,'QED':1})
+
+GC_93 = Coupling(name = 'GC_93',
+                 value = '-(CPW*cw**2*complex(0,1)*g1*gw*v)/(2.*Lambda**2)',
+                 order = {'NP':2})
+
+GC_94 = Coupling(name = 'GC_94',
+                 value = '-(CPW*complex(0,1)*gw**2*v)/(2.*Lambda**2)',
+                 order = {'NP':2})
+
+GC_95 = Coupling(name = 'GC_95',
+                 value = '(CPW*cw*complex(0,1)*g1*gw**2*v)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_96 = Coupling(name = 'GC_96',
+                 value = '-(CPW*cw*complex(0,1)*gw**3*v)/(2.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_97 = Coupling(name = 'GC_97',
+                 value = '-(cw*complex(0,1)*g1*gw**2*HB*v)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_98 = Coupling(name = 'GC_98',
+                 value = '(complex(0,1)*gw**2*HW*v)/(4.*Lambda**2)',
+                 order = {'NP':2})
+
+GC_99 = Coupling(name = 'GC_99',
+                 value = '-(cw*complex(0,1)*g1*gw**2*HW*v)/(4.*Lambda**2)',
+                 order = {'NP':2,'QED':1})
+
+GC_100 = Coupling(name = 'GC_100',
+                  value = '-(cw*complex(0,1)*gw**3*HW*v)/(4.*Lambda**2)',
+                  order = {'NP':2,'QED':1})
+
+GC_101 = Coupling(name = 'GC_101',
+                  value = '(complex(0,1)*gw**4*HW*v)/(2.*Lambda**2)',
+                  order = {'NP':2,'QED':2})
+
+GC_102 = Coupling(name = 'GC_102',
+                  value = '(ee**2*complex(0,1)*v)/(2.*sw**2)',
+                  order = {'QED':1})
+
+GC_103 = Coupling(name = 'GC_103',
+                  value = '-(CPW*cw*complex(0,1)*gw**2*sw*v)/(2.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_104 = Coupling(name = 'GC_104',
+                  value = '-(CPW*complex(0,1)*g1*gw**2*sw*v)/(2.*Lambda**2)',
+                  order = {'NP':2,'QED':1})
+
+GC_105 = Coupling(name = 'GC_105',
+                  value = '-(CPW*complex(0,1)*gw**3*sw*v)/(2.*Lambda**2)',
+                  order = {'NP':2,'QED':1})
+
+GC_106 = Coupling(name = 'GC_106',
+                  value = '(complex(0,1)*g1*gw**2*HB*sw*v)/(4.*Lambda**2)',
+                  order = {'NP':2,'QED':1})
+
+GC_107 = Coupling(name = 'GC_107',
+                  value = '-(complex(0,1)*g1*gw**2*HW*sw*v)/(4.*Lambda**2)',
+                  order = {'NP':2,'QED':1})
+
+GC_108 = Coupling(name = 'GC_108',
+                  value = '-(complex(0,1)*gw**3*HW*sw*v)/(4.*Lambda**2)',
+                  order = {'NP':2,'QED':1})
+
+GC_109 = Coupling(name = 'GC_109',
+                  value = '-(CPW*complex(0,1)*g1*gw*sw**2*v)/(2.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_110 = Coupling(name = 'GC_110',
+                  value = '(C3phiq*complex(0,1)*gw*v**2)/(Lambda**2*cmath.sqrt(2))',
+                  order = {'NP':2})
+
+GC_111 = Coupling(name = 'GC_111',
+                  value = '(CPW*cw*complex(0,1)*g1*gw**2*v**2)/(4.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_112 = Coupling(name = 'GC_112',
+                  value = '-(CPW*cw*complex(0,1)*gw**3*v**2)/(4.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_113 = Coupling(name = 'GC_113',
+                  value = '-(cw*complex(0,1)*g1*gw**2*HB*v**2)/(8.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_114 = Coupling(name = 'GC_114',
+                  value = '-(cw*complex(0,1)*g1*gw**2*HW*v**2)/(8.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_115 = Coupling(name = 'GC_115',
+                  value = '-(cw*complex(0,1)*gw**3*HW*v**2)/(8.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_116 = Coupling(name = 'GC_116',
+                  value = '(complex(0,1)*gw**4*HW*v**2)/(4.*Lambda**2)',
+                  order = {'NP':2,'QED':1})
+
+GC_117 = Coupling(name = 'GC_117',
+                  value = '-(CPW*complex(0,1)*g1*gw**2*sw*v**2)/(4.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_118 = Coupling(name = 'GC_118',
+                  value = '-(CPW*complex(0,1)*gw**3*sw*v**2)/(4.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_119 = Coupling(name = 'GC_119',
+                  value = '(complex(0,1)*g1*gw**2*HB*sw*v**2)/(8.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_120 = Coupling(name = 'GC_120',
+                  value = '-(complex(0,1)*g1*gw**2*HW*sw*v**2)/(8.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_121 = Coupling(name = 'GC_121',
+                  value = '-(complex(0,1)*gw**3*HW*sw*v**2)/(8.*Lambda**2)',
+                  order = {'NP':2})
+
+GC_122 = Coupling(name = 'GC_122',
+                  value = '-((C3phiq*cw*complex(0,1)*gw*v)/Lambda**2) - (Cphid*cw*complex(0,1)*gw*v)/Lambda**2 - (Cphiq*cw*complex(0,1)*gw*v)/Lambda**2 - (C3phiq*complex(0,1)*g1*sw*v)/Lambda**2 - (Cphid*complex(0,1)*g1*sw*v)/Lambda**2 - (Cphiq*complex(0,1)*g1*sw*v)/Lambda**2',
+                  order = {'NP':2,'QED':1})
+
+GC_123 = Coupling(name = 'GC_123',
+                  value = '(C3phiq*cw*complex(0,1)*gw*v)/Lambda**2 - (Cphiq*cw*complex(0,1)*gw*v)/Lambda**2 - (Cphiu*cw*complex(0,1)*gw*v)/Lambda**2 + (C3phiq*complex(0,1)*g1*sw*v)/Lambda**2 - (Cphiq*complex(0,1)*g1*sw*v)/Lambda**2 - (Cphiu*complex(0,1)*g1*sw*v)/Lambda**2',
+                  order = {'NP':2,'QED':1})
+
+GC_124 = Coupling(name = 'GC_124',
+                  value = '(C3phiq*cw*complex(0,1)*g1*v)/Lambda**2 + (Cphid*cw*complex(0,1)*g1*v)/Lambda**2 + (Cphiq*cw*complex(0,1)*g1*v)/Lambda**2 - (C3phiq*complex(0,1)*gw*sw*v)/Lambda**2 - (Cphid*complex(0,1)*gw*sw*v)/Lambda**2 - (Cphiq*complex(0,1)*gw*sw*v)/Lambda**2',