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

[Olivier Mattelaer]

important change on the structure point of view:
- misc.py pass to various directory
- the extendedCmd class splits in Help/Check/Complete subclass (require for the web)

Otherwise include function added in 1.4.3

[lp:~maddevelopers/mg5amcnlo/1.4.3]

211. By mattelaer-olivier on 2012-03-09

fix a unit test

[Valentin Hirschi (valentin-hirschi)]

All test pass, and the structural change Olivier mentioned should not be a big deal.
So I approve the merge.

review: Approve

[marco zaro (marco-zaro)]

Hi,
I tried to merge this review with our fks5 branch.
after solving in a trivial way the conflicts (in the interfaces i had to replace self.configuration and self._options by self.options), i still have some tests which fail / give errors
(apart for "FAIL: Check that no help category are introduced by mistake." which is something to be fixed on our side with the new interfaces
many of them are related to the helas call writing/copmilations, so presumably they are related with the loop...
Thanks
Cheers

======================================================================
ERROR: Test the StandAlone output for different processes.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/tests/unit_tests/loop/test_loop_exporters.py", line 214, in test_LoopProcessExporterFortranSA_ddx_ddx
    self.check_output_sanity(myloopME)
  File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/tests/unit_tests/loop/test_loop_exporters.py", line 109, in check_output_sanity
    False,False)
  File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/madgraph/iolibs/export_v4.py", line 942, in finalize_v4_directory
    self.make()
  File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/madgraph/iolibs/export_v4.py", line 930, in make
    misc.compile(arg=['../lib/libdhelas.a'], cwd=source_dir, mode='fortran')
  File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/madgraph/various/misc.py", line 194, in compile
    raise MadGraph5Error, error_text
MadGraph5Error: A compilation Error occurs when trying to compile /Users/marcozaro/PhD/mg5/MADGRAPH-my/tests/unit_tests/loop/test_proc/Source.
The compilation fails with the following output message:
    cd DHELAS; make
    gfortran -O -w -ffixed-line-length-132 -c -o aloha_functions.o aloha_functions.f
    gfortran -O -w -ffixed-line-length-132 -c -o FFV1_0.o FFV1_0.f
    gfortran -O -w -ffixed-line-length-132 -c -o FFV1_3.o FFV1_3.f
    gfortran -O -w -ffixed-line-length-132 -c -o FFV1L_0.o FFV1L_0.f
    gfortran -O -w -ffixed-line-length-132 -c -o FFV1L_1.o FFV1L_1.f
    FFV1L_1.f:19.6:

          P1(0) = 1 F1(5)
          1
    Error: Unclassifiable statement at (1)
    FFV1L_1.f:20.6:

          P1(1) = 1 F1(6)
          1
    Error: Unclassifiable statement at (1)
    FFV1L_1.f:21.6:

          P1(2) = 1 F1(7)
          1
    Error: Unclassifiable statement at (1)
    FFV1L_1.f:22.6:

          P1(3) = 1 F1(8)
          1
    Error: Unclassifiable statement at (1)
    make[1]: *** [FFV1L_1.o] Error 1
    make: *** [../lib/libdhelas.a] Error 2

Please try to fix this compilations issue and retry.
Help might be found at https://answers.launchpad.net/madgraph5.
If you think that this is a bug, you can report this at https://bugs.launchpad.net/madgraph5

======================================================================
ERROR: Test the StandAlone output for different processes.
--------------------------------...

review: Needs Fixing

[Olivier Mattelaer (olivier-mattelaer)]

Hi Marco,

I suggested that
you commit the merge that you perform (either in FKS either in a
separate branch).
And I'll fix this problem in that branch.

Nothing that I can really do in this branch about that.

Cheers,

Olivier
On Mar 9, 2012, at 3:23 AM, marco zaro wrote:

> Review: Needs Fixing
>
> Hi,
> I tried to merge this review with our fks5 branch.
> after solving in a trivial way the conflicts (in the interfaces i
> had to replace self.configuration and self._options by
> self.options), i still have some tests which fail / give errors
> (apart for "FAIL: Check that no help category are introduced by
> mistake." which is something to be fixed on our side with the new
> interfaces
> many of them are related to the helas call writing/copmilations, so
> presumably they are related with the loop...
> Thanks
> Cheers
>
>
> ======================================================================
> ERROR: Test the StandAlone output for different processes.
> ----------------------------------------------------------------------
> Traceback (most recent call last):
> File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/tests/unit_tests/loop/
> test_loop_exporters.py", line 214, in
> test_LoopProcessExporterFortranSA_ddx_ddx
> self.check_output_sanity(myloopME)
> File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/tests/unit_tests/loop/
> test_loop_exporters.py", line 109, in check_output_sanity
> False,False)
> File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/madgraph/iolibs/
> export_v4.py", line 942, in finalize_v4_directory
> self.make()
> File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/madgraph/iolibs/
> export_v4.py", line 930, in make
> misc.compile(arg=['../lib/libdhelas.a'], cwd=source_dir,
> mode='fortran')
> File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/madgraph/various/
> misc.py", line 194, in compile
> raise MadGraph5Error, error_text
> MadGraph5Error: A compilation Error occurs when trying to compile /
> Users/marcozaro/PhD/mg5/MADGRAPH-my/tests/unit_tests/loop/test_proc/
> Source.
> The compilation fails with the following output message:
> cd DHELAS; make
> gfortran -O -w -ffixed-line-length-132 -c -o aloha_functions.o
> aloha_functions.f
> gfortran -O -w -ffixed-line-length-132 -c -o FFV1_0.o FFV1_0.f
> gfortran -O -w -ffixed-line-length-132 -c -o FFV1_3.o FFV1_3.f
> gfortran -O -w -ffixed-line-length-132 -c -o FFV1L_0.o FFV1L_0.f
> gfortran -O -w -ffixed-line-length-132 -c -o FFV1L_1.o FFV1L_1.f
> FFV1L_1.f:19.6:
>
> P1(0) = 1 F1(5)
> 1
> Error: Unclassifiable statement at (1)
> FFV1L_1.f:20.6:
>
> P1(1) = 1 F1(6)
> 1
> Error: Unclassifiable statement at (1)
> FFV1L_1.f:21.6:
>
> P1(2) = 1 F1(7)
> 1
> Error: Unclassifiable statement at (1)
> FFV1L_1.f:22.6:
>
> P1(3) = 1 F1(8)
> 1
> Error: Unclassifiable statement at (1)
> make[1]: *** [FFV1L_1.o] Error 1
> make: *** [../lib/libdhelas.a] Error 2
>
> Please try to fix this compilations issue and retry.
> Help might be found at https://answers.launchpad.net/madgraph5.
> If you think that this is a bug, you can report this at https://bugs.launch...

[marco zaro (marco-zaro)]

Hi Olivier,
here is the branch
~maddevelopers/madgraph5/FKS5-1.4.3
thank you
Cheers
Marco

On 09 Mar 2012, at 16:43, Olivier Mattelaer wrote:

> Hi Marco,
>
> I suggested that
> you commit the merge that you perform (either in FKS either in a
> separate branch).
> And I'll fix this problem in that branch.
>
> Nothing that I can really do in this branch about that.
>
> Cheers,
>
> Olivier
> On Mar 9, 2012, at 3:23 AM, marco zaro wrote:
>
>> Review: Needs Fixing
>>
>> Hi,
>> I tried to merge this review with our fks5 branch.
>> after solving in a trivial way the conflicts (in the interfaces i
>> had to replace self.configuration and self._options by
>> self.options), i still have some tests which fail / give errors
>> (apart for "FAIL: Check that no help category are introduced by
>> mistake." which is something to be fixed on our side with the new
>> interfaces
>> many of them are related to the helas call writing/copmilations, so
>> presumably they are related with the loop...
>> Thanks
>> Cheers
>>
>>
>> ======================================================================
>> ERROR: Test the StandAlone output for different processes.
>> ----------------------------------------------------------------------
>> Traceback (most recent call last):
>> File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/tests/unit_tests/loop/
>> test_loop_exporters.py", line 214, in
>> test_LoopProcessExporterFortranSA_ddx_ddx
>> self.check_output_sanity(myloopME)
>> File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/tests/unit_tests/loop/
>> test_loop_exporters.py", line 109, in check_output_sanity
>> False,False)
>> File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/madgraph/iolibs/
>> export_v4.py", line 942, in finalize_v4_directory
>> self.make()
>> File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/madgraph/iolibs/
>> export_v4.py", line 930, in make
>> misc.compile(arg=['../lib/libdhelas.a'], cwd=source_dir,
>> mode='fortran')
>> File "/Users/marcozaro/PhD/mg5/MADGRAPH-my/madgraph/various/
>> misc.py", line 194, in compile
>> raise MadGraph5Error, error_text
>> MadGraph5Error: A compilation Error occurs when trying to compile /
>> Users/marcozaro/PhD/mg5/MADGRAPH-my/tests/unit_tests/loop/test_proc/
>> Source.
>> The compilation fails with the following output message:
>> cd DHELAS; make
>> gfortran -O -w -ffixed-line-length-132 -c -o aloha_functions.o
>> aloha_functions.f
>> gfortran -O -w -ffixed-line-length-132 -c -o FFV1_0.o FFV1_0.f
>> gfortran -O -w -ffixed-line-length-132 -c -o FFV1_3.o FFV1_3.f
>> gfortran -O -w -ffixed-line-length-132 -c -o FFV1L_0.o FFV1L_0.f
>> gfortran -O -w -ffixed-line-length-132 -c -o FFV1L_1.o FFV1L_1.f
>> FFV1L_1.f:19.6:
>>
>> P1(0) = 1 F1(5)
>> 1
>> Error: Unclassifiable statement at (1)
>> FFV1L_1.f:20.6:
>>
>> P1(1) = 1 F1(6)
>> 1
>> Error: Unclassifiable statement at (1)
>> FFV1L_1.f:21.6:
>>
>> P1(2) = 1 F1(7)
>> 1
>> Error: Unclassifiable statement at (1)
>> FFV1L_1.f:22.6:
>>
>> P1(3) = 1 F1(8)
>> 1
>> Error: Unclassifiable statement at (1)
>> make[1]: *** [FFV1L_1.o] Error 1
>> make: *** [../lib/libdhe...

[Olivier Mattelaer (olivier-mattelaer)]

Hi Marco,

Ok all the test linked to ALOHA are fixed.
Three tests are still failing:

FAIL: test_representation
(tests.unit_tests.core.test_base_objects.ProcessDefinitionTest)
Test process object string representation.
----------------------------------------------------------------------
Traceback (most recent call last):
   File "/Users/omatt/Documents/Eclipse/merge_143_infks5/tests/
unit_tests/core/test_base_objects.py", line 1700, in test_representation
     self.assertEqual(goal, str(self.my_process_definition))
AssertionError: "{\n 'legs': [{\n 'ids': [3, 4, 5],\n
'state': False\n}, {\n 'ids': [3, 4, 5],\n 'state': False\n},
{\n 'ids': [3, 4, 5],\n 'state': True\n}, {\n 'ids': [3, 4,
5],\n 'state': True\n}, {\n 'ids': [3, 4, 5],\n 'state': True
\n}],\n 'orders': {'QED': 1, 'QCD': 5},\n 'overall_orders': {},
\n 'squared_orders': {},\n 'model': {\n 'name': '',\n
'particles': [{\n 'name': 'c',\n 'antiname': 'c~',\n 'spin':
1,\n 'color': 1,\n 'charge': 1.00,\n 'mass': 'zero',\n
'width': 'zero',\n 'pdg_code': 3,\n 'texname': 'none',\n
'antitexname': 'none',\n 'line': 'dashed',\n 'propagating': True,
\n 'is_part': True,\n 'self_antipart': False,\n
'counterterm': {}\n}],\n 'parameters': None,\n 'interactions':
[],\n 'couplings': None,\n 'lorentz': None\n},\n 'id':
3,\n 'required_s_channels': [],\n 'forbidden_onsh_s_channels':
[],\n 'forbidden_s_channels': [],\n 'forbidden_particles': [],
\n 'is_decay_chain': False,\n 'decay_chains': [],\n
'perturbation_couplings': [],\n 'has_born': True\n}" != "{\n
'legs': [{\n 'ids': [3, 4, 5],\n 'state': False\n}, {\n
'ids': [3, 4, 5],\n 'state': False\n}, {\n 'ids': [3, 4, 5],
\n 'state': True\n}, {\n 'ids': [3, 4, 5],\n 'state': True
\n}, {\n 'ids': [3, 4, 5],\n 'state': True\n}],\n 'orders':
{'QED': 1, 'QCD': 5},\n 'overall_orders': {},\n
'squared_orders': {},\n 'model': {\n 'name': '',\n
'particles': [{\n 'name': 'c',\n 'antiname': 'c~',\n 'spin':
1,\n 'color': 1,\n 'charge': 1.00,\n 'mass': 'zero',\n
'width': 'zero',\n 'pdg_code': 3,\n 'texname': 'none',\n
'antitexname': 'none',\n 'line': 'dashed',\n 'propagating': True,
\n 'is_part': True,\n 'self_antipart': False,\n
'counterterm': {}\n}],\n 'parameters': None,\n 'interactions':
[],\n 'couplings': None,\n 'lorentz': None\n},\n 'id':
3,\n 'required_s_channels': [],\n 'forbidden_s_channels': [],
\n 'forbidden_particles': [],\n 'is_decay_chain': False,\n
'decay_chains': [],\n 'perturbation_couplings': [],\n
'has_born': True\n}"

======================================================================
FAIL: test_representation
(tests.unit_tests.core.test_base_objects.ProcessTest)
Test process object string representation.
----------------------------------------------------------------------
Traceback (most recent call last):
   File "/Users/omatt/Documents/Eclipse/merge_143_infks5/tests/
unit_tests/core/test_base_objects.py", line 1...

[marco zaro (marco-zaro)]

fixed now

review: Approve

=== renamed file 'Template/Cards/delphes_trigger.dat' => 'Template/Cards/delphes_trigger_default.dat'
=== removed file 'Template/Source/banner.f'
--- Template/Source/banner.f	2010-10-30 03:26:37 +0000
+++ Template/Source/banner.f	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-      subroutine create_banner(lunw, swgt, nw)
-      implicit none
-c      include 'nexternal.inc'
-c
-c     parameters
-c
-      integer    MaxParticles
-      parameter (MaxParticles=15)
-c
-c     Arguments
-c
-      integer lunw,  nw
-      double precision swgt(99999)
-c
-c     Local
-c
-      integer ic(7,MaxParticles),next, luni
-      double precision P(0:3,MaxParticles),wgt
-      real*8 sum,mxwgt
-      logical done
-      integer i,imax,j, nevent, nfound
-      character*35 infile,outfile
-      integer iseed
-      data iseed/9999/
-      character*30 process,QED,QCD
-c--cuts
-c      double precision etmin(3:nexternal),etamax(3:nexternal)
-c      double precision                    r2min(3:nexternal,3:nexternal)
-c      double precision s_min(nexternal,nexternal)
-c      common/to_cuts/  etmin     ,etamax     , r2min, s_min
-c
-c     open the Process/input.dat
-c
-      luni = 67
-      infile='Process/input.dat'
-      i=0
-      done=.false.
-      do while (.not. done .and. i .lt. 5)
-c         write(*,*) 'Attempting to open file ',infile
-         open(unit=luni,file=infile,status='old',err=101)
-         done = .true.
- 101     i = i+1
-         infile='../' // infile         
-      enddo
-      if (done) then
-         read(luni,'(a30)') process
-         read(luni,'(a30)') QCD
-         read(luni,'(a30)') QED
-         close(luni)
-      else
-         process = '???? Process'
-         QCD     = '???? QCD'
-         QED     = '???? QED'
-      endif
-
-c      call get_seed(iseed)
-c
-c     All the info is gathered. Now start writing it out.
-c
-
-      call write_para(lunw)
-      write(lunw,'(a70)') '##                                                                    '
-      write(lunw,'(a70)') '##===================                                                 '
-      write(lunw,'(a70)') '## Run-time options                                                   '
-      write(lunw,'(a70)') '##===================                                                 '
-      write(lunw,'(a70)') '##                                                                    '
-      write(lunw,'(a70)') '##********************************************************************'     
-      write(lunw,'(a70)') '## Random Number seed                                                *'
-      write(lunw,'(a70)') '##********************************************************************'    
-      write(lunw,'(a3,i8,a)') '## ',iseed,'   = iseed'    
-c      write(lunw,'(a70)') '##********************************************************************'     
-c      write(lunw,'(a70)') '## Standard Cuts                                                     *'
-c      write(lunw,'(a70)') '##********************************************************************'    
-c      write(lunw,'(a13,8i8)')   '## Particle  ',(i,i=3,nexternal)
-c      write(lunw,'(a13,8f8.1)') '## Et       >',(etmin(i),i=3,nexternal)
-c      write(lunw,'(a13,8f8.1)') '## Eta      <',(etamax(i),i=3,nexternal)
-c      do j=3,nexternal-1
-c         write(lunw,'(a,i2,a,8f8.1)') '## d R #',j,'  >',(-0.0,i=3,j),
-c     &        (r2min(i,j),i=j+1,nexternal)
-c         do i=j+1,nexternal
-c            r2min(i,j)=r2min(i,j)**2 !Since r2 returns distance squared
-c         enddo
-c      enddo
-c      do j=1,nexternal-1
-c         write(lunw,'(a,i2,a,8f8.1)') '## s min #',j,'>',
-c     &        (s_min(i,j),i=3,nexternal)
-c      enddo
-c      write(lunw,'(a70)') '##********************************************************************'    
-c
-c     Now write out specific information on the event set
-c
-      done=.false.
-      nevent=0
-      nfound=0
-      sum=0d0
-      mxwgt=-1d0
-      do i=1,nw
-         sum=sum+swgt(i)
-         mxwgt = max(swgt(i),mxwgt)
-      enddo
-      nevent = nw
-      write(lunw,'(a70)') '##                                                                    '
-      write(lunw,'(a70)') '##===================                                                 '
-      write(lunw,'(a70)') '## Event information                                                  '
-      write(lunw,'(a70)') '##===================                                                 '
-      write(lunw,'(a70)') '##                                                                    '
-      write(lunw,'(a70)') '##********************************************************************'    
-      write(lunw,'(a12,a30)') '## Process: ',process                
-      write(lunw,'(a12,a30)') '## Max QCD: ',QCD
-      write(lunw,'(a12,a30)') '## Max QED: ',QED              
-      write(lunw,'(a70)') '##********************************************************************'    
-      write(lunw,'(a30,i10)')   '##  Number of Events       :  ',nevent
-      write(lunw,'(a30,e10.5)') '##  Integrated weight (pb) :  ',sum
-      write(lunw,'(a30,e10.5)') '##  Max wgt                :  ',mxwgt
-      write(lunw,'(a30,e10.5)') '##  Average wgt            :  ',sum/nevent
-      write(lunw,'(a70)') '##********************************************************************'    
-
-c      close(lunw)
-
-      end

=== modified file 'Template/Source/gen_ximprove.f'
--- Template/Source/gen_ximprove.f	2012-01-30 12:00:54 +0000
+++ Template/Source/gen_ximprove.f	2012-03-09 00:04:18 +0000
@@ -11,11 +11,10 @@
       parameter (rfile='results.dat')
       character*(*) symfile
       parameter (symfile='symfact.dat')
-      integer   max_amps
-      parameter (max_amps=9999)
 
       include 'run_config.inc'
       include 'maxparticles.inc'
+      include 'maxconfigs.inc'
 c
 c     global
 c
@@ -25,19 +24,19 @@
 c
 c     local
 c
-      double precision xsec(max_amps), xerr(max_amps)
-      double precision xerru(max_amps),xerrc(max_amps)
-      double precision xmax(max_amps), eff(max_amps)
-      double precision xlum(max_amps)
+      double precision xsec(lmaxconfigs), xerr(lmaxconfigs)
+      double precision xerru(lmaxconfigs),xerrc(lmaxconfigs)
+      double precision xmax(lmaxconfigs), eff(lmaxconfigs)
+      double precision xlum(lmaxconfigs)
       double precision ysec, yerr, yeff, ymax
       double precision tsec, terr, teff, tmax, xi
-      integer nw(max_amps), nevents(max_amps), maxit
-      integer nunwgt(max_amps)
-      character*80 fname, gname(max_amps)
+      integer nw(lmaxconfigs), nevents(lmaxconfigs), maxit
+      integer nunwgt(lmaxconfigs)
+      character*80 fname, gname(lmaxconfigs)
       integer i,j,k,l,n,ipp
       double precision xtot,errtot,err_goal
       double precision errtotu,errtotc
-      integer mfact(max_amps)
+      integer mfact(lmaxconfigs)
       logical parallel, gen_events
       character*20 param(maxpara),value(maxpara)
       integer npara, nreq, ngran, nhel_refine
@@ -225,8 +224,8 @@
 c     Constants
 c
       include 'run_config.inc'
-      integer   max_amps
-      parameter (max_amps=9999)
+      include 'maxconfigs.inc'
+
 c      integer    max_np
 c      parameter (max_np = 30)
 c
@@ -237,16 +236,16 @@
 c
 c     Arguments
 c
-      double precision xsec(max_amps), xerru(max_amps),xerrc(max_amps)
+      double precision xsec(lmaxconfigs), xerru(lmaxconfigs),xerrc(lmaxconfigs)
       double precision err_goal,xtot
-      integer mfact(max_amps),jpoints(max_amps),nhel_refine
+      integer mfact(lmaxconfigs),jpoints(lmaxconfigs),nhel_refine
       integer ng
-      character*(80) gn(max_amps)
+      character*(80) gn(lmaxconfigs)
 c
 c     Local
 c
-      integer i,j,k, io(max_amps), npoints, ip, np
-      double precision xt(max_amps),elimit
+      integer i,j,k, io(lmaxconfigs), npoints, ip, np
+      double precision xt(lmaxconfigs),elimit
       double precision yerr,ysec,rerr
       logical fopened
 c-----
@@ -474,8 +473,7 @@
 c     Constants
 c
       include 'run_config.inc'
-      integer   max_amps
-      parameter (max_amps=9999)
+      include 'maxconfigs.inc'
 c
 c     global
 c
@@ -487,16 +485,16 @@
 c
 c     Arguments
 c
-      double precision goal_lum, xlum(max_amps), xsec(max_amps),xtot
-      double precision xerr(max_amps)
-      integer jpoints(max_amps), mfact(max_amps)
+      double precision goal_lum, xlum(lmaxconfigs), xsec(lmaxconfigs),xtot
+      double precision xerr(lmaxconfigs)
+      integer jpoints(lmaxconfigs), mfact(lmaxconfigs)
       integer ng, np, nhel_refine
-      character*(80) gn(max_amps)
+      character*(80) gn(lmaxconfigs)
 c
 c     Local
 c
-      integer i,j,k,kk, io(max_amps), npoints, ip, nfiles,ifile,npfile
-      double precision xt(max_amps),elimit
+      integer i,j,k,kk, io(lmaxconfigs), npoints, ip, nfiles,ifile,npfile
+      double precision xt(lmaxconfigs+1),elimit
       double precision yerr,ysec,rerr
       logical fopened
       character*26 cjobs
@@ -738,8 +736,7 @@
 c     Constants
 c
       include 'run_config.inc'
-      integer   max_amps
-      parameter (max_amps=9999)
+      include 'maxconfigs.inc'
 c
 c   global
 c
@@ -748,16 +745,16 @@
 c
 c     Arguments
 c
-      double precision goal_lum, xlum(max_amps), xsec(max_amps),xtot
+      double precision goal_lum, xlum(lmaxconfigs), xsec(lmaxconfigs),xtot
       double precision ngran   !Granularity.... min # points from channel
-      integer jpoints(max_amps), mfact(max_amps)
+      integer jpoints(lmaxconfigs), mfact(lmaxconfigs)
       integer ng, np, nhel_refine
-      character*(80) gn(max_amps)
+      character*(80) gn(lmaxconfigs)
 c
 c     Local
 c
       integer i,j,k, npoints, ip
-      double precision xt(max_amps),elimit
+      double precision xt(lmaxconfigs),elimit
       double precision yerr,ysec,rerr
       character*72 fname
       logical fopened

=== modified file 'Template/Source/make_opts'
--- Template/Source/make_opts	2012-02-15 23:55:51 +0000
+++ Template/Source/make_opts	2012-03-09 00:04:18 +0000
@@ -8,7 +8,7 @@
 
 # Set FC unless it's defined by an environment variable
 ifeq ($(origin FC),default)
-  FC=g77
+  FC=gfortran
 endif
 
 # Options: dynamic, lhapdf

=== removed file 'Template/Source/maxconfigs.inc'
--- Template/Source/maxconfigs.inc	2011-04-03 22:11:58 +0000
+++ Template/Source/maxconfigs.inc	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-      integer    lmaxconfigs
-      parameter (lmaxconfigs=4000)       !Used for iforest

=== removed file 'Template/Source/maxparticles.inc'
--- Template/Source/maxparticles.inc	2011-04-16 05:25:14 +0000
+++ Template/Source/maxparticles.inc	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-      integer    max_particles
-      parameter (max_particles=10)

=== removed file 'Template/Source/sum.f'
--- Template/Source/sum.f	2010-10-30 03:26:37 +0000
+++ Template/Source/sum.f	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-      program sum
-c********************************************************************************
-c     Program to combine results from all of the different sub amplitudes 
-c     and given total
-c     cross section and error.
-c*****************************************************************************
-      implicit none
-c
-c     Constants
-c
-      character*(*) rfile
-      parameter (rfile='result')
-      character*(*) symfile
-      parameter (symfile='symfact.dat')
-      integer   max_amps
-      parameter (max_amps=999)
-c
-c     local
-c
-      double precision xsec(max_amps), xerr(max_amps)
-      character*80 fname
-      integer i,j
-      double precision xtot,errtot
-c-----
-c  Begin Code
-c-----
-      xtot=0d0
-      errtot=0d0
-      open(unit=15,file=symfile,status='old',err=999)
-      do while (.true.)
-         read(15,*,err=99) i,j
-         if (j .gt. 0) then
-            if (i .lt. 10) then
-               write(fname,'(a,i1,a,a)') 'G',i,'/',rfile
-c               write(*,*) fname
-            else if (i .lt. 100) then
-               write(fname,'(a,i2,a,a)') 'G',i,'/',rfile
-c               write(*,*) fname
-            else if (i .lt. 1000) then
-               write(fname,'(a,i3,a,a)') 'G',i,'/',rfile
-c               write(*,*) fname
-            endif
-            open(unit=25,file=fname,status='old',err=95)
-            read(25,*) xsec(i), xerr(i)
-            xtot = xtot+xsec(i)*j
-            errtot=errtot+j*xerr(i)**2
-            write(*,'(2i4,2e12.4)') i,j, xsec(i),xerr(i)
- 95         close(25)
-         endif
-      enddo
- 99   write(*,*) 'done',xtot,sqrt(errtot)
-      close(15)
-      stop
- 999  write(*,*) 'error'
-      end

=== removed file 'Template/Source/sum_html.f'
--- Template/Source/sum_html.f	2011-05-29 07:23:58 +0000
+++ Template/Source/sum_html.f	1970-01-01 00:00:00 +0000
@@ -1,775 +0,0 @@
-      program sum_html
-c*****************************************************************************
-c     Program to combine results from all of the different sub amplitudes 
-c     and given total  cross section and error.
-c*****************************************************************************
-      implicit none
-c
-c     Constants
-c
-      include 'maxparticles.inc'
-      character*(*) subfile
-      parameter (subfile='subproc.mg')
-      character*(*) symfile
-      parameter (symfile='symfact.dat')
-      character*(*) rfile
-      parameter (rfile='results.dat')
-      integer   max_amps      , max_iter
-      parameter (max_amps=9999, max_iter=50)      
-c
-c     local
-c
-      double precision xsec(max_amps), xerr(max_amps)
-      double precision xerru(max_amps),xerrc(max_amps)
-      double precision xmax(max_amps), eff(max_amps)
-      double precision xlum(max_amps), xlum_min
-      double precision ysec_iter(0:max_iter)
-      double precision yerr_iter(0:max_iter)
-      double precision tsec_iter(0:max_iter)
-      double precision terr_iter(0:max_iter)
-      double precision f(0:max_iter)
-      double precision ysec, yerr, yeff, ymax
-      double precision tsec, terr, teff, tmax
-      double precision tmean, tsig, chi2
-      integer nw(max_amps), nevents(max_amps), maxit
-      integer icor(max_amps)
-      integer nunwgt(max_amps)
-      integer minit
-      character*300 fname, pname
-      character*320 linkname(max_amps)
-      integer i,j,k,l
-      double precision xtot,errtot,err_goal, xi
-      double precision errtotc, errtotu
-      logical correlated
-      integer mfact(max_amps)
-      integer ntevents, ntw 
-      integer ilen
-      logical errex
-      integer ncode,npos
-      character*20 formstr
-
-      logical sumproc
-      common/to_sumproc/sumproc
-c-----
-c  Begin Code
-c-----
-      correlated = .true.
-      minit = max_iter
-      do i=0,max_iter
-         tsec_iter(i)=0d0
-         terr_iter(i)=0d0
-      enddo
-      sumproc = .true.
-      open(unit=15,file=symfile,status='old',err=10)
-      sumproc=.false.
- 10   if (sumproc) then
-         open(unit=15,file=subfile,status='old',err=999)
-      endif
-      errtot=0d0
-      errtotu=0d0     !uncorrelated errors
-      errtotc=0d0     !correlated errors
-      xtot = 0d0
-      xlum_min = 1d99
-      ntevents = 0
-      ntw = 0
-      i = 0
-c     ncode is number of digits needed for the bw coding
-      ncode=int(dlog10(3d0)*(max_particles-3))+1
-      do while (.true.)
-         if (sumproc) then
-            j = 1
-            read(15,*,err=99,end=99) pname
-            i=i+1
-            ilen = index(pname,' ')-1
-c            write(*,*) 'found ilen',ilen,pname
-            write(fname,'(a,a,a)') pname(1:ilen),'/',rfile
-            write(linkname(i),'(a,a,a)')pname(1:ilen),'/','results.html'
-c            write(*,*) i,'found ilen',ilen,fname(1:ilen+10)
-         else
-            read(15,*,err=99,end=99) xi,j
-            if (j .gt. 0) then
-            i=i+1
-            k = int(xi*(1+10**(-ncode)))
-            npos=int(dlog10(dble(k)))+1
-            if ( (xi-k) .eq. 0) then
-c              Write with correct number of digits
-               write(formstr,'(a,i1,a)') '(a,i',npos,',a,a)'
-               write(fname, formstr) 'G',k,'/',rfile
-               write(linkname(i),formstr) 'G',k,'/','log.txt'
-            else               !Handle B.W.
-c              Write with correct number of digits
-               write(formstr,'(a,i1,a,i1,a)') '(a,f',npos+ncode+1,
-     $                 '.',ncode,',a,a)'
-               write(fname, formstr) 'G',xi,'/',rfile
-               write(linkname(i),formstr) 'G',xi,'/','log.txt'
-            endif
-c            write(*,*) 'log name ',fname
-            endif
-         endif
-
-
-         if (j .gt. 0) then
-            nevents(i)=0d0
-            xsec(i)=0d0
-            xerr(i)=0d0
-            xerru(i)=0d0
-            xerrc(i)=0d0
-            nw(i)  =0d0
-            mfact(i)=j
-c
-c     Read in integration data from run
-c
-            open(unit=25,file=fname,status='old',err=95)
-            read(25,*) xsec(i),xerru(i),xerrc(i),nevents(i),nw(i)
-     $           ,maxit,nunwgt(i),xlum(i)
- 11         xerr(i) = sqrt(xerru(i)**2+xerrc(i)**2)
-            xlum(i)=xlum(i)/mfact(i)
-            ntevents=ntevents+nevents(i)
-            ntw=ntw+nw(i)
-c            maxit = min(maxit,2)
-            if (sumproc) then
-               write(*,'(a,e15.5)') pname(2:ilen), xsec(i)
-            else
-               write(*,*) fname,i,xsec(i),mfact(i)
-            endif
-            tmax = -1d0
-            terr = 0d0
-            teff = 0d0
-            tsec = 0d0
-            if (.true.) then
-               k = 0
-               ysec_iter(0) = xsec(i)
-               do while ( k .le. maxit .and. ysec_iter(k) .gt. 0)
-                  k=k+1
-                  read(25,*,err=92,end=92) l,ysec_iter(k),yerr_iter(k)
-c                  write(*,*) k,ysec_iter(k),yerr_iter(k)
-               enddo
- 92            maxit = k-1      !In case of error reading file
-               if (maxit .gt. 0) then
-c
-c          Check to see if we need to reduce the number of iterations
-c
-               if (maxit .lt. minit) then  !need to reset minit
-                  do k=1,minit-maxit       !and combine first iterations
-                     tsec_iter(1)=tsec_iter(1)+tsec_iter(k+1)
-                     terr_iter(1)=terr_iter(1)+terr_iter(k+1)
-                  enddo
-                  tsec_iter(1)=tsec_iter(1)/(minit-maxit+1)
-                  terr_iter(1)=terr_iter(1)/(minit-maxit+1)
-                  do k=2,maxit
-                     tsec_iter(k) = tsec_iter(k+maxit-1)
-                     terr_iter(k) = terr_iter(k+maxit-1)
-                     tsec_iter(k+maxit-1) = 0d0
-                     terr_iter(k+maxit-1) = 0d0
-c                     write(*,*) k+1,k+maxit
-                  enddo
-                  minit = maxit
-               endif
-c
-c          If this channel has more iterations, combine first few
-c          together into 1 
-c
-               if (maxit .gt. minit) then
-               do k=1,maxit-minit
-                  ysec_iter(1)=ysec_iter(1)+ysec_iter(k+1)
-                  yerr_iter(1)=sqrt(yerr_iter(1)**2+yerr_iter(k+1)**2)
-               enddo
-               ysec_iter(1)=ysec_iter(1)/(maxit-minit+1)
-               yerr_iter(1)=yerr_iter(1)/(maxit-minit+1)
-               do k=2,minit
-                  ysec_iter(k) = ysec_iter(k+minit-1)
-                  yerr_iter(k) = yerr_iter(k+minit-1)
-                  ysec_iter(k+minit-1) = 0d0
-                  yerr_iter(k+minit-1) = 0d0
-               enddo
-               endif
-c
-c              Now add these statistics to our totals for each iteration
-c
-               do k=1,minit
-                  tsec_iter(k)=tsec_iter(k)+ysec_iter(k)*mfact(i)
-                  terr_iter(k)=terr_iter(k)+(yerr_iter(k)*mfact(i))**2
-c                  write(*,*) k,ysec_iter(k),yerr_iter(k)
-               enddo
-               endif
-c               if (maxit .gt. 0) then
-c                  xsec(i)=tsec/maxit
-c                  xerr(i)=sqrt(terr)/maxit
-c               else
-c                  xsec(i)=0d0
-c                  xerr(i)=0d0
-c               endif
-            endif
-            if (xsec(i) .gt. 0d0) then
-               xlum_min = min(xlum(i),xlum_min)
-               xmax(i)=tmax/xsec(i)
-               eff(i)= xerr(i)*sqrt(real(nevents(i)))/xsec(i)
-            else
-               eff(i) = 0d0
-            endif
-            xtot = xtot+ xsec(i)*mfact(i)
-            errtot = errtot+(mfact(i)*xerr(i))**2
-c
-c     Combine error linearly if correlated, or in quadrature if not.
-c
-            errtotc = errtotc+xerrc(i)*mfact(i)
-            errtotu = errtotu + (mfact(i)*xerru(i))**2
-            write(*,*) i, sqrt(errtotu), errtotc
-
-            if (xsec(i) .eq. 0d0) xsec(i)=1d-99 
- 95         close(25)
-c            do k=1,minit
-c               write(*,*) i,k,tsec_iter(k),sqrt(terr_iter(k))
-c            enddo
-c            write(*,*) i,maxit,xsec(i), eff(i)
-         endif         
-      enddo
- 99   close(15)
-      errtot=sqrt(errtotu+errtotc**2)
-c      if (sumproc) then
-         open(unit=26,file=rfile,status='unknown')
-         write(26,'(3e12.5,2i9,i5,i9,e10.3)') xtot,sqrt(errtotu),
-     $        errtotc, ntw, minit,0,0,xlum_min
-         if (xtot .gt. 0) then
-            teff = sqrt(errtotc**2+errtotu**2)*sqrt(real(ntevents))/xtot
-         else
-            teff = 0d0
-         endif
-c         write(26,*) minit, xtot,errtot, ntevents, teff
-c         write(*,*) minit
-         tmean = 0d0
-         tsig  = 0d0
-         f(0)  = 0d0
-         do j=1,minit
-            f(j) = tsec_iter(j)**2/(terr_iter(j)+1d-99)
-c            f(j)=1
-            tmean = tmean + tsec_iter(j)*f(j)
-            tsig  = tsig + terr_iter(j)*f(j)
-            f(0)=f(0)+f(j)
-c            write(*,*) 'Iteration',j,tmean/f(0),sqrt(tsig)/f(0)
-         enddo
-         if (f(0).gt.0d0) then
-            tmean=tmean/f(0)
-            tsig = sqrt(tsig/f(0)/minit)
-         endif
-         chi2 = 0d0
-         do j=1,minit
-            chi2  = chi2+f(j)*minit*
-     &           (tsec_iter(j)-tmean)**2/(terr_iter(j)+1d-99)/(f(0)+1d-99)
-            write(26,*)j,tsec_iter(j),sqrt(terr_iter(j)),chi2/max(1,j-1)
-c            write(*,*) j,tsec_iter(j),sqrt(terr_iter(j)),chi2/max(1,j-1)
-         enddo
-         write(26,*) tmean,tsig,chi2/max((minit-1),1),
-     &        tsig*sqrt(real(ntevents))/(tmean+1d-99)
-         write(*,*) 'Results', xtot,errtot, ntevents, teff
-         close(26)
-c      endif
-      call write_html(xsec,xerr,eff,xmax,xtot,errtot,mfact,i,nevents,
-     $     nunwgt,linkname,xlum)
-      if(sumproc.and.xtot.eq.0d0)then
-        open(unit=26,file='../error',status='unknown',err=999)
-        write(*,'(a)') 'Cross section is 0, try loosening cuts'
-        write(26,'(a)') 'Cross section is 0, try loosening cuts'
-        close(26)
-        stop
-      else
-        inquire(file="../error",exist=errex)
-        if(errex) then
-          call system ('rm -f ../error')
-        endif
-      endif
-      stop
- 999  write(*,*) 'error'
-      end
-
-
-      subroutine write_html(xsec,xerr,eff,xmax,xtot,errtot,mfact,ng
-     $     ,nevents,nw,linkname,xlum)
-c*****************************************************************************
-c     Writes out HTML table of results for process
-c*****************************************************************************
-      implicit none
-c
-c     Constants
-c
-      character*(*) eventfile
-      parameter (eventfile='events.txt>')
-      character*(*) logfile
-      parameter (logfile='log.txt>')
-      character*(*) htmfile
-      parameter (htmfile='results.html')
-      integer   max_amps
-      parameter (max_amps=9999)
-c
-c     Arguments
-c
-      double precision xsec(max_amps), xerr(max_amps)
-      double precision xmax(max_amps), eff(max_amps),xlum(max_amps)
-      integer ng, nevents(max_amps),nw(max_amps)
-      double precision xtot,errtot
-      integer mfact(max_amps)
-      integer nsubproc          !Number of specific processes requested
-      logical found
-      integer ig
-      character*320 linkname(max_amps)
-      integer sname(256)
-      integer gname
-c
-c     Local
-c
-      integer i,j,k, io(max_amps), ik
-      integer ntot, ip,jp
-      character*300 procname
-      character*4 cpref
-      character*20 fnamel, fnamee
-      double precision scale,xt(max_amps), teff
-      double precision subtotal
-
-      logical sumproc
-      common/to_sumproc/sumproc
-
-c-----
-c  Begin Code
-c-----
-c
-c     Here we determine the appropriate units. Assuming the results 
-c     were written in picobarns
-c
-      if (xtot .ge. 1e4) then         !Use nano barns
-         scale=1e-3
-         cpref='(nb)'
-      elseif (xtot .ge. 1e1) then     !Use pico barns
-         scale=1e0
-         cpref='(pb)'
-      elseif (xtot .ge. 1e-2) then    !Use fempto
-         scale=1e+3
-         cpref='(fb)'
-      else                               !Use Attobarns
-         scale=1e+6
-         cpref='(ab)'
-      endif
-      ntot = 0
-      do j=1,ng
-         io(j) = j
-         ntot = ntot+nevents(j)
-         xt(j)=xsec(j)*mfact(j)                   !sort by xsec
-c         xt(j)= xerr(j)*mfact(j)                   !sort by error
-c         xt(j)=ng-j                               !sort by graph
-c         write(*,*) j,xt(j),xsec(j)
-      enddo
-c      write(*,*) 'Number of channels',ng
-      call sort2(xt,io,ng)
-
-      do i=1,ng
-         write(*,*) i,io(i),xsec(io(i)), nevents(j)
-      enddo
-
-      if (xtot .gt. 0d0) then
-         teff = errtot*sqrt(real(ntot))/xtot
-      else
-         teff = 0d0
-      endif
-cfax 12.04.2006
-c      procname='Set caption in file input.dat'
-      procname='Process results'
-      ip = 1
-      jp = 30
-      open(unit=15, file='input.dat', status='old',err=11)
-      read(15,'(a)',err=11,end=11) procname
- 11   close(15)
-      open(unit=15, file='dname.mg', status='old',err=12)
-      read(15,'(a)',err=12,end=12) procname
-cxx   tjs 3-20-2006
-c      ip = index(procname,'P')+1  !Strip off first P
-      ip = index(procname,'P')+1      !Strip off P
-      ip = ip+index(procname(ip:),'_') !Strip off process number
-      jp = ip+index(procname(ip:),' ')   !Strip off blanks
- 12   close(15)
-      open(unit=16,file=htmfile,status='unknown',err=999)      
-      write(16,50) '<head><title>'//procname(ip:jp)//'</title></head>'
-      write(16,50) '<body>'
-      if (.not. sumproc) then
-c         write(16,50) '<h2>Results for <a href=diagrams.html>'         
-c         write(16,50) procname(ip:jp)//'</a></h2>'
-         write(16,*) '<h2><a href=diagrams.html>'//
-     &        procname(ip:jp)// '</a> <BR>'
-         write(16,*) '<font face=symbol>s</font>='
-         write(16,'(f8.3,a,f8.3,a)')xtot*scale,
-     &        '<font face=symbol>&#177</font> ', errtot*scale,cpref
-         write(16,*) '</center></h2>'
-      else
-         write(16,*) '<h2>', procname(ip:jp)// " <BR>"
-         write(16,*) '<font face=symbol>s</font>='
-         write(16,'(f8.3,a,f8.3,a)') xtot*scale,
-     &        '<font face=symbol>&#177</font> ', errtot*scale,cpref
-         write(16,*) '</center></h2>'
-      endif
-c
-c     Now I want to write out information for each iteration 
-c     of the run
-c
-cfax 12-04-2006
-c      write(16,*) '<a href=results.dat> Iteration details </a>'
-c      if (sumproc) write(16,*) '<p> <a href=../Events/plots.html> Plots </a>'
-
-c      call gen_run_html(16)
-c
-c     Next we'll get information on the cuts. This requires linking to
-c     cuts.o and also coupsm.o
-c
-c      call gen_cut_html(16)
-
-
-      write(16,50) '<table border>'
-c      write(16,50) '<Caption> Caption Results'
-      write(16,49) '<tr><th>Graph</th>'
-      write(16,48) '<th>Cross Sect',cpref,'</th><th>Error',cpref,'</th>' 
-      write(16,49) '<th>Events (K)</th><th>Eff</th>'
-      write(16,50) '<th>Unwgt</th><th>Luminosity</th></tr>'
-
-      write(16,60) '<tr><th>Sum</th><th>',xtot*scale
-     $     ,'</th><th>',errtot*scale,'</th><th align=right>',
-     $     ntot/1000,'</th><th align=right>',teff,'</th></tr>'
-c
-c     Check number of requested processes
-c
-      if (sumproc) then
-         nsubproc=0
-         do i=1,ng
-            procname = linkname(io(i))(:300)
-            gname=0
-            read(procname(2:index(procname,'_')-1),*,err=20) gname
- 20         found = .false.
-            j = 0
-            do while(j < nsubproc .and. .not. found)
-               j=j+1
-               found = (gname .eq. sname(j))
-            enddo
-            if (.not. found) then
-               nsubproc=nsubproc+1
-               sname(nsubproc) = gname
-c               write(*,*) i,nsubproc, " " , sname(nsubproc)
-            endif
-         enddo
-cfax 12.05.2006
-c          nsubproc=nsubproc-1
-      else
-         nsubproc = 1
-      endif
-c
-c     Now loop through all the subprocesses
-c
-      subtotal=0d0
-
-      do ig = 1, nsubproc
-         if (nsubproc .gt. 1) then
-cfax If added 12.05.2006
-c          	  if(sname(ig).ne.0) then 
-                      write(16,*) '<tr> <td colspan="7" align="center"> Sub Group ',sname(ig), '</td></tr>'
-c                  endif
-         endif
-      do i=1,ng
-c         write(*,*) i,io(i),xsec(io(i))
-         if(sumproc)
-     $        read(linkname(io(i))(2:index(linkname(io(i)),'_')-1),*,err=30) gname
- 30      if ((.not. sumproc .and. xsec(io(i)) .ne. 0d0) .or.
-     $        (sumproc .and. gname .eq. sname(ig))) then
-c            write(*,*) ig," ",i," ",linkname(io(i))(:30)," ", sname(ig)
-c
-c     Create directory names using the linkname
-c
-c
-            ik = index(linkname(io(i)),'log.txt')-1
-            fnamel = linkname(io(i))(1:ik) // logfile
-            fnamee = linkname(io(i))(1:ik) // eventfile
-c            write(*,*) i,fnamel,fnamee
-            if (.not. sumproc) then
-
-c            write(16,65) '<tr><td align=right>',io(i),
-              write(16,65) '<tr><td align=right>',linkname(io(i))(1:ik-1),
-     $           ' </td><td align=right><a href='//linkname(io(i))//'>',
-     $           xsec(io(i))*mfact(io(i))*scale
-     $       ,'</a> </td><td align=right>',
-     $           xerr(io(i))*
-     $           mfact(io(i))*scale,'</td><td align=right>',
-     $           nevents(io(i))/1000,'</td><td align=right>',
-     $           eff(io(i)),'</td><td align=right>',
-     $           nw(io(i)),'</td><td align=right>',
-     $           xlum(io(i))/scale,'</td></tr>'
-c            write(*,*) io(i),xmax(io(i))
-            else
-                procname = linkname(io(i))(:300)
-cxx   tjs 3-20-2006  + cfax 12.05.2006
-c                ip = index(procname,'P')+2 !Strip off first P_
-                ip = index(procname,'P')+1 !Strip off first P
-                jp = ip+index(procname(ip:),'/')-2 !Strip off blanks
-c                write(*,*) 'Writing out ',sname(ig),"  ",procname(ip:jp)
-
-                if (xsec(io(i)) .ne. 0) then
-                subtotal = subtotal+xsec(io(i))*mfact(io(i))*scale
-                   write(16,66) '<tr><td align=right> <a href=P'
-     $               //procname(ip:jp)//'/diagrams.html >'
-     $               //'P'//procname(ip:jp),
-     $           ' </a></td><td align=right><a href='
-     $               //linkname(io(i))//'>',
-     $           xsec(io(i))*mfact(io(i))*scale
-     $       ,'</a> </td><td align=right>',
-     $           xerr(io(i))*
-     $           mfact(io(i))*scale,'</td><td align=right>',
-     $           nevents(io(i))/1000,'</td><td align=right>',
-     $           eff(io(i)),'</td><td align=right>',
-     $           nw(io(i)),'</td><td align=right>',
-     $           xlum(io(i))/scale,'</td></tr>'
-
-c                else
-c                   write(16,66) '<tr><td align=right> <a href=P_'
-c     $               //procname(ip:jp)//'/diagrams.html >'
-c     $               //procname(ip:jp),
-c     $           ' </a></td><td align=right><a href='
-c     $               //linkname(io(i))//'> </td></tr>'
-                endif
-            endif
-          else
-c             write(*,*) 'Skipping process',i
-         endif
-      enddo     !Loop over different groups
-      
-      if (nsubproc .gt. 1) then
-c          	  if(sname(ig).ne.0) then 
-                      if(subtotal .ne. 0e0) then 
-                         write(16,*) '<tr> <td colspan="7" align="center"> Sub Group total = ',subtotal, '</td></tr>'
-                         subtotal=0d0
-                      endif 
-c                  endif
-      endif
-
-      enddo
-      write(16,50) '</table></body>'
- 48   format(a,a,a,a)
- 49   format(a)
- 50   format( a)
- 60   format( a,f10.3,a,f10.3,a,i10,a,f8.1,a)
-c 65   format( a,i4,a,f10.3,a,f10.3,a,i10,a,f8.1,a,i10.0,a,f10.0,a)
- 65   format( a,a,a,f10.3,a,f10.3,a,i10,a,f8.1,a,i10.0,a,f10.2,a)
- 66   format( a,a,f10.3,a,f10.3,a,i10,a,f8.1,a,i10.0,a,f10.2,a)
-      write(*,*) 'Updated results in file ',htmfile
- 999  close(16)
-      end
-
-      subroutine sort2(array,aux1,n)
-      implicit none
-! Arguments
-      integer n
-      integer aux1(n)
-      double precision array(n)
-!  Local Variables
-      integer i,k
-      double precision temp
-      logical done
-
-!-----------
-! Begin Code
-!-----------
-      do i=n-1,1,-1
-         done = .true.
-         do k=1,i
-            if (array(k) .lt. array(k+1)) then
-               temp = array(k)
-               array(k) = array(k+1)
-               array(k+1) = temp
-               temp = aux1(k)
-               aux1(k) = aux1(k+1)
-               aux1(k+1) = temp
-               done = .false.
-            end if
-         end do
-         if (done) return
-      end do
-      end 
-
-      
-
-      subroutine gen_run_html(lun)
-c***************************************************************************
-c     Writes out run information in html format
-c
-c***************************************************************************
-      implicit none
-c
-c     Arguments
-c      
-      integer lun
-c
-c     local
-c
-c
-c     Global
-c            
-c-----
-c  Begin Code
-c-----
-      write(lun,*) 
-      end
-
-      subroutine gen_cut_html(lun)
-c***************************************************************************
-c     Writes out run information in html format
-c
-c***************************************************************************
-      implicit none
-c
-c     Parameters
-c
-c      include 'genps.inc'
-c
-c     Arguments
-c
-      integer lun
-c
-c     Local
-c
-      integer i,j
-      real stot
-c
-c     Global
-c
-
-c-----
-c  Begin Code
-c-----
-
-c      call read_cuts()
-c      call write_cuts()  !Writes cuts.dat in parent directory
-
-c
-c     Write out collider information table
-c
-c      stot = 2d0*sqrt(ebeam(1)*ebeam(2))
-c      write(lun,*) '<p> <TABLE> <table border=1>'
-c      write(lun,*) '<TD> <B> sqrt(s) </B> </TD>'
-c      write(lun,*) '<TD> <B> Beam 1 </B> </TD>'
-c      write(lun,*) '<TD> <B> Beam 2 </B> </TD>'
-
-c      write(lun,*) '</TR><TR><TD><B>',stot,' GeV </B></TD>'
-c      write(lun,*) '<TD> <B>',Ebeam(1),'  GeV </B></TD>'
-c      write(lun,*) '<TD> <B>',Ebeam(2),'  GeV </B></TD>'
-c      write(lun,*) '</TR> <TR>'
-c      write(lun,*) '<TD> </TD>'
-c      do i=1,2
-c         write(lun,*) '<TD> <center> <B>'
-c         if (lpp(i) .eq. 1) then
-c            write(lun,*) 'Proton'
-c         elseif(lpp(i) .eq. -1) then
-c            write(lun,*) 'Antiproton'
-c         else
-c            write(lun,*) 'No pdf'
-c         endif
-c         write(lun,*) '</B></center></TD>'
-c      enddo
-c      write(lun,*) '</TR></table>'
-
-
-
-c
-c     Now write out the cuts information table
-c
-c      if (.false.) then
-c      write(lun,*) '<p> <TABLE> <table border=1>'      
-c
-c     Header
-c
-c      write(lun,*) '<TR> <TD><B> Cuts </B> </TD>'
-c      do i=3,nexternal
-c         write(lun,*) '<TD> <B> <center>',i
-c         write(lun,*) '</center> </B> </TD>'
-c      enddo
-c
-c     PT
-c
-c      write(lun,*) '<TR> <TD><B> Et > </B> </TD>'
-c      do i=3,nexternal
-c         write(lun,'(a,f6.0)') '<TD> <B> <right>',etmin(i)
-c         write(lun,*) '</right> </B> </TD>'
-c      enddo
-c
-c     Rapidity
-c
-c      write(lun,*) '<TR> <TD><B> eta <  </B> </TD>'
-c      do i=3,nexternal
-c         write(lun,'(a,f6.0)') '<TD> <B> <right>',etamax(i)
-c         write(lun,*) '</right> </B> </TD>'
-c      enddo
-c
-c     Delta R
-c
-c      do j=4,nexternal
-c         write(lun,*) '<TR> <TD><B> Delta R',j, ' </B> </TD>'
-c         do i=3,nexternal
-c            if ( i .lt. j) then
-c               write(lun,'(a,f6.1)') '<TD> <B> <right>',r2min(j,i)
-c            else
-c               write(lun,'(a)') '<TD> <B> <right>'
-c            endif
-c            write(lun,*) '</right> </B> </TD>'
-c         enddo
-c         write(lun,*) '</TR>'
-c      enddo
-c      write(lun,*) '</table>'
-c      write(lun,*) '<p>'
-c      endif
-
-c
-c     Now write out the cuts information table
-c
-c      write(lun,*) '<p> <TABLE> <table border=1>'      
-c
-c     Header
-c
-c      write(lun,*) '<TD><B> Particle </B> </TD>'
-c      write(lun,*) '<TD><B> Et > </B> </TD>'
-c      write(lun,*) '<TD><B> eta < </B> </TD>'
-c      do i=3,nexternal-1
-c         write(lun,*) '<TD> <B> <center>Delta R',i
-c         write(lun,*) '</center> </B> </TD>'
-c      enddo
-c      write(lun,*) '</TR>'
-c
-c     PT
-c
-c      write(lun,*) '<TR> <TD><B> Et > </B> </TD>'
-c      do i=3,nexternal
-c         write(lun,'(a,i3)') '<TR><TD> <B> <center>',i
-c         write(lun,*) '</center> </B> </TD>'
-c         write(lun,'(a,f6.0)') '<TD> <B> <right>',etmin(i)
-c         write(lun,*) '</right> </B> </TD>'
-c         write(lun,'(a,f6.1)') '<TD> <B> <right>',etamax(i)
-c         write(lun,*) '</right> </B> </TD>'
-
-c         do j=3,nexternal-1
-c            if ( i .gt. j) then
-c               write(lun,'(a,f6.1)') '<TD> <B> <right>',r2min(i,j)
-c            else
-c               write(lun,'(a)') '<TD> <B> <right>'
-c            endif
-c            write(lun,*) '</right> </B> </TD>'
-c         enddo
-c         write(lun,*) '</TR>'
-
-c      enddo
-c
-c     Rapidity
-c
-c      write(lun,*) '<TR> <TD><B> eta <  </B> </TD>'
-c      do i=3,nexternal
-c      enddo
-c
-c     Delta R
-c
-
-c      write(lun,*) '</table>'
-c      write(lun,*) '<p>'
-      end
-
-
-
-

=== modified file 'Template/SubProcesses/setcuts.f'
--- Template/SubProcesses/setcuts.f	2011-10-02 12:06:10 +0000
+++ Template/SubProcesses/setcuts.f	2012-03-09 00:04:18 +0000
@@ -112,22 +112,28 @@
 c     set ptj and s_min if xqcut and ktscheme = 1, to improve
 c     integration speed, and set drjj and drjl to 0.
 c
-        if(xqcut.gt.0.and.ktscheme.eq.1) then
-          if(auto_ptj_mjj.and.ptj.ge.0d0.and.ptj.lt.xqcut)then
+        if(xqcut.gt.0) then
+           if(auto_ptj_mjj.and.ptj.ge.0d0.and.ktscheme.eq.1)then
             ptj=xqcut
             write(*,*) 'Warning! ptj set to xqcut=',xqcut,
      $            ' to improve integration efficiency'
             write(*,*) 'Note that this might affect non-radiated jets,'
             write(*,*) 'e.g. from decays. Use cut_decays=F in run_card.'
+          else if(ptj.gt.xqcut)then
+            ptj=0d0
+            write(*,*) 'Warning! ptj set to 0 since xqcut > 0 and'
+            write(*,*) '         auto_ptj_mjj = F or ktscheme > 1'
           endif
-        endif
-        if(xqcut.gt.0) then
-          if(auto_ptj_mjj.and.mmjj.ge.0d0.and.mmjj.lt.xqcut)then
+          if(auto_ptj_mjj.and.mmjj.ge.0d0)then
             mmjj=xqcut
             write(*,*) 'Warning! mmjj set to xqcut=',xqcut,
      $            ' to improve integration efficiency'
             write(*,*) 'Note that this might affect non-radiated jets,'
             write(*,*) 'e.g. from decays. Use cut_decays=F in run_card.'
+          else if(mmjj.gt.xqcut)then
+            mmjj=0d0
+            write(*,*) 'Warning! mmjj set to 0 since xqcut > 0 and'
+            write(*,*) '         auto_ptj_mjj = F'
           endif
           if(drjj.gt.0d0) then
             write(*,*) 'Warning! drjj > 0 with xqcut > 0, set to 0'

=== modified file 'Template/bin/generate_events'
--- Template/bin/generate_events	2011-12-14 21:52:20 +0000
+++ Template/bin/generate_events	2012-03-09 00:04:18 +0000
@@ -28,7 +28,7 @@
 sys.path.append(pjoin(root_path,'bin','internal'))
 import madevent_interface as ME        
 
-if not (sys.version_info[0] == 2 or sys.version_info[1] > 5):
+if not sys.version_info[0] == 2 or sys.version_info[1] < 6:
     sys.exit('MadEvent works with python 2.6 or higher (but not python 3.X).\n\
                Please upgrade your version of python.')
 
@@ -67,20 +67,17 @@
         except:
             name = raw_input('enter run name\n')
 
-    launch = ME.MadEventCmd(me_dir=root_path)
+#    launch = ME.MadEventCmd(me_dir=root_path)
         
 
     if mode == 1:
-        launch.run_cmd('generate_events -f %s --cluster'
-                   %(name))            
-    elif mode ==2:
-        launch.run_cmd('generate_events -f %s --multicore --nb_core=%s'
-                   %(name, opt)) 
+        argument = ['fake','-f', str(name), '--cluster']
+    elif mode == 2:
+        argument = ['fake','-f', '--multicore', str(name), '--nb_core=%s' % opt]
     else:
-        launch.run_cmd('generate_events -f %s' % name)
-    
-    launch.run_cmd('quit')    
+        argument = ['fake','-f', name]
 
+    return argument
 
 
 
@@ -100,13 +97,18 @@
         if '-h' in argument or '--help' in argument:
             launch = ME.MadEventCmd(me_dir=root_path)
             launch.exec_cmd('help generate_events')
+            sys.exit()
         elif len(argument) > 1 and argument[1] in ['0', '1', '2']:
-            treat_old_argument(argument)
-        else:
-            open('/tmp/mg5tmp.cmd','w').write('generate_events %s' % ' '.join(argument[1:]))
-            os.system('%s/madevent /tmp/mg5tmp.cmd' % pjoin(root_path, 'bin'))
+            argument = treat_old_argument(argument)
+        
+        launch = ME.MadEventCmd(me_dir=root_path)
+        launch.run_cmd('generate_events %s' % ' '.join(argument[1:]))
+        launch.run_cmd('quit')
     except KeyboardInterrupt:
-        pass
+        try:
+            launch.run_cmd('quit')
+        except:
+            pass
     except ME.MadEventAlreadyRunning, error:
         logging.error(str(error))
         sys.exit()

=== modified file 'Template/bin/internal/compile_Source'
--- Template/bin/internal/compile_Source	2011-07-19 11:03:51 +0000
+++ Template/bin/internal/compile_Source	2012-03-09 00:04:18 +0000
@@ -14,7 +14,7 @@
 
 if [[ -d Source ]]; then
     cd Source
-    for i in ../bin/internal/sum_html ../bin/internal/gen_ximprove all ../bin/internal/combine_events ../bin/internal/combine_runs ../bin/internal/sumall; do
+    for i in ../bin/internal/gen_ximprove all ../bin/internal/combine_events ../bin/internal/combine_runs; do
 	make $i > /dev/null
 	if [[ $? -ne 0 ]];then
 	    # Make didn't exit successfully

=== modified file 'Template/bin/internal/gen_jpeg-pl'
--- Template/bin/internal/gen_jpeg-pl	2011-06-29 14:15:21 +0000
+++ Template/bin/internal/gen_jpeg-pl	2012-03-09 00:04:18 +0000
@@ -72,7 +72,7 @@
 
     system ("/bin/bash -c \"cat matrix$imatrix.ps | sed 1,352d >> junk.ps\" ");
 
-    system "/bin/bash -c \"nice gs  \-sDEVICE\=jpeg \-sOutputFile\=card.jpg \-q \-dNOPAUSE \-dBATCH \-g180x150 junk.ps; rm -f junk.ps; cp -p card.jpg ../../card.jpg\" ";
+    system "/bin/bash -c \"nice gs  \-sDEVICE\=jpeg \-sOutputFile\=card.jpg \-q \-dNOPAUSE \-dBATCH \-g180x150 ./junk.ps; rm -f junk.ps; cp -p card.jpg ../../card.jpg\" ";
   }
   if ($imatrix eq "") {$imatrix = 0;}
   $imatrix = $imatrix + 1;

=== removed file 'Template/bin/internal/sumall'
--- Template/bin/internal/sumall	2011-07-12 16:33:50 +0000
+++ Template/bin/internal/sumall	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-#!/bin/bash
-#  
-#   First we need to get into the main directory
-#
-if [[  ! -d ./bin  ]]; then
-    cd ../
-    if [[ ! -d ./bin ]]; then
-	echo "Error: sumall must be executed from the main, or bin directory"
-	exit
-    fi
-fi
-if [[ ! -d Source ]]; then
-    echo "Error: Source directory not found"
-    exit
-fi
-cd ./Source
-make ../bin/internal/sum_html >& /dev/null
-cd ..
-if [[ ! -d SubProcesses ]]; then
-    echo "Error: SubProcesses directory not found"
-    exit
-fi
-cd SubProcesses
-for i in `cat subproc.mg` ; do
-cd $i
-../../bin/internal/sum_html >/dev/null
-cd ..
-done
-../bin/internal/sum_html

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2012-02-16 19:13:36 +0000
+++ UpdateNotes.txt	2012-03-09 00:04:18 +0000
@@ -1,44 +1,81 @@
 Update notes for MadGraph 5 (in reverse time order)
 
-1.4.2 (16/02/12)  JA: Ensure that matching works properly with > 9 final state
+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
+                      is in general not gauge-invariant. It is in general
+                      better to use the $ notation, forbidding only onshell
+                      s-channel particles (the inverse of decay chains).
+                  JA: Automatically ensure that ptj and mmjj are below xqcut
+                      when xqcut > 0, since ptj or mmjj > xqcut ruins matching.
+                  OM: Add LSF to the list of supported cluster (thanks to Alexis).
+                  OM: change the param_card reader for the restrict file.
+                      This allow to restrict model with 3 lha id (or more)
+                      (thanks to Eduardo Ponton).
+                  OM: forbids to run 'generate events' with python 2.4.
+                  OM: Include the configuration file in the .tar.gz created on 
+                      the web (thanks to Simon) .
+                  OM: Fix a Mac specific problem for edition of Delphes card.
+                      (thanks to Sho Iwamoto).
+                  OM: ALOHA modifications:
+                       - Change sign convention for Epsilon (matching FR choices)
+                       - For Fermion vertex forces that _1 always returns the  
+                         incoming fermion and _2 returns the outcoming fermion. 
+                         (This modifies conjugate routine output)
+                       - Change the order of argument for conjugate routine
+                         to expect IO order of fermion in all cases.
+                       Note that the two last modifications matches MG5 conventions
+                       and that those modifications correct bugs for interactions
+                       a) subject to conjugate routine (i.e. if the model has 
+                          majorana)                       
+                       b) containing fermion momentum dependencies in the Lorentz
+                          structure  
+                       All model included by default in MG5 (in particular sm/mssm)
+                       were not affected by those mismatch of conventions.
+                       (Thanks to Benjamin fuks) 
+                  OM: make acceptance test more silent.  
+                  OM: return the correct error message when a compilation occur. 
+                  OM: some code re-factoring.
+
+1.4.2 (16/02/12) JA: Ensure that matching works properly with > 9 final state
                       particles (by increasing a buffer size in event output)
-		  OM: add a command "import banner" in order to run a full run
-		      from a given banner.
-                  OM: Fix the Bug #921487, fixing a problem with home made model
+                 OM: add a command "import banner" in order to run a full run
+                      from a given banner.
+                 OM: Fix the Bug #921487, fixing a problem with home made model
                       In the definition of Particle/Anti-Particle. (Thanks Ben)
-		  OM: Fix a formatting problem in me5_configuration.txt 
+                 OM: Fix a formatting problem in me5_configuration.txt 
                       (Bug #930101) Thanks to Arian
-		  OM: allow to run ./bin/mg5 BANNER_PATH and
+                 OM: allow to run ./bin/mg5 BANNER_PATH and
                       ./bin/mg5 PROC_CARD_V4_PATH
-		  OM: Various small fixes concerning the stability of the html 
-		      output.
-		  OM: Changes the server to download td since cp3wks05 has an 
-		      harddisk failures.
+                 OM: Various small fixes concerning the stability of the html 
+                      output.
+                 OM: Changes the server to download td since cp3wks05 has an 
+                      harddisk failures.
 
-1.4.1 (06/02/12)  OM: Fix the fermion flow check which was wrongly failing on 
+1.4.1 (06/02/12) OM: Fix the fermion flow check which was wrongly failing on 
                       some model  (Thanks to Benjamin)
-                  OM: Improve run organization efficiency (which speeds up the 
-		      code on cluster) (Thanks to Johan)
-                  OM: More secure html output (Thanks to Simon)
+                 OM: Improve run organization efficiency (which speeds up the 
+                      code on cluster) (Thanks to Johan)
+                 OM: More secure html output (Thanks to Simon)
 
-1.4.0 (04/02/12): OM: New user interface for the madevent run. Type:
+1.4.0 (04/02/12) OM: New user interface for the madevent run. Type:
                       1) (from madevent output) ./bin/madevent
                       2) (from MG5 command line) launch [MADEVENT_PATH] -i
                       This interface replaces various script like refine, 
                       survey, combine, run_..., rm_run, ...
                       The script generate_events still exists but now calls
                        ./bin/madevent. 
-                  OM: For MSSM model, convert param_card to SLAH1. This card is
+                 OM: For MSSM model, convert param_card to SLAH1. This card is
                       converted to SLAH2 during the MadEvent run since the UFO 
                       model uses SLAH2. This allows to use Pythia 6,
                       as well as having a coherent definition for the flavor.
-                  JA+OM: For decay width computations, the launch command in 
+                 JA+OM: For decay width computations, the launch command in 
                       addition to compute the width, creates a new param_card 
                       with the width set to the associated values, and with the 
                       Branching ratio associated (usefull for pythia). 
-                  NOTE: This param_card makes sense for future run ONLY if all 
+                 NOTE: This param_card makes sense for future run ONLY if all 
                       relevant decay are generated.
-                  EXAMPLE: (after launch bin/mg5):
+                 EXAMPLE: (after launch bin/mg5):
                        import model sm-full
                        generate t > b w+
                        define all = p b b~ l+ l- ta+ ta- vl vl~
@@ -49,41 +86,42 @@
                        add process h > v v, v > all all
                        output
                        launch
-                  OM: change output pythia8 syntax: If a path is specified this 
+                 OM: change output pythia8 syntax: If a path is specified this 
                       is considered as the output directory.
-                  OM: Change the path of the madevent output files. This allows 
+                 OM: Change the path of the madevent output files. This allows 
                       to run pythia/pgs/delphes mulitple times for the same set 
                       of events (with different pythia/... parameters).
-                  OM: Madevent output is now insensitive to the relative path
+                 OM: Madevent output is now insensitive to the relative path
                       to pythia-pgs, delphes, ... In consequence you don't need
-		      anymore to have your directory at the same level as Template directory. 
-                  OM: MadEvent checks that the param_card is coherent with the 
+                      anymore to have your directory at the same level as 
+                      Template directory. 
+                 OM: MadEvent checks that the param_card is coherent with the 
                       restriction used during the model generation. 
-                  OM: Model restrictions will now also force opposite number to 
+                 OM: Model restrictions will now also force opposite number to 
                       match (helpfull for constraining to rotation matrix).  
-                  OM: Change the import command. It's now allowed to omit the 
+                 OM: Change the import command. It's now allowed to omit the 
                       type of import. The type is guessed automaticaly. 
                       This is NOT allowed on the web.
-                  OM: Add a check that the fermion flow is coherent with the 
+                 OM: Add a check that the fermion flow is coherent with the 
                       Lorentz structure associates to the vertex.
-                  OM: Add a check that the color representation is coherent. 
+                 OM: Add a check that the color representation is coherent. 
                       This allow to detect/fix various problem linked
                       to some new models created by FR and SARAH.
-                  OM: Change the default fortran compiler to gfortran.
-                  OM: Add the possibility to force which fortran compiler will
+                 OM: Change the default fortran compiler to gfortran.
+                 OM: Add the possibility to force which fortran compiler will
                       be used, either via the configuration file or via the set 
                       command.
-                  OM: Add the possibility to bypass the automatic opening of 
+                 OM: Add the possibility to bypass the automatic opening of 
                       the web browser (via the configuration file: 
                       ./input/mg5_configuration.txt )
-                  OM: add 'save options' command to save the current configuration 
-		      in the configuration file. 
-                  OM: Change the scheme of questions when running madevent and 
+                 OM: add 'save options' command to save the current configuration 
+                      in the configuration file. 
+                 OM: Change the scheme of questions when running madevent and 
                       allow to specify in the command interface if you
                       want to run pythia/pgs/...
                       Allow to put the answers to the questions in the 
                       proc_card.dat.
-                  OM: Add options for the display command:
+                 OM: Add options for the display command:
                       a) display options: return the current option value. 
                         i.e. those set via the set command and/or via the 
                         configuration file
@@ -94,29 +132,29 @@
                       d) display couplings now returns the list of all couplings
                         with the associated expression
                       e) display interactions [PART1] [PART2] [PART3] ...
-		         display all interactions containing the particles set
+                         display all interactions containing the particles set
                          in arguments 
-                  OM: New Python script for the creation of the various html pages.
+                 OM: New Python script for the creation of the various html pages.
                       This Requires less disk access for the generation of the files.
-                  OM: Modify error treatment, especially for Invalid commands
+                 OM: Modify error treatment, especially for Invalid commands
                       and Configuration problems.
-                  JA: Ensure that we get zero cross section if we have
+                 JA: Ensure that we get zero cross section if we have
                       non-parton initial states with proton/antiproton beams
-                  OM: Improve cluster support. MadEvent now supports PBS/Condor/SGE
+                 OM: Improve cluster support. MadEvent now supports PBS/Condor/SGE
                       Thanks to Arian Abrahantes for the SGE implementation.
-		  OM: Improve auto-completion (better output/dealing with multi line/...)
-                  OM: Improve the parallel suite and change the release script to run
+                 OM: Improve auto-completion (better output/dealing with multi line/...)
+                 OM: Improve the parallel suite and change the release script to run
                       some of the parallel tests. This ensures even higher stability 
                       of the  code for the future releases.
-                  JA: Changed the way gridpacks work: Set granularity to 1
+                 JA: Changed the way gridpacks work: Set granularity to 1
                       (so randomly select channels only if they should generate 
                       less than 1 event), but allowing channels to run down to a single
                       iteration. This removes all old problems with increased
                       variance for small channels in the gridpacks, while giving 
                       even faster event generation.
 
-                  Thanks to Johan Alwall, Sho Iwamoto for all the important 
-                  testing/bug reports.
+                 Thanks to Johan Alwall, Sho Iwamoto for all the important 
+                 testing/bug reports.
 
 
 1.3.33 (01/01/12) JA: Revisited colors for propagators in addmothers.f

=== modified file 'aloha/aloha_object.py'
--- aloha/aloha_object.py	2012-01-09 09:34:39 +0000
+++ aloha/aloha_object.py	2012-03-09 00:04:18 +0000
@@ -551,7 +551,7 @@
         
         i1 , i2, i3, i4 = perm
         #formula found on wikipedia
-        return ((i2-i1) * (i3-i1) *(i4-i1) * (i3-i2) * (i4-i2) *(i4-i3))/12 
+        return -1 * ((i2-i1) * (i3-i1) *(i4-i1) * (i3-i2) * (i4-i2) *(i4-i3))/12 
    
     # DEFINE THE REPRESENTATION OF EPSILON
            

=== modified file 'aloha/aloha_writers.py'
--- aloha/aloha_writers.py	2012-01-31 16:28:22 +0000
+++ aloha/aloha_writers.py	2012-03-09 00:04:18 +0000
@@ -17,6 +17,7 @@
     type_to_variable = {2:'F',3:'V',5:'T',1:'S'}
     type_to_size = {'S':3, 'T':18, 'V':6, 'F':6}
     
+            
     def __init__(self, abstract_routine, dirpath):
 
 
@@ -34,10 +35,20 @@
         self.namestring = name
         self.abstractname = abstract_routine.name
         self.comment = abstract_routine.infostr
-        self.offshell = abstract_routine.outgoing 
+        self.offshell = abstract_routine.outgoing
+         
         self.symmetries = abstract_routine.symmetries
         self.tag = abstract_routine.tag
 
+        self.outgoing = self.offshell
+        if 'C%s' %((self.outgoing + 1) // 2) in self.tag:
+            #flip the outgoing tag if in conjugate
+            self.outgoing = self.outgoing + self.outgoing % 2 - (self.outgoing +1) % 2
+            
+
+
+
+
         #prepare the necessary object
         self.collect_variables() # Look for the different variables
         self.make_all_lists()    # Compute the expression for the call ordering
@@ -59,8 +70,8 @@
         elif len(indices) == 2: 
             return  4 * indices[0] + indices[1] + start 
         else:
-            raise Exception, 'WRONG CONTRACTION OF LORENTZ OBJECT for routine %s' \
-                    % self.namestring                                 
+            raise Exception, 'WRONG CONTRACTION OF LORENTZ OBJECT for routine %s: %s' \
+                    % (self.namestring, indices)                                 
                                  
     def collect_variables(self):
         """Collects Momenta,Mass,Width into lists"""
@@ -100,7 +111,7 @@
         
     def write_obj(self, obj):
         """Calls the appropriate writing routine"""
-
+        
         try:
             vartype = obj.vartype
         except:
@@ -173,11 +184,22 @@
             outgoing = self.offshell
 
         call_arg = [] #incoming argument of the routine
+
+        conjugate = [2*(int(c[1:])-1) for c in self.tag if c[0] == 'C']
         
-
-        call_arg = ['%s%d' % (spin, index +1) 
-                                 for index,spin in enumerate(self.particles)
-                                 if outgoing != index +1]
+        for index,spin in enumerate(self.particles):
+            if self.offshell == index + 1:
+                continue
+            
+            if index in conjugate:
+                index2, spin2 = index+1, self.particles[index+1]
+                call_arg.append('%s%d' % (spin2, index2 +1)) 
+                #call_arg.append('%s%d' % (spin, index +1)) 
+            elif index-1 in conjugate:
+                index2, spin2 = index-1, self.particles[index-1]
+                call_arg.append('%s%d' % (spin2, index2 +1)) 
+            else:
+                call_arg.append('%s%d' % (spin, index +1)) 
                 
         return call_arg
 
@@ -213,6 +235,15 @@
         else:
             global_sign = -1
         
+        flipped = [2*(int(c[1:])-1) for c in self.tag if c.startswith('C')]
+#        if self.offshell % 2:
+#             not_flip = self.offshell - 1
+#             if not_flip in flipped:
+#                 flipped.remove(not_flip)
+#        else:
+#             not_flip = self.offshell - 2
+#             if not_flip in flipped:
+#                 flipped.remove(not_flip)           
         
         for index, spin in enumerate(self.particles): 
             assert(spin in ['S','F','V','T'])  
@@ -223,12 +254,15 @@
             elif nb_fermion % 2 == 0:
                 sign = global_sign
                 nb_fermion += 1
+                if index in flipped:
+                    sign *= -1
             else: 
                 sign = -1 * global_sign
                 nb_fermion += 1
-            
+                if index-1 in flipped:
+                    sign *= -1
             # No need to include the outgoing particles in the definitions
-            if index == self.offshell -1:
+            if index == self.outgoing -1:
                 continue 
             
             # write the
@@ -245,6 +279,8 @@
         """ make the list of declaration nedded by the header """
         
         declare_list = []
+        
+        
         for index, spin in enumerate(self.particles):
             # First define the size of the associate Object 
             declare_list.append(self.declare_dict[spin] % (index + 1) ) 
@@ -294,11 +330,11 @@
             if not alredy_update:
                 declare_list.append('double complex denom')
                 declare_list.append('double precision M%(id)d, W%(id)d' % 
-                                                          {'id': self.offshell})
+                                                          {'id': self.outgoing})
             call_arg = '%(args)s, COUP, M%(id)d, W%(id)d, %(spin)s%(id)d' % \
                     {'args': ', '.join(CallList), 
                      'spin': self.particles[self.offshell -1],
-                     'id': self.offshell}
+                     'id': self.outgoing}
             str_out = ' subroutine %s(%s)\n' % (name, call_arg) 
 
         # Forcing implicit None
@@ -345,7 +381,7 @@
             offshell_size = self.type_to_size[offshelltype]            
             #Implement the conservation of Energy Impulsion
             for i in range(-1,1):
-                str_out += '%s%d(%d)= ' % (offshelltype, self.offshell, \
+                str_out += '%s%d(%d)= ' % (offshelltype, self.outgoing, \
                                                               offshell_size + i)
                 
                 pat=re.compile(r'^[-+]?(?P<spin>\w)')
@@ -360,9 +396,23 @@
             index = int(mom[1:])
             type = self.particles[index - 1]
             energy_pos = self.type_to_size[type] -1
-            sign = ''
+            sign = 1
             if self.offshell == index and type in ['V','S']:
+                sign = -1
+            if 'C%s' % ((index +1) // 2)  in self.tag: 
+                if index == self.outgoing:
+                    pass
+                elif index % 2 and index -1 != self.outgoing:
+                    pass
+                elif index % 2 == 1 and index + 1  != self.outgoing:
+                    pass
+                else:
+                    sign *= -1
+            
+            if sign == -1 :
                 sign = '-'
+            else:
+                sign = ''
                             
             str_out += '%s(0) = %s dble(%s%d(%d))\n' % (mom, sign, type, index, energy_pos)
             str_out += '%s(1) = %s dble(%s%d(%d))\n' % (mom, sign, type, index, energy_pos + 1)
@@ -424,7 +474,7 @@
                 OutString = OutString + string + '\n'
         else:
             OffShellParticle = '%s%d' % (self.particles[self.offshell-1],\
-                                                                  self.offshell)
+                                                                  self.outgoing)
             numerator = self.obj.numerator
             denominator = self.obj.denominator
             for ind in denominator.listindices():
@@ -537,11 +587,11 @@
         else:
             main = '%(spin)s%(id)d' % \
                           {'spin': self.particles[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
@@ -683,8 +733,8 @@
             str_out = 'void %(name)s(%(args)s, double M%(number)d, double W%(number)d, complex<double>%(out)s%(number)d[])' % \
               {'name': name,
                'args': ','.join(CallList+ ['complex<double> COUP']),
-               'out': self.particles[OffShellParticle],
-               'number': OffShellParticle + 1 
+               'out': self.particles[self.outgoing - 1],
+               'number': self.outgoing 
                }
 
         h_string = str_out + ";\n\n"
@@ -715,7 +765,7 @@
             offshell_size = self.type_to_size[offshelltype]            
             #Implement the conservation of Energy Impulsion
             for i in range(-2,0):
-                str_out += '%s%d[%d]= ' % (offshelltype, self.offshell,
+                str_out += '%s%d[%d]= ' % (offshelltype, self.outgoing,
                                            offshell_size + i)
                 
                 pat=re.compile(r'^[-+]?(?P<spin>\w)')
@@ -731,9 +781,23 @@
             
             type = self.particles[index - 1]
             energy_pos = self.type_to_size[type] - 2
-            sign = ''
+            sign = 1
             if self.offshell == index and type in ['V', 'S']:
+                sign = -1
+            if 'C%s' % ((index +1) // 2)  in self.tag: 
+                if index == self.outgoing:
+                    pass
+                elif index % 2 and index -1 != self.outgoing:
+                    pass
+                elif index %2 == 1 and index + 1  != self.outgoing:
+                    pass
+                else:
+                    sign *= -1
+            
+            if sign == -1 :
                 sign = '-'
+            else:
+                sign = ''
                    
             str_out += '%s[0] = %s%s%d[%d].real();\n' % (mom, sign, type, index, energy_pos)
             str_out += '%s[1] = %s%s%d[%d].real();\n' % (mom, sign, type, index, energy_pos + 1)
@@ -791,7 +855,7 @@
                 string = string.replace('+-', '-')
                 OutString = OutString + string + ';\n'
         else:
-            OffShellParticle = self.particles[self.offshell-1]+'%s'%(self.offshell)
+            OffShellParticle = self.particles[self.offshell-1]+'%s'%(self.outgoing)
             numerator = self.obj.numerator
             denominator = self.obj.denominator
             for ind in denominator.listindices():
@@ -1061,9 +1125,19 @@
         
         WriteALOHA.__init__(self, abstract_routine, dirpath)
         self.outname = '%s%s' % (self.particles[self.offshell -1], \
-                                                               self.offshell)
-    
-        
+                                                               self.outgoing)
+    
+    @staticmethod
+    def change_number_format(obj):
+        if obj.real == 0 and obj.imag:
+            if int(obj.imag) == obj.imag: 
+                return '%ij' % obj.imag
+            else:
+                return '%sj' % str(obj.imag)
+        else: 
+            return str(obj)
+    
+    
     def change_var_format(self, name): 
         """Formatting the variable name to Python format
         start to count at zero"""
@@ -1138,7 +1212,7 @@
             str_out += 'def %(name)s(%(args)s, COUP, M%(id)d, W%(id)d):\n' % \
                 {'name': name,
                  'args': ', '.join(CallList), 
-                     'id': self.offshell}            
+                     'id': self.outgoing}            
         return str_out     
 
     def make_declaration_list(self):
@@ -1181,14 +1255,29 @@
             index = int(mom[1:])
             type = self.particles[index - 1]
             energy_pos = self.type_to_size[type] -2
-            sign = ''
+            sign = 1
             if self.offshell == index and type in ['V','S']:
-                sign = '-'
+                sign = -1
+
+            if 'C%s' % ((index +1) // 2)  in self.tag: 
+                if index == self.outgoing:
+                    pass
+                elif index % 2 and index -1 != self.outgoing:
+                    pass
+                elif index %2 == 1 and index + 1  != self.outgoing:
+                    pass
+                else:
+                    sign *= -1
+
+            if sign == -1 :
+                sign = '- '
+            else:
+                sign = ''
 
             str_out += '%s = [%scomplex(%s%d[%d]).real, \\\n' % (mom, sign, type, index, energy_pos)
-            str_out += '        %s complex(%s%d[%d]).real, \\\n' % ( sign, type, index, energy_pos + 1)
-            str_out += '        %s complex(%s%d[%d]).imag, \\\n' % ( sign, type, index, energy_pos + 1)
-            str_out += '        %s complex(%s%d[%d]).imag]\n' % ( sign, type, index, energy_pos) 
+            str_out += '         %scomplex(%s%d[%d]).real, \\\n' % ( sign, type, index, energy_pos + 1)
+            str_out += '         %scomplex(%s%d[%d]).imag, \\\n' % ( sign, type, index, energy_pos + 1)
+            str_out += '         %scomplex(%s%d[%d]).imag]\n' % ( sign, type, index, energy_pos) 
                    
         # Definition for the One Over Mass**2 terms
         for elem in overm:
@@ -1260,17 +1349,7 @@
         text += header
   
         # Define which part of the routine should be called
-        addon = ''
-        if 'C' in self.namestring:
-            short_name, addon = name.split('C',1)
-            if addon.split('_')[0].isdigit():
-                addon = 'C' +self.namestring.split('C',1)[1]
-            elif all([n.isdigit() for n in addon.split('_')[0].split('C')]):
-                addon = 'C' +self.namestring.split('C',1)[1]
-            else:
-                addon = '_%s' % self.offshell
-        else:
-            addon = '_%s' % self.offshell
+        addon = ''.join(self.tag) + '_%s' % self.offshell
 
         # how to call the routine
         if not offshell:
@@ -1282,11 +1361,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' % \
                     {'args': ', '.join(self.calllist['CallList']), 
                      'COUP':'COUP%d',
-                     'id': self.offshell}
+                     'id': self.outgoing}
 
         # make the first call
         line = "    %s = %s%s("+call_arg+")\n"

=== modified file 'aloha/create_aloha.py'
--- aloha/create_aloha.py	2012-02-01 20:26:10 +0000
+++ aloha/create_aloha.py	2012-03-09 00:04:18 +0000
@@ -198,6 +198,11 @@
         aloha_lib.USE_TAG=set()
         #multiply by the wave functions
         nb_spinor = 0
+        outgoing = self.outgoing
+        if (outgoing + 1) // 2 in self.conjg:
+            #flip the outgoing tag if in conjugate
+            outgoing = outgoing + outgoing % 2 - (outgoing +1) % 2
+        
         if not self.routine_kernel:
             AbstractRoutineBuilder.counter += 1
             logger.info('aloha creates %s routines' % self.name)
@@ -213,21 +218,25 @@
         else:
             lorentz = self.routine_kernel
             aloha_lib.USE_TAG = set(self.kernel_tag) 
-        for (i, spin ) in enumerate(self.spins):
+            
+            
+        for (i, spin ) in enumerate(self.spins):   
             id = i + 1
+                     
             #Check if this is the outgoing particle
-            if id == self.outgoing:
+            if id == outgoing:
                 if spin == 1: 
                     lorentz *= complex(0,1)
                 elif spin == 2:
-                    # shift the tag if we multiply by C matrices
-                    if (id+1) // 2 in self.conjg: 
-                        id += _conjugate_gap
-                    nb_spinor += 1
-                    if nb_spinor %2:
-                        lorentz *= SpinorPropagator(id, 'I2', self.outgoing)
+                    # shift and flip the tag if we multiply by C matrices
+                    if (id + 1) // 2 in self.conjg:
+                        id += _conjugate_gap + id % 2 - (id +1) % 2
+                    if id % 2:
+                        #propagator outcoming
+                        lorentz *= SpinorPropagator(id, 'I2', outgoing)
                     else:
-                        lorentz *= SpinorPropagator('I2', id, self.outgoing) 
+                        #propagator incoming
+                        lorentz *= SpinorPropagator('I2', id, outgoing) 
                 elif spin == 3 :
                     lorentz *= VectorPropagator(id, 'I2', id)
                 elif spin == 5 :
@@ -248,10 +257,9 @@
                 elif spin == 2:
                     # shift the tag if we multiply by C matrices
                     if (id+1) // 2 in self.conjg:
-                        spin_id = id + _conjugate_gap
+                        spin_id = id + _conjugate_gap + id % 2 - (id +1) % 2
                     else:
                         spin_id = id
-                    nb_spinor += 1
                     lorentz *= Spinor(spin_id, id)
                 elif spin == 3:        
                     lorentz *= Vector(id, id)
@@ -262,8 +270,8 @@
                                 'The spin value %s is not supported yet' % spin)                    
 
         # If no particle OffShell
-        if self.outgoing:
-            lorentz /= DenominatorPropagator(self.outgoing)
+        if outgoing:
+            lorentz /= DenominatorPropagator(outgoing)
             #lorentz.tag.add('OM%s' % self.outgoing )  
             #lorentz.tag.add('P%s' % self.outgoing)  
         else:
@@ -273,7 +281,7 @@
         lorentz = lorentz.simplify()
 
         lorentz = lorentz.expand()
-        if self.outgoing and self.spins[self.outgoing-1] == 5:
+        if outgoing and self.spins[outgoing-1] == 5:
             if not self.aloha_lib:
                 AbstractRoutineBuilder.load_library()
             if self.spin2_massless:

=== modified file 'aloha/template_files/aloha_functions.f'
--- aloha/template_files/aloha_functions.f	2010-09-28 10:05:41 +0000
+++ aloha/template_files/aloha_functions.f	2012-03-09 00:04:18 +0000
@@ -219,8 +219,8 @@
 
             sqm(0) = dsqrt(abs(fmass)) ! possibility of negative fermion masses
             sqm(1) = sign(sqm(0),fmass) ! possibility of negative fermion masses
-            ip = -((1+nh)/2)
-            im =  (1-nh)/2
+            ip = -((1-nh)/2) * nhel
+            im =  (1+nh)/2* nhel
 
             fo(1) = im     * sqm(im)
             fo(2) = ip*nsf * sqm(im)

=== modified file 'aloha/template_files/oxxxxx.cc'
--- aloha/template_files/oxxxxx.cc	2010-07-26 04:28:51 +0000
+++ aloha/template_files/oxxxxx.cc	2012-03-09 00:04:18 +0000
@@ -14,8 +14,8 @@
     if (pp == 0.000){
       sqm[0] = pow(abs(fmass),0.5);
       sqm[1] = Sgn(sqm[0],fmass); 
-      ip = -((1+nh)/2);
-      im = (1-nh)/2;
+      ip = -((1-nh)/2) * nhel ;
+      im = (1+nh)/2 * nhel;
       fo[0] = im *sqm[im];
       fo[1] = ip*nsf*sqm[im];
       fo[2] = im*nsf*sqm[-ip];
@@ -27,8 +27,8 @@
       sf[1] = double(1+nsf-(1-nsf)*nh)*0.5;
       omega[0] = pow(p[0]+pp,0.5);
       omega[1] = fmass/omega[0];
-      ip = (1+nh)/2;
-      im = (1-nh)/2;
+      ip = (1+nh)/2 ;
+      im = (1-nh)/2 ;
       sfomeg[0] = sf[0]*omega[ip];
       sfomeg[1] = sf[1]*omega[im];
       pp3 = max(pp+p[3],0.00);

=== modified file 'aloha/template_files/wavefunctions.py'
--- aloha/template_files/wavefunctions.py	2011-01-07 23:13:28 +0000
+++ aloha/template_files/wavefunctions.py	2012-03-09 00:04:18 +0000
@@ -94,8 +94,8 @@
         pp = min(p[0],sqrt(p[1]**2 + p[2]**2 + p[3]**2 ))
         if (pp == 0.): 
             sqm = sqrt(abs(fmass)) 
-            ip = -((1+nh)/2) 
-            im = (1-nh)/2 
+            ip = -((1-nh)/2) * nhel
+            im = (1+nh)/2 * nhel
 
             fo[0] = im*sqm
             fo[1] = ip*nsf*sqm

=== modified file 'bin/create_aloha_release.py'
--- bin/create_aloha_release.py	2011-10-12 18:54:53 +0000
+++ bin/create_aloha_release.py	2012-03-09 00:04:18 +0000
@@ -56,7 +56,7 @@
 root_path = path.split(path.dirname(path.realpath( __file__ )))[0]
 sys.path.append(root_path)
 
-import madgraph.iolibs.misc as misc
+import madgraph.various.misc as misc
 import madgraph.iolibs.files as files_routines
 from madgraph import MG5DIR
 

=== modified file 'bin/create_release.py'
--- bin/create_release.py	2011-11-10 18:36:25 +0000
+++ bin/create_release.py	2012-03-09 00:04:18 +0000
@@ -54,7 +54,7 @@
 root_path = path.split(path.dirname(path.realpath( __file__ )))[0]
 sys.path.append(root_path)
 
-import madgraph.iolibs.misc as misc
+import madgraph.various.misc as misc
 from madgraph import MG5DIR
 
 # Write out nice usage message if called with -h or --help
@@ -169,10 +169,10 @@
 #mixes the path for the tests
 import madgraph
 reload(madgraph)
-import madgraph.iolibs
-reload(madgraph.iolibs)
-import madgraph.iolibs.misc
-reload(madgraph.iolibs.misc)
+import madgraph.various
+reload(madgraph.various)
+import madgraph.various.misc
+reload(madgraph.various.misc)
 
 
 test_results = test_manager.run(package=os.path.join('tests',

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2012-02-16 17:58:28 +0000
+++ madgraph/VERSION	2012-03-09 00:04:18 +0000
@@ -1,3 +1,3 @@
-version = 1.4.2
-date = 2012-02-16
+version = 1.4.3
+date = 2012-03-08
 

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2011-12-10 01:52:27 +0000
+++ madgraph/core/base_objects.py	2012-03-09 00:04:18 +0000
@@ -1519,6 +1519,7 @@
         # allowed. This enables generating e.g. Z/gamma as s-channel
         # propagators.
         self['required_s_channels'] = []
+        self['forbidden_onsh_s_channels'] = []
         self['forbidden_s_channels'] = []
         self['forbidden_particles'] = []
         self['is_decay_chain'] = False
@@ -1562,7 +1563,7 @@
                         raise self.PhysicsObjectError, \
                           "Not valid PDG code %d for s-channel particle" % i
 
-        if name == 'forbidden_s_channels':
+        if name in ['forbidden_onsh_s_channels', 'forbidden_s_channels']:
             if not isinstance(value, list):
                 raise self.PhysicsObjectError, \
                         "%s is not a valid list" % str(value)
@@ -1619,7 +1620,8 @@
         """Return process property names as a nicely sorted list."""
 
         return ['legs', 'orders', 'overall_orders', 'model', 'id',
-                'required_s_channels', 'forbidden_s_channels',
+                'required_s_channels', 'forbidden_onsh_s_channels',
+                'forbidden_s_channels',
                 'forbidden_particles', 'is_decay_chain', 'decay_chains']
 
     def nice_string(self, indent=0):
@@ -1648,8 +1650,15 @@
             prevleg = leg
 
         # Add forbidden s-channels
+        if self['forbidden_onsh_s_channels']:
+            mystr = mystr + '$ '
+            for forb_id in self['forbidden_onsh_s_channels']:
+                forbpart = self['model'].get('particle_dict')[forb_id]
+                mystr = mystr + forbpart.get_name() + ' '
+
+        # Add double forbidden s-channels
         if self['forbidden_s_channels']:
-            mystr = mystr + '$ '
+            mystr = mystr + '$$ '
             for forb_id in self['forbidden_s_channels']:
                 forbpart = self['model'].get('particle_dict')[forb_id]
                 mystr = mystr + forbpart.get_name() + ' '
@@ -1710,8 +1719,15 @@
             prevleg = leg
 
         # Add forbidden s-channels
+        if self['forbidden_onsh_s_channels']:
+            mystr = mystr + '$ '
+            for forb_id in self['forbidden_onsh_s_channels']:
+                forbpart = self['model'].get('particle_dict')[forb_id]
+                mystr = mystr + forbpart.get_name() + ' '
+
+        # Add double forbidden s-channels
         if self['forbidden_s_channels']:
-            mystr = mystr + '$ '
+            mystr = mystr + '$$ '
             for forb_id in self['forbidden_s_channels']:
                 forbpart = self['model'].get('particle_dict')[forb_id]
                 mystr = mystr + forbpart.get_name() + ' '
@@ -2134,8 +2150,15 @@
             prevleg = leg
 
         # Add forbidden s-channels
+        if self['forbidden_onsh_s_channels']:
+            mystr = mystr + '$ '
+            for forb_id in self['forbidden_onsh_s_channels']:
+                forbpart = self['model'].get('particle_dict')[forb_id]
+                mystr = mystr + forbpart.get_name() + ' '
+
+        # Add double forbidden s-channels
         if self['forbidden_s_channels']:
-            mystr = mystr + '$ '
+            mystr = mystr + '$$ '
             for forb_id in self['forbidden_s_channels']:
                 forbpart = self['model'].get('particle_dict')[forb_id]
                 mystr = mystr + forbpart.get_name() + ' '

=== modified file 'madgraph/core/diagram_generation.py'
--- madgraph/core/diagram_generation.py	2011-11-22 08:36:23 +0000
+++ madgraph/core/diagram_generation.py	2012-03-09 00:04:18 +0000
@@ -544,18 +544,31 @@
                 # Add diagrams only if not already in res
                 res.extend([diag for diag in res_diags if diag not in res])
 
-        # Select the diagrams where no forbidden s-channel propagators
-        # are present.
+        # Remove all diagrams with a "double" forbidden s-channel propagator
+        # is present.
         # Note that we shouldn't look at the last vertex in each
         # diagram, since that is the n->0 vertex
         if process.get('forbidden_s_channels'):
             ninitial = len(filter(lambda leg: leg.get('state') == False,
+                                  process.get('legs')))
+            res = base_objects.DiagramList(\
+                filter(lambda diagram: \
+                       not any([vertex.get_s_channel_id(\
+                           process.get('model'), ninitial) \
+                                in process.get('forbidden_s_channels')
+                                for vertex in diagram.get('vertices')[:-1]]),
+                       res))
+
+        # Mark forbidden (onshell) s-channel propagators, to forbid onshell
+        # generation.
+        if process.get('forbidden_onsh_s_channels'):
+            ninitial = len(filter(lambda leg: leg.get('state') == False,
                               process.get('legs')))
             verts = base_objects.VertexList(sum([[vertex for vertex \
                                                   in diagram.get('vertices')[:-1]
                                            if vertex.get_s_channel_id(\
                                                process.get('model'), ninitial) \
-                                           in process.get('forbidden_s_channels')] \
+                                           in process.get('forbidden_onsh_s_channels')] \
                                                for diagram in res], []))
             for vert in verts:
                 # Use onshell = False to indicate that this s-channel is forbidden
@@ -1306,6 +1319,8 @@
                               'orders': process_definition.get('orders'),
                               'required_s_channels': \
                                  process_definition.get('required_s_channels'),
+                              'forbidden_onsh_s_channels': \
+                                 process_definition.get('forbidden_onsh_s_channels'),
                               'forbidden_s_channels': \
                                  process_definition.get('forbidden_s_channels'),
                               'forbidden_particles': \
@@ -1339,6 +1354,7 @@
                 # Check for successful crossings, unless we have specified
                 # properties that break crossing symmetry
                 if not process.get('required_s_channels') and \
+                   not process.get('forbidden_onsh_s_channels') and \
                    not process.get('forbidden_s_channels') and \
                    not process.get('is_decay_chain'):
                     try:
@@ -1517,6 +1533,8 @@
                               'orders': coupling_orders_now,
                               'required_s_channels': \
                                  process_definition.get('required_s_channels'),
+                              'forbidden_onsh_s_channels': \
+                                 process_definition.get('forbidden_onsh_s_channels'),
                               'forbidden_s_channels': \
                                  process_definition.get('forbidden_s_channels'),
                               'forbidden_particles': \

=== added file 'madgraph/interface/Loop_interface.py'
--- madgraph/interface/Loop_interface.py	1970-01-01 00:00:00 +0000
+++ madgraph/interface/Loop_interface.py	2012-03-09 00:04:18 +0000
@@ -0,0 +1,49 @@
+################################################################################
+#
+# Copyright (c) 2009 The MadGraph Development team and Contributors
+#
+# This file is a part of the MadGraph 5 project, an application which 
+# automatically generates Feynman diagrams and matrix elements for arbitrary
+# high-energy processes in the Standard Model and beyond.
+#
+# It is subject to the MadGraph license which should accompany this 
+# distribution.
+#
+# For more information, please visit: http://madgraph.phys.ucl.ac.be
+#
+################################################################################
+"""A user friendly command line interface to access all MadGraph features.
+   Uses the cmd package for command interpretation and tab completion.
+"""
+
+import os
+
+import madgraph
+from madgraph import MG4DIR, MG5DIR, MadGraph5Error
+import madgraph.interface.madgraph_interface as mg_interface
+
+#usefull shortcut
+pjoin = os.path.join
+
+class CheckLoop(mg_interface.CheckValidForCmd):
+    pass
+
+class CheckLoopWeb(mg_interface.CheckValidForCmdWeb, CheckLoop):
+    pass
+
+class CompleteLoop(mg_interface.CompleteForCmd):
+    pass
+
+class HelpLoop(mg_interface.HelpToCmd):
+    pass
+
+class LoopInterface(CheckLoop, CompleteLoop, HelpLoop, mg_interface.MadGraphCmd):
+    
+    def do_generate(self, *args,**opt):
+        'hello'
+        print 'hello'
+    pass
+   
+class LoopInterfaceWeb(mg_interface.CheckValidForCmdWeb, LoopInterface):
+    pass
+

=== removed file 'madgraph/interface/Loop_interface.py'
--- madgraph/interface/Loop_interface.py	2012-02-15 23:55:51 +0000
+++ madgraph/interface/Loop_interface.py	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-################################################################################
-#
-# Copyright (c) 2009 The MadGraph Development team and Contributors
-#
-# This file is a part of the MadGraph 5 project, an application which 
-# automatically generates Feynman diagrams and matrix elements for arbitrary
-# high-energy processes in the Standard Model and beyond.
-#
-# It is subject to the MadGraph license which should accompany this 
-# distribution.
-#
-# For more information, please visit: http://madgraph.phys.ucl.ac.be
-#
-################################################################################
-"""A user friendly command line interface to access all MadGraph features.
-   Uses the cmd package for command interpretation and tab completion.
-"""
-
-import os
-
-import madgraph
-from madgraph import MG4DIR, MG5DIR, MadGraph5Error
-import madgraph.interface.madgraph_interface as mg_interface
-
-#usefull shortcut
-pjoin = os.path.join
-
-class CheckLoop(mg_interface.CheckValidForCmd):
-    pass
-
-class CheckLoopWeb(mg_interface.CheckValidForCmdWeb, CheckLoop):
-    pass
-
-class CompleteLoop(mg_interface.CompleteForCmd):
-    pass
-
-class HelpLoop(mg_interface.HelpToCmd):
-    pass
-
-class LoopInterface(CheckLoop, CompleteLoop, HelpLoop, mg_interface.MadGraphCmd):
-    
-    def do_generate(self, *args,**opt):
-        'hello'
-        print 'hello'
-    pass
-   
-class LoopInterfaceWeb(mg_interface.CheckValidForCmdWeb, LoopInterface):
-    pass
-

=== modified file 'madgraph/interface/coloring_logging.py'
--- madgraph/interface/coloring_logging.py	2011-12-14 22:12:33 +0000
+++ madgraph/interface/coloring_logging.py	2012-03-09 00:04:18 +0000
@@ -3,9 +3,9 @@
 BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
 
 COLORS = {
-    'WARNING'  : RED,
+    'WARNING'  : BLUE,
     'INFO'     : BLACK,
-    'DEBUG'    : BLUE,
+    'DEBUG'    : GREEN,
     'CRITICAL' : RED,
     'ERROR'    : RED,
     'RED'      : RED,

=== modified file 'madgraph/interface/extended_cmd.py'
--- madgraph/interface/extended_cmd.py	2012-02-15 23:55:51 +0000
+++ madgraph/interface/extended_cmd.py	2012-03-09 00:04:18 +0000
@@ -35,10 +35,14 @@
 logger_stderr = logging.getLogger('fatalerror') # for stderr
 
 try:
-    import madgraph.iolibs.misc as misc
+    import madgraph.various.misc as misc
+    from madgraph import MG5DIR
+    MADEVENT = False
 except:
     import internal.misc as misc
+    MADEVENT = True
 
+pjoin = os.path.join
 
 class TimeOutError(Exception):
     """Class for run-time error"""
@@ -213,7 +217,116 @@
             #    print '\n'
             return None    
 
-class Cmd(BasicCmd):
+class CheckCmd(object):
+    """Extension of the cmd object for only the check command"""
+
+    def check_history(self, args):
+        """check the validity of line"""
+        
+        if len(args) > 1:
+            self.help_history()
+            raise self.InvalidCmd('\"history\" command takes at most one argument')
+        
+        if not len(args):
+            return
+        
+        if args[0] =='.':
+            if not self._export_dir:
+                raise self.InvalidCmd("No default directory is defined for \'.\' option")
+        elif args[0] != 'clean':
+                dirpath = os.path.dirname(args[0])
+                if dirpath and not os.path.exists(dirpath) or \
+                       os.path.isdir(args[0]):
+                    raise self.InvalidCmd("invalid path %s " % dirpath)
+    
+    def check_save(self, args):
+        """check that the line is compatible with save options"""
+        
+        if len(args) > 2:
+            self.help_save()
+            raise self.InvalidCmd, '\'%s\' is not recoginzed as first argument.'
+        
+        if len(args) == 2:
+            if args[0] != 'options':
+                self.help_save()
+                raise self.InvalidCmd, '\'%s\' is not recoginzed as first argument.' % \
+                                                args[0]
+            else:
+                args.pop(0)           
+
+class HelpCmd(object):
+    """Extension of the cmd object for only the help command"""
+
+    def help_quit(self):
+        logger.info("syntax: quit")
+        logger.info("-- terminates the application")
+    
+    help_EOF = help_quit
+
+    def help_history(self):
+        logger.info("syntax: history [FILEPATH|clean|.] ")
+        logger.info("   If FILEPATH is \'.\' and \'output\' is done,")
+        logger.info("   Cards/proc_card_mg5.dat will be used.")
+        logger.info("   If FILEPATH is omitted, the history will be output to stdout.")
+        logger.info("   \"clean\" will remove all entries from the history.")
+        
+    def help_help(self):
+        logger.info("syntax: help")
+        logger.info("-- access to the in-line help" )
+
+    def help_save(self):
+        """help text for save"""
+        logger.info("syntax: save [options]  [FILEPATH]") 
+        logger.info("-- save options configuration to filepath.")
+        
+    def help_display(self):
+        """help for display command"""
+        logger.info("syntax: display " + "|".join(self._display_opts))
+        logger.info("-- display a the status of various internal state variables")          
+        
+class CompleteCmd(object):
+    """Extension of the cmd object for only the complete command"""
+
+    def complete_display(self,text, line, begidx, endidx):        
+        args = self.split_arg(line[0:begidx])
+        # Format
+        if len(args) == 1:
+            return self.list_completion(text, self._display_opts)
+        
+    def complete_history(self, text, line, begidx, endidx):
+        "Complete the history command"
+
+        args = self.split_arg(line[0:begidx])
+
+        # Directory continuation
+        if args[-1].endswith(os.path.sep):
+            return self.path_completion(text,
+                                        os.path.join('.',*[a for a in args \
+                                                    if a.endswith(os.path.sep)]))
+
+        if len(args) == 1:
+            return self.path_completion(text)
+
+    def complete_save(self, text, line, begidx, endidx):
+        "Complete the save command"
+
+        args = self.split_arg(line[0:begidx])
+
+        # Format
+        if len(args) == 1:
+            return self.list_completion(text, ['options'])
+
+        # 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)]),
+                                        only_dirs = True)
+
+        # Filename if directory is not given
+        if len(args) == 2:
+            return self.path_completion(text)
+
+class Cmd(CheckCmd, HelpCmd, CompleteCmd, BasicCmd):
     """Extension of the cmd.Cmd command line.
     This extensions supports line breaking, history, comments,
     internal call to cmdline, path completion,...
@@ -735,51 +848,6 @@
         else:
             return self.stored_line
 
-
-    def help_history(self):
-        logger.info("syntax: history [FILEPATH|clean|.] ")
-        logger.info("   If FILEPATH is \'.\' and \'output\' is done,")
-        logger.info("   Cards/proc_card_mg5.dat will be used.")
-        logger.info("   If FILEPATH is omitted, the history will be output to stdout.")
-        logger.info("   \"clean\" will remove all entries from the history.")
-    
-    
-
-
-    def complete_history(self, text, line, begidx, endidx):
-        "Complete the history command"
-
-        args = self.split_arg(line[0:begidx])
-
-        # Directory continuation
-        if args[-1].endswith(os.path.sep):
-            return self.path_completion(text,
-                                        os.path.join('.',*[a for a in args \
-                                                    if a.endswith(os.path.sep)]))
-
-        if len(args) == 1:
-            return self.path_completion(text)
-        
-    def check_history(self, args):
-        """check the validity of line"""
-        
-        if len(args) > 1:
-            self.help_history()
-            raise self.InvalidCmd('\"history\" command takes at most one argument')
-        
-        if not len(args):
-            return
-        
-        if args[0] =='.':
-            if not self._export_dir:
-                raise self.InvalidCmd("No default directory is defined for \'.\' option")
-        elif args[0] != 'clean':
-                dirpath = os.path.dirname(args[0])
-                if dirpath and not os.path.exists(dirpath) or \
-                       os.path.isdir(args[0]):
-                    raise self.InvalidCmd("invalid path %s " % dirpath)
-    
-
     # Quit
     def do_quit(self, line):
         """ exit the mainloop() """
@@ -802,11 +870,7 @@
     do_EOF = do_quit
     do_exit = do_quit
 
-    def help_quit(self):
-        logger.info("syntax: quit")
-        logger.info("-- terminates the application")
-    
-    help_EOF = help_quit
+
      
     
 
@@ -905,7 +969,7 @@
         
         if args[0] == "options":
             outstr = "Value of current Options:\n" 
-            for key, value in self.configuration.items() + self._options.items():
+            for key, value in self.options.items():
                 outstr += '%25s \t:\t%s\n' %(key,value)
             output.write(outstr)
             
@@ -929,20 +993,85 @@
             
             pydoc.pager(outstr)
     
-    def help_display(self):
-        """help for display command"""
-        logger.info("syntax: display " + "|".join(self._display_opts))
-        logger.info("-- display a the status of various internal state variables")
-        
-    def complete_display(self,text, line, begidx, endidx):        
-        args = self.split_arg(line[0:begidx])
-        # Format
-        if len(args) == 1:
-            return self.list_completion(text, self._display_opts)
-                                        
-    def help_help(self):
-        logger.info("syntax: help")
-        logger.info("-- access to the in-line help" )
+    
+    def do_save(self, line, check=True):
+        """Save the configuration file"""
+        
+        args = self.split_arg(line)
+        # Check argument validity
+        if check:
+            Cmd.check_save(self, args)
+            
+        # find base file for the configuration
+        if'HOME' in os.environ and os.environ['HOME']  and \
+        os.path.exists(pjoin(os.environ['HOME'], '.mg5', 'mg5_configuration.txt')):
+            base = pjoin(os.environ['HOME'], '.mg5', 'mg5_configuration.txt')
+            if hasattr(self, 'me_dir'):
+                basedir = self.me_dir
+            elif not MADEVENT:
+                basedir = MG5DIR
+            else:
+                basedir = os.getcwd()
+        elif MADEVENT:
+            # launch via ./bin/madevent
+            base = pjoin(self.me_dir, 'Cards', 'me5_configuration.txt')
+            basedir = self.me_dir
+        else:
+            if hasattr(self, 'me_dir'):
+                base = pjoin(self.me_dir, 'Cards', 'me5_configuration.txt')
+                if len(args) == 0 and os.path.exists(base):
+                    self.write_configuration(base, base, self.me_dir)
+            base = pjoin(MG5DIR, 'input', 'mg5_configuration.txt')
+            basedir = MG5DIR
+            
+        if len(args) == 0:
+            args.append(base)
+        self.write_configuration(args[0], base, basedir)
+        
+    def write_configuration(self, filepath, basefile, basedir):
+        """Write the configuration file"""
+        # We use the default configuration file as a template.
+        # to ensure that all configuration information are written we 
+        # keep track of all key that we need to write.
+
+        logger.info('save configuration file to %s' % filepath)
+        to_write = self.options.keys()[:]
+        text = ""
+        # Use local configuration => Need to update the path
+        for line in file(basefile):
+            if '#' in line:
+                data, comment = line.split('#',1)
+            else: 
+                data, comment = line, ''
+            data = data.split('=')
+            if len(data) !=2:
+                text += line
+                continue
+            key = data[0].strip()
+            if key in self.options:
+                value = str(self.options[key])
+            else:
+                value = data[1].strip()
+            try:
+                to_write.remove(key)
+            except:
+                pass
+            if '_path' in key:       
+                # special case need to update path
+                # check if absolute path
+                if value.startswith('./'):
+                    value = os.path.realpath(os.path.join(basedir, value))
+            text += '%s = %s # %s \n' % (key, value, comment)
+        for key in to_write:
+            if key in self.options:
+                text += '%s = %s \n' % (key,self.options[key])
+            else:
+                text += '%s = %s \n' % (key,self.options[key])
+        writer = open(filepath,'w')
+        writer.write(text)
+        writer.close()
+                       
+
 
 
     @staticmethod

=== modified file 'madgraph/interface/launch_ext_program.py'
--- madgraph/interface/launch_ext_program.py	2012-02-09 18:46:27 +0000
+++ madgraph/interface/launch_ext_program.py	2012-03-09 00:04:18 +0000
@@ -24,12 +24,15 @@
 import time
 
 import madgraph.iolibs.files as files
-import madgraph.iolibs.misc as misc
 import madgraph.interface.extended_cmd as cmd
 import madgraph.interface.madevent_interface as me_cmd
+import madgraph.various.misc as misc
+
 from madgraph import MG4DIR, MG5DIR, MadGraph5Error
 from madgraph.iolibs.files import cp
 
+
+
 logger = logging.getLogger('cmdprint.ext_program')
 
 class ExtLauncher(object):

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2012-02-16 11:44:50 +0000
+++ madgraph/interface/madevent_interface.py	2012-03-09 00:04:18 +0000
@@ -50,13 +50,14 @@
 try:
     # import from madgraph directory
     import madgraph.interface.extended_cmd as cmd
-    import madgraph.iolibs.misc as misc
     import madgraph.iolibs.files as files
     import madgraph.iolibs.save_load_object as save_load_object
+    import madgraph.various.banner as banner_mod
+    import madgraph.various.cluster as cluster
     import madgraph.various.gen_crossxhtml as gen_crossxhtml
-    import madgraph.various.cluster as cluster
     import madgraph.various.sum_html as sum_html
-    import madgraph.various.banner as banner_mod
+    import madgraph.various.misc as misc
+
     import models.check_param_card as check_param_card    
     from madgraph import InvalidCmd, MadGraph5Error
     MADEVENT = False
@@ -300,7 +301,7 @@
         
         logger.info("-- session options:")
         logger.info("      Note that those options will be kept for the current session")      
-        logger.info("      --cluster : Submit to the  cluster. Current cluster: %s" % self.configuration['cluster_mode'])
+        logger.info("      --cluster : Submit to the  cluster. Current cluster: %s" % self.options['cluster_mode'])
         logger.info("      --multicore : Run in multi-core configuration")
         logger.info("      --nb_core=X : limit the number of core to use to X.")
         
@@ -429,7 +430,7 @@
         tag = [a[6:] for a in args if a.startswith('--tag=')]
         
         
-        if os.path.exists(args[0]):
+        if os.path.isfile(args[0]):
             type ='banner'
             format = self.detect_card_type(args[0])
             if format != 'banner':
@@ -494,7 +495,7 @@
             self.help_set()
             raise self.InvalidCmd('set needs an option and an argument')
 
-        if args[0] not in self._set_options + self.configuration.keys():
+        if args[0] not in self._set_options + self.options.keys():
             self.help_set()
             raise self.InvalidCmd('Possible options for set are %s' % \
                                   self._set_options)
@@ -587,10 +588,10 @@
             if run not in ['auto','parton', 'pythia', 'pgs', 'delphes']:
                 self.help_generate_events()
                 raise self.InvalidCmd('invalid %s argument'% args[-1])
-            if run != 'parton' and not self.configuration['pythia-pgs_path']:                
+            if run != 'parton' and not self.options['pythia-pgs_path']:                
                 raise self.InvalidCmd('''pythia-pgs not install. Please install this package first. 
                 To do so type: \'install pythia-pgs\' in the mg5 interface''')
-            if run == 'delphes' and not self.configuration['delphes_path']:
+            if run == 'delphes' and not self.options['delphes_path']:
                 raise self.InvalidCmd('''delphes not install. Please install this package first. 
                 To do so type: \'install Delphes\' in the mg5 interface''')
             del args[-1]
@@ -645,10 +646,10 @@
             if run not in ['parton', 'pythia', 'pgs', 'delphes']:
                 self.help_multi_run()
                 raise self.InvalidCmd('invalid %s argument'% args[-1])
-            if run != 'parton' and not self.configuration['pythia-pgs_path']:                
+            if run != 'parton' and not self.options['pythia-pgs_path']:                
                 raise self.InvalidCmd('''pythia-pgs not install. Please install this package first. 
                 To do so type: \'install pythia-pgs\' in the mg5 interface''')
-            if run == 'delphes' and not self.configuration['delphes_path']:
+            if run == 'delphes' and not self.options['delphes_path']:
                 raise self.InvalidCmd('''delphes not install. Please install this package first. 
                 To do so type: \'install Delphes\' in the mg5 interface''')
             del args[-1]
@@ -759,12 +760,12 @@
             
 
         # If not pythia-pgs path
-        if not self.configuration['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.configuration['pythia-pgs_path'] or not \
-            os.path.exists(pjoin(self.configuration['pythia-pgs_path'],'src')):
+        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.'
@@ -808,15 +809,15 @@
         """Check the argument for the plot command
         plot run_name modes"""
 
-        madir = self.configuration['madanalysis_path']
-        td = self.configuration['td_path']
+        madir = self.options['madanalysis_path']
+        td = self.options['td_path']
         
         if not madir or not td:
             logger.info('Retry to read configuration file to find madanalysis/td')
             self.set_configuration()
 
-        madir = self.configuration['madanalysis_path']
-        td = self.configuration['td_path']        
+        madir = self.options['madanalysis_path']
+        td = self.options['td_path']        
         
         if not madir:
             error_msg = 'No Madanalysis path correctly set.'
@@ -830,7 +831,7 @@
             raise self.InvalidCmd(error_msg)  
                      
         if len(args) == 0:
-            if not hasattr(self, 'run_name'):
+            if not hasattr(self, 'run_name') or not self.run_name:
                 self.help_plot()
                 raise self.InvalidCmd('No run name currently define. Please add this information.')             
             args.append('all')
@@ -842,7 +843,7 @@
             force = True
         
         if args[0] not in self._plot_mode:
-            self.set_run_name(args[0])
+            self.set_run_name(args[0], level='plot')
             del args[0]
             if len(args) == 0:
                 args.append('all')
@@ -866,12 +867,12 @@
         """
         
         # If not pythia-pgs path
-        if not self.configuration['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.configuration['pythia-pgs_path'] or not \
-            os.path.exists(pjoin(self.configuration['pythia-pgs_path'],'src')):
+        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.'
@@ -920,11 +921,11 @@
         """
         
         # If not pythia-pgs path
-        if not self.configuration['delphes_path']:
+        if not self.options['delphes_path']:
             logger.info('Retry to read configuration file to find delphes path')
             self.set_configuration()
       
-        if not self.configuration['delphes_path']:
+        if not self.options['delphes_path']:
             error_msg = 'No delphes 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.'
@@ -938,7 +939,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.')             
         
@@ -1099,7 +1100,7 @@
 
         # Format
         if len(args) == 1:
-            return self.list_completion(text, self._set_options + self.configuration.keys() )
+            return self.list_completion(text, self._set_options + self.options.keys() )
 
         if len(args) == 2:
             if args[1] == 'stdout_level':
@@ -1331,7 +1332,7 @@
             raise MadEventAlreadyRunning, message
         else:
             os.system('touch %s' % pjoin(me_dir,'RunWeb'))
-            subprocess.call(['%s/gen_cardhtml-pl' % self.dirbin], cwd=me_dir)
+            subprocess.Popen([pjoin(self.dirbin, 'gen_cardhtml-pl')], cwd=me_dir)
       
         self.to_store = []
         self.run_name = None
@@ -1339,10 +1340,15 @@
         self.banner = None
 
         # Get number of initial states
-        nexternal = open(pjoin(me_dir,'Source','nexternal.inc')).read()
-        found = re.search("PARAMETER\s*\(NINCOMING=(\d)\)", nexternal)
-        self.ninitial = int(found.group(1))
-        
+        try:
+            nexternal = open(pjoin(me_dir,'Source','nexternal.inc')).read()
+            found = re.search("PARAMETER\s*\(NINCOMING=(\d)\)", nexternal)
+            self.ninitial = int(found.group(1))
+        except:
+            # in gridpack this file might be remove. In that case, let suppose
+            # that ninitial is 2
+            self.ninitial = 2
+            
         # Load the configuration file
         self.set_configuration()
         self.timeout = 20
@@ -1407,8 +1413,8 @@
             self.nb_core = multiprocessing.cpu_count()
             
         if self.cluster_mode == 1 and not hasattr(self, 'cluster'):
-            cluster_name = self.configuration['cluster_type']
-            self.cluster = cluster.from_name[cluster_name](self.configuration['cluster_queue'])
+            cluster_name = self.options['cluster_type']
+            self.cluster = cluster.from_name[cluster_name](self.options['cluster_queue'])
         return args
     
     ############################################################################            
@@ -1426,7 +1432,7 @@
         """ assign all configuration variable from file 
             ./Cards/mg5_configuration.txt. assign to default if not define """
             
-        self.configuration = {'pythia8_path': './pythia8',
+        self.options = {'pythia8_path': './pythia8',
                               'pythia-pgs_path': '../pythia-pgs',
                               'delphes_path': '../Delphes',
                               'madanalysis_path': '../MadAnalysis',
@@ -1476,43 +1482,43 @@
             else:
                 name = name.strip()
                 value = value.strip()
-                self.configuration[name] = value
+                self.options[name] = value
                 if value.lower() == "none":
-                    self.configuration[name] = None
+                    self.options[name] = None
 
         # Treat each expected input
         # delphes/pythia/... path
-        for key in self.configuration:
+        for key in self.options:
             if key.endswith('path'):
-                if self.configuration[key] in ['None', None]:
-                    self.configuration[key] = ''
+                if self.options[key] in ['None', None]:
+                    self.options[key] = ''
                     continue
-                path = os.path.join(self.me_dir, self.configuration[key])
+                path = os.path.join(self.me_dir, self.options[key])
                 if os.path.isdir(path):
-                    self.configuration[key] = os.path.realpath(path)
-                    continue
-                if os.path.isdir(self.configuration[key]):
-                    self.configuration[key] = os.path.realpath(self.configuration[key])
-                    continue
-                elif not os.path.isdir(self.configuration[key]):
-                    self.configuration[key] = ''
+                    self.options[key] = os.path.realpath(path)
+                    continue
+                if os.path.isdir(self.options[key]):
+                    self.options[key] = os.path.realpath(self.options[key])
+                    continue
+                elif not os.path.isdir(self.options[key]):
+                    self.options[key] = ''
             elif key.startswith('cluster'):
                 pass              
             elif key == 'automatic_html_opening':
-                if self.configuration[key] in ['False', 'True']:
-                    self.configuration[key] =eval(self.configuration[key])
+                if self.options[key] in ['False', 'True']:
+                    self.options[key] =eval(self.options[key])
             elif key not in ['text_editor','eps_viewer','web_browser']:
                 # Default: try to set parameter
                 try:
-                    self.do_set("%s %s" % (key, self.configuration[key]))
+                    self.do_set("%s %s" % (key, self.options[key]))
                 except self.InvalidCmd:
                     logger.warning("Option %s from config file not understood" \
                                    % key)
         
         # Configure the way to open a file:
-        misc.open_file.configure(self.configuration)
+        misc.open_file.configure(self.options)
           
-        return self.configuration
+        return self.options
 
     ############################################################################
     def do_banner_run(self, line): 
@@ -1619,37 +1625,37 @@
             logging.getLogger('madgraph').setLevel(eval('logging.' + args[1]))
             logger.info('set output information to level: %s' % args[1])
         elif args[0] == "fortran_compiler":
-            self.configuration['fortran_compiler'] = args[1]
+            self.options['fortran_compiler'] = args[1]
         elif args[0] == "run_mode":
             if not args[1] in [0,1,2,'0','1','2']:
                 raise self.InvalidCmd, 'run_mode should be 0, 1 or 2.'
             self.cluster_mode = int(args[1])
-            self.configuration['cluster_mode'] =  self.cluster_mode
+            self.options['cluster_mode'] =  self.cluster_mode
         elif args[0] == 'cluster_type':
-            self.configuration['cluster_mode'] = args[1]
-            self.cluster = cluster.from_name[args[1]](self.configuration['cluster_queue'])
+            self.options['cluster_mode'] = args[1]
+            self.cluster = cluster.from_name[args[1]](self.options['cluster_queue'])
         elif args[0] == 'nb_core':
             if args[1] == 'None':
                 import multiprocessing
                 self.nb_core = multiprocessing.cpu_count()
-                self.configuration['nb_core'] = self.nb_core
+                self.options['nb_core'] = self.nb_core
                 return
             if not args[1].isdigit():
                 raise self.InvalidCmd('nb_core should be a positive number') 
             self.nb_core = int(args[1])
-            self.configuration['nb_core'] = self.nb_core
-        elif args[0] in self.configuration:
+            self.options['nb_core'] = self.nb_core
+        elif args[0] in self.options:
             if args[1] in ['None','True','False']:
-                self.configuration[args[0]] = eval(args[1])
+                self.options[args[0]] = eval(args[1])
             elif args[0].endswith('path'):
                 if os.path.exists(args[1]):
-                    self.configuration[args[0]] = args[1]
+                    self.options[args[0]] = args[1]
                 elif os.path.exists(pjoin(self.me_dir, args[1])):
-                    self.configuration[args[0]] = pjoin(self.me_dir, args[1])
+                    self.options[args[0]] = pjoin(self.me_dir, args[1])
                 else:
-                    raise self.InvalidCmd('Not a valid path: keep previous value: \'%s\'' % self.configuration[args[0]])
+                    raise self.InvalidCmd('Not a valid path: keep previous value: \'%s\'' % self.options[args[0]])
             else:
-                self.configuration[args[0]] = args[1]             
+                self.options[args[0]] = args[1]             
  
  
     ############################################################################
@@ -1728,7 +1734,8 @@
             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)
+        
+        self.print_results_in_shell(self.results.current)
             
             
     def print_results_in_shell(self, data):
@@ -1931,7 +1938,7 @@
                   % {'bin': self.dirbin, 'event': pjoin(self.me_dir,'Events'),
                      'name': self.run_name})
 
-        eradir = self.configuration['exrootanalysis_path']
+        eradir = self.options['exrootanalysis_path']
         if eradir and misc.is_executable(pjoin(eradir,'ExRootLHEFConverter')):
             self.update_status("Create Root file", level='parton')
             os.system('gunzip %s/%s/unweighted_events.lhe.gz' % 
@@ -2042,6 +2049,7 @@
         self.total_jobs = 0
         subproc = [l.strip() for l in open(pjoin(self.me_dir,'SubProcesses', 
                                                                  'subproc.mg'))]
+        devnull = os.open(os.devnull, os.O_RDWR)
         for nb_proc,subdir in enumerate(subproc):
             subdir = subdir.strip()
             Pdir = pjoin(self.me_dir, 'SubProcesses',subdir)
@@ -2053,7 +2061,6 @@
                 if os.path.basename(match)[:4] in ['ajob', 'wait', 'run.', 'done']:
                     os.remove(pjoin(Pdir, match))
             
-            devnull = os.open(os.devnull, os.O_RDWR)
             proc = subprocess.Popen([pjoin(bindir, 'gen_ximprove')],
                                     stdout=devnull,
                                     stdin=subprocess.PIPE,
@@ -2118,6 +2125,7 @@
         # Define The Banner
         tag = self.run_card['run_tag']
         self.banner.load_basic(self.me_dir)
+        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))
         self.banner.write(pjoin(self.me_dir, 'Events', self.run_name, 
@@ -2136,9 +2144,9 @@
         #                     'unweighted_events.lhe', 'banner.txt'],
         #                    cwd=pjoin(self.me_dir, 'Events'))
         
-        eradir = self.configuration['exrootanalysis_path']
-        madir = self.configuration['madanalysis_path']
-        td = self.configuration['td_path']
+        eradir = self.options['exrootanalysis_path']
+        madir = self.options['madanalysis_path']
+        td = self.options['td_path']
         if eradir and misc.is_executable(pjoin(eradir,'ExRootLHEFConverter'))  and\
            os.path.exists(pjoin(self.me_dir, 'Events', 'unweighted_events.lhe')):
                 if not os.path.exists(pjoin(self.me_dir, 'Events', self.run_name)):
@@ -2191,6 +2199,16 @@
                         files.mv(input, output) 
                         subprocess.call(['gzip', output], stdout=devnull, 
                                         stderr=devnull, cwd=G_path)
+        
+        # 2) restore links in local this is require due to chrome over-security
+        if not self.web: 
+            results = pjoin(self.me_dir, 'HTML', run, 'results.html')
+            text = open(results).read()
+            text = text.replace('''if ( ! UrlExists(alt)){
+         obj.href = alt;''','''if ( ! UrlExists(alt)){
+         obj.href = url;''')
+            open(results, 'w').write(text)
+            
         # 3) Update the index.html
         subprocess.call(['%s/gen_cardhtml-pl' % self.dirbin],
                             cwd=pjoin(self.me_dir))
@@ -2274,7 +2292,7 @@
          
         #self.exec_cmd('remove %s pythia -f' % self.run_name)
         
-        pythia_src = pjoin(self.configuration['pythia-pgs_path'],'src')
+        pythia_src = pjoin(self.options['pythia-pgs_path'],'src')
         
         self.update_status('Running Pythia', 'pythia')
         try:
@@ -2317,10 +2335,10 @@
             cs_info = cs_info.split(':')[1]
             self.results.add_detail('cross_pythia', cs_info)
         
-        pydir = pjoin(self.configuration['pythia-pgs_path'], 'src')
-        eradir = self.configuration['exrootanalysis_path']
-        madir = self.configuration['madanalysis_path']
-        td = self.configuration['td_path']
+        pydir = pjoin(self.options['pythia-pgs_path'], 'src')
+        eradir = self.options['exrootanalysis_path']
+        madir = self.options['madanalysis_path']
+        td = self.options['td_path']
         
         
         self.banner.add(pjoin(self.me_dir, 'Cards','pythia_card.dat'))
@@ -2387,7 +2405,7 @@
         
         self.update_status('finish', level='pythia', makehtml=False)
         self.exec_cmd('pgs --no_default', postcmd=False, printcmd=False)
-        if self.configuration['delphes_path']:
+        if self.options['delphes_path']:
             self.exec_cmd('delphes --no_default', postcmd=False, printcmd=False)
     
     def get_available_tag(self):
@@ -2557,16 +2575,16 @@
         self.check_plot(args)
         logger.info('plot for run %s' % self.run_name)
         
-        self.edit_one_card('plot_card.dat', args)
+        self.ask_edit_cards([], args)
                 
         if any([arg in ['all','parton'] for arg in args]):
-            filename = pjoin(self.me_dir, 'Events','%s_unweighted_events.lhe' % self.run_name)
+            filename = pjoin(self.me_dir, 'Events', self.run_name, 'unweighted_events.lhe')
             if os.path.exists(filename+'.gz'):
                 os.system('gunzip -f %s' % (filename+'.gz') )
             if  os.path.exists(filename):
-                shutil.move(filename, pjoin(self.me_dir, 'Events','unweighted_events.lhe'))
+                shutil.move(filename, pjoin(self.me_dir, 'Events', 'unweighted_events.lhe'))
                 self.create_plot('parton')
-                shutil.move(pjoin(self.me_dir, 'Events','unweighted_events.lhe'), filename)
+                shutil.move(pjoin(self.me_dir, 'Events', 'unweighted_events.lhe'), filename)
                 os.system('gzip -f %s' % filename)
             else:
                 logger.info('No valid files for partonic plot') 
@@ -2678,10 +2696,10 @@
         if hasattr(self, 'control_thread') and self.control_thread[0]:
             self.monitor(mode=2,html=False)
 
-        pgsdir = pjoin(self.configuration['pythia-pgs_path'], 'src')
-        eradir = self.configuration['exrootanalysis_path']
-        madir = self.configuration['madanalysis_path']
-        td = self.configuration['td_path']
+        pgsdir = pjoin(self.options['pythia-pgs_path'], 'src')
+        eradir = self.options['exrootanalysis_path']
+        madir = self.options['madanalysis_path']
+        td = self.options['td_path']
         
         # Compile pgs if not there       
         if not misc.is_executable(pjoin(pgsdir, 'pgs')):
@@ -2788,7 +2806,9 @@
             files.cp(pjoin(self.me_dir, 'Cards', 'delphes_card_default.dat'),
                      pjoin(self.me_dir, 'Cards', 'delphes_card.dat'))
             logger.info('No delphes card found. Take the default one.')
-
+        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):
             self.ask_edit_cards(['delphes', 'trigger'], args)
             
@@ -2799,7 +2819,7 @@
 
 
  
-        delphes_dir = self.configuration['delphes_path']
+        delphes_dir = self.options['delphes_path']
         tag = self.run_tag
         self.banner.add(pjoin(self.me_dir, 'Cards','delphes_card.dat'))
         self.banner.add(pjoin(self.me_dir, 'Cards','delphes_trigger.dat'))
@@ -2830,9 +2850,9 @@
             target = pjoin(self.me_dir,'Events', self.run_name, "%s_delphes_events.root" % tag)
             files.mv(source, target)
             
-        #eradir = self.configuration['exrootanalysis_path']
-        madir = self.configuration['madanalysis_path']
-        td = self.configuration['td_path']
+        #eradir = self.options['exrootanalysis_path']
+        madir = self.options['madanalysis_path']
+        td = self.options['td_path']
 
         # Creating plots
         self.create_plot('Delphes')
@@ -3008,9 +3028,9 @@
         else:
             self.configured = time.time()
         self.update_status('compile directory', level=None)
-        if self.configuration['automatic_html_opening']:
+        if self.options['automatic_html_opening']:
             misc.open_file(os.path.join(self.me_dir, 'crossx.html'))
-            self.configuration['automatic_html_opening'] = False
+            self.options['automatic_html_opening'] = False
             #open only once the web page
         # Change current working directory
         self.launching_dir = os.getcwd()
@@ -3039,16 +3059,18 @@
             raise MadEventError, 'Impossible to compile'
         
         # set random number
-        if os.path.exists(pjoin(self.me_dir,'SubProcesses','randinit')):
+        if self.run_card['iseed'] != '0':
+            self.random = int(self.run_card['iseed'])
+        elif os.path.exists(pjoin(self.me_dir,'SubProcesses','randinit')):
             for line in open(pjoin(self.me_dir,'SubProcesses','randinit')):
                 data = line.split('=')
                 assert len(data) ==2
                 self.random = int(data[1])
                 break
         else:
-            self.random = random.randint(1, 30107) 
-                                                   
-        if self.run_card['ickkw'] == 2:
+            self.random = random.randint(1, 30107)
+                                                               
+        if self.run_card['ickkw'] == '2':
             logger.info('Running with CKKW matching')
             self.treat_CKKW_matching()
             
@@ -3086,7 +3108,8 @@
         upgrade_tag = {'parton': ['parton','pythia','pgs','delphes'],
                        'pythia': ['pythia','pgs','delphes'],
                        'pgs': ['pgs'],
-                       'delphes':['delphes']}
+                       'delphes':['delphes'],
+                       'plot':[]}
         
         
 
@@ -3184,7 +3207,7 @@
         proc = []
         for line in open(os.path.join(self.me_dir,'Cards','proc_card_mg5.dat')):
             line = line.split('#')[0]
-            line = line.split('=')[0]
+            #line = line.split('=')[0]
             if line.startswith('import') and 'model' in line:
                 model = line.split()[2]   
                 proc = []
@@ -3319,7 +3342,7 @@
         """create the LHE root file """
         self.update_status('Creating root files', level='parton')
 
-        eradir = self.configuration['exrootanalysis_path']
+        eradir = self.options['exrootanalysis_path']
         subprocess.call(['%s/ExRootLHEFConverter' % eradir, 
                              input, output],
                             cwd=pjoin(self.me_dir, 'Events'))
@@ -3328,8 +3351,8 @@
     def create_plot(self, mode='parton', event_path=None, output=None):
         """create the plot""" 
 
-        madir = self.configuration['madanalysis_path']
-        td = self.configuration['td_path']
+        madir = self.options['madanalysis_path']
+        td = self.options['td_path']
         if not madir or not  td or \
             not os.path.exists(pjoin(self.me_dir, 'Cards', 'plot_card.dat')):
             return False
@@ -3395,17 +3418,32 @@
         
         return True   
 
+    
+    def clean_pointless_card(self, mode):
+        """ Clean the pointless card """
+        if mode == 'parton':
+            if os.path.exists(pjoin(self.me_dir,'Cards','pythia_card.dat')):
+                os.remove(pjoin(self.me_dir,'Cards','pythia_card.dat'))
+        elif mode in ['parton', 'pythia', 'delphes']:
+            if os.path.exists(pjoin(self.me_dir,'Cards','pgs_card.dat')):
+                    os.remove(pjoin(self.me_dir,'Cards','pgs_card.dat'))
+        elif mode in ['pythia', 'pgs']:
+            if os.path.exists(pjoin(self.me_dir,'Cards','delphes_card.dat')):
+                    os.remove(pjoin(self.me_dir,'Cards','delphes_card.dat'))
+            if os.path.exists(pjoin(self.me_dir,'Cards','delphes_trigger.dat')):
+                    os.remove(pjoin(self.me_dir,'Cards','delphes_trigger.dat'))
+
 
     ############################################################################
     def ask_run_configuration(self, mode=None, force=False):
         """Ask the question when launching generate_events/multi_run"""
         
         available_mode = ['0', '1']
-        if self.configuration['pythia-pgs_path']:
+        if self.options['pythia-pgs_path']:
             available_mode.append('2')
             available_mode.append('3')
 
-            if self.configuration['delphes_path']:
+            if self.options['delphes_path']:
                 available_mode.append('4')
         
         if len(available_mode) == 2:
@@ -3442,24 +3480,8 @@
                 else: 
                     mode = 'pythia'
         logger.info('Will run in mode %s' % mode)
-        
-        def clean_pointless_card(mode):
-            """ Clean the pointless card """
-            if mode == 'parton':
-                if os.path.exists(pjoin(self.me_dir,'Cards','pythia_card.dat')):
-                    os.remove(pjoin(self.me_dir,'Cards','pythia_card.dat'))
-                if os.path.exists(pjoin(self.me_dir,'Cards','pgs_card.dat')):
-                    os.remove(pjoin(self.me_dir,'Cards','pgs_card.dat'))
-                if os.path.exists(pjoin(self.me_dir,'Cards','delphes_card.dat')):
-                    os.remove(pjoin(self.me_dir,'Cards','delphes_card.dat'))
-            elif mode == 'pgs':
-                if os.path.exists(pjoin(self.me_dir,'Cards','delphes_card.dat')):
-                    os.remove(pjoin(self.me_dir,'Cards','delphes_card.dat'))
-            elif mode == 'delphes':
-                if os.path.exists(pjoin(self.me_dir,'Cards','pgs_card.dat')):
-                    os.remove(pjoin(self.me_dir,'Cards','pgs_card.dat'))
-                                                             
-        clean_pointless_card(mode)
+                                                                     
+        self.clean_pointless_card(mode)
         # Now that we know in which mode we are check that all the card
         #exists (copy default if needed)
 
@@ -3472,6 +3494,7 @@
             cards.append('pgs_card.dat')
         elif mode == 'delphes':
             self.add_card_to_run('delphes')
+            self.add_card_to_run('trigger')
             cards.append('delphes_card.dat')
 
         if force:
@@ -3499,7 +3522,7 @@
                 possible_answer.append('delphes')
                 possible_answer.append(6)
                 possible_answer.append('trigger')
-            if self.configuration['madanalysis_path']:
+            if self.options['madanalysis_path']:
                 question += '  9 / plot    : plot_card.dat\n'
                 possible_answer.append(9)
                 possible_answer.append('plot')
@@ -3518,8 +3541,12 @@
                 answer = card[int(answer)]
             if answer == 'done':
                 return
-            if not os.path.exists(answer):
-                path = pjoin(self.me_dir,'Cards','%s_card.dat' % answer)
+            if not os.path.isfile(answer):
+                if answer != 'trigger':
+                    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
@@ -3550,7 +3577,7 @@
         """Ask the question when launching pythia"""
         
         available_mode = ['0', '1', '2']
-        if self.configuration['delphes_path']:
+        if self.options['delphes_path']:
                 available_mode.append('3')
         name = {'0': 'auto', '1': 'pythia', '2':'pgs', '3':'delphes'}
         options = available_mode + [name[val] for val in available_mode]
@@ -3579,14 +3606,8 @@
                 mode = 'pythia'
         logger.info('Will run in mode %s' % mode)
         
-        # Clean the pointless card
-        if mode == 'pgs':
-            if os.path.exists(pjoin(self.me_dir,'Cards','delphes_card.dat')):
-                os.remove(pjoin(self.me_dir,'Cards','delphes_card.dat'))
-        if mode == 'delphes':
-            if os.path.exists(pjoin(self.me_dir,'Cards','pgs_card.dat')):
-                os.remove(pjoin(self.me_dir,'Cards','pgs_card.dat'))                                         
-         
+        self.clean_pointless_card(mode)
+                                                 
         # Now that we know in which mode we are check that all the card
         #exists (copy default if needed)
         
@@ -3597,6 +3618,7 @@
             cards.append('pgs_card.dat')
         if mode == 'delphes':
             self.add_card_to_run('delphes')
+            self.add_card_to_run('trigger')
             cards.append('delphes_card.dat')
         
         if force:
@@ -3622,7 +3644,7 @@
              possible_answer.append('trigger')
              card[2] = 'delphes'
              card[3] = 'trigger'
-        if self.configuration['madanalysis_path']:
+        if self.options['madanalysis_path']:
              question += '  9 / plot : plot_card.dat\n'
              possible_answer.append(9)
              possible_answer.append('plot')
@@ -3638,7 +3660,7 @@
                  answer = card[int(answer)]
              if answer == 'done':
                  return
-             if os.path.exists(answer):
+             if os.path.isfile(answer):
                  # detect which card is provide
                  card_name = self.detect_card_type(answer)
                  if card_name == 'unknown':
@@ -3649,7 +3671,10 @@
                  logger.info('copy %s as %s' % (answer, card_name))
                  files.cp(answer, pjoin(self.me_dir, 'Cards', card_name))
                  continue
-             path = pjoin(self.me_dir,'Cards','%s_card.dat' % answer)
+             if answer != 'trigger':
+                 path = pjoin(self.me_dir,'Cards','%s_card.dat' % answer)
+             else:
+                 path = pjoin(self.me_dir,'Cards','delphes_trigger.dat')
              self.exec_cmd('open %s' % path)                    
                  
         return mode
@@ -3677,7 +3702,7 @@
             question += '  %s / %-9s : %s\n' % (i+1, mode, card_name[mode])
             card[i+1] = mode
         
-        if self.configuration['madanalysis_path']:
+        if self.options['madanalysis_path']:
              question += '  9 / %-9s : plot_card.dat\n' % 'plot'
              possible_answer.append(9)
              possible_answer.append('plot')
@@ -3694,7 +3719,7 @@
                  answer = card[int(answer)]
              if answer == 'done':
                  return
-             if os.path.exists(answer):
+             if os.path.isfile(answer):
                  # detect which card is provide
                  card_name = self.detect_card_type(answer)
                  if card_name == 'unknown':
@@ -3704,7 +3729,10 @@
                  logger.info('copy %s as %s' % (answer, card_name))
                  files.cp(answer, pjoin(self.me_dir, 'Cards', card_name))
                  continue
-             path = pjoin(self.me_dir,'Cards','%s_card.dat' % answer)
+             if answer != 'trigger':
+                 path = pjoin(self.me_dir,'Cards','%s_card.dat' % answer)
+             else:
+                 path = pjoin(self.me_dir,'Cards','delphes_trigger.dat')
              self.exec_cmd('open %s' % path)                    
                  
         return mode
@@ -3728,9 +3756,14 @@
         """ensure that card name is define. If not use the default one"""
         dico = {'dir': self.me_dir, 'name': name }
 
-        if not os.path.exists('%(dir)s/Cards/%(name)s_card.dat' % dico):
-            files.cp('%(dir)s/Cards/%(name)s_card_default.dat' % dico,
-                '%(dir)s/Cards/%(name)s_card.dat' % dico)
+        if name != 'trigger':
+            if not os.path.isfile('%(dir)s/Cards/%(name)s_card.dat' % dico):
+                files.cp('%(dir)s/Cards/%(name)s_card_default.dat' % dico,
+                         '%(dir)s/Cards/%(name)s_card.dat' % dico)
+        else:
+            if not os.path.isfile('%(dir)s/Cards/delphes_trigger.dat' % dico):
+                files.cp('%(dir)s/Cards/delphes_trigger_default.dat' % dico,
+                         '%(dir)s/Cards/delphes_trigger.dat' % dico) 
             
     @staticmethod
     def detect_card_type(path):
@@ -3879,7 +3912,7 @@
         MadEventCmd.__init__(self, me_dir, *completekey, **stdin)
         self.run_mode = 0
         self.random = seed
-        self.configuration['automatic_html_opening'] = False
+        self.options['automatic_html_opening'] = False
         # Now it's time to run!
         if me_dir and nb_event and seed:
             self.launch(nb_event, seed)
@@ -3910,6 +3943,7 @@
         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):
         """Special refine for gridpack run."""

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2012-02-21 23:49:21 +0000
+++ madgraph/interface/madgraph_interface.py	2012-03-09 00:04:18 +0000
@@ -54,7 +54,6 @@
 import madgraph.iolibs.files as files
 import madgraph.iolibs.group_subprocs as group_subprocs
 import madgraph.iolibs.import_v4 as import_v4
-import madgraph.iolibs.misc as misc
 import madgraph.iolibs.save_load_object as save_load_object
 
 import madgraph.interface.extended_cmd as cmd
@@ -64,6 +63,8 @@
 
 import madgraph.various.process_checks as process_checks
 import madgraph.various.banner as banner_module
+import madgraph.various.misc as misc
+import madgraph.various.cluster as cluster
 
 import models as ufomodels
 import models.import_ufo as import_ufo
@@ -220,7 +221,7 @@
 #===============================================================================
 # HelpToCmd
 #===============================================================================
-class HelpToCmd(object):
+class HelpToCmd(cmd.HelpCmd):
     """ The Series of help routine for the MadGraphCmd"""    
     
     def help_save(self):
@@ -402,13 +403,12 @@
         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.")
-        
 
 
 #===============================================================================
 # CheckValidForCmd
 #===============================================================================
-class CheckValidForCmd(object):
+class CheckValidForCmd(cmd.CheckCmd):
     """ The Series of help routine for the MadGraphCmd"""
     
     class RWError(MadGraph5Error):
@@ -664,14 +664,12 @@
             return self.InvalidCmd, 'Invalid Syntax: Too many argument'
         
         # search for a valid path
-        if os.path.sep in args[0] and os.path.isdir(args[0]):
-            path = args[0]
+        if os.path.isdir(args[0]):
+            path = os.path.realpath(args[0])
         elif os.path.isdir(pjoin(MG5DIR,args[0])):
             path = pjoin(MG5DIR,args[0])
         elif  MG4DIR and os.path.isdir(pjoin(MG4DIR,args[0])):
             path = pjoin(MG4DIR,args[0])
-        elif os.path.isdir(args[0]):
-            path = os.path.realpath(args[0])
         else:    
             raise self.InvalidCmd, '%s is not a valid directory' % args[0]
                 
@@ -753,6 +751,9 @@
         
     def check_save(self, args):
         """ check the validity of the line"""
+        if len(args) == 0:
+            args.append('options')
+        
         if args[0] not in self._save_opts:
             self.help_save()
             raise self.InvalidCmd('wrong \"save\" format')
@@ -778,7 +779,7 @@
             raise self.InvalidCmd('set needs an option and an argument')
 
         if args[0] not in self._set_options:
-            if not args[0] in self._options and not args[0] in self.configuration:
+            if not args[0] in self.options and not args[0] in self.options:
                 self.help_set()
                 raise self.InvalidCmd('Possible options for set are %s' % \
                                   self._set_options)
@@ -871,8 +872,8 @@
             elif path != 'auto':
                 self._export_dir = path
             elif path == 'auto':
-                if self.configuration['pythia8_path']:
-                    self._export_dir = self.configuration['pythia8_path']
+                if self.options['pythia8_path']:
+                    self._export_dir = self.options['pythia8_path']
                 else:
                     self._export_dir = '.'
         else:
@@ -880,8 +881,8 @@
                 # No valid path
                 self.get_default_path()
             else:
-                if self.configuration['pythia8_path']:
-                    self._export_dir = self.configuration['pythia8_path']
+                if self.options['pythia8_path']:
+                    self._export_dir = self.options['pythia8_path']
                 else:
                     self._export_dir = '.'
                     
@@ -926,8 +927,8 @@
             auto_path = lambda i: pjoin(self.writing_dir,
                                                name_dir(i))
         elif self._export_format == 'pythia8':
-            if self.configuration['pythia8_path']:
-                self._export_dir = self.configuration['pythia8_path']
+            if self.options['pythia8_path']:
+                self._export_dir = self.options['pythia8_path']
             else:
                 self._export_dir = '.'
             return
@@ -1043,7 +1044,7 @@
 #===============================================================================
 # CompleteForCmd
 #===============================================================================
-class CompleteForCmd(object):
+class CompleteForCmd(cmd.CompleteCmd):
     """ The Series of help routine for the MadGraphCmd"""
     
  
@@ -1336,7 +1337,7 @@
 
         # Format
         if len(args) == 1:
-            opts = self._set_options + self._options.keys() + self.configuration.keys()
+            opts = self.options.keys() 
             return self.list_completion(text, opts)
 
         if len(args) == 2:
@@ -1356,7 +1357,7 @@
             elif args[1] == 'run_mode':
                 return self.list_completion(text, [str(i) for i in range(3)])
             elif args[1] == 'cluster_type':
-                return self.list_completion(text, ['pbs', 'condor', 'sge'])
+                return self.list_completion(text, cluster.from_name.keys())
             elif args[1] == 'cluster_queue':
                 return []
             elif args[1] == 'automatic_html_opening':
@@ -1548,7 +1549,7 @@
 #===============================================================================
 # MadGraphCmd
 #===============================================================================
-class MadGraphCmd(CmdExtended, HelpToCmd, CheckValidForCmd, CompleteForCmd):
+class MadGraphCmd(HelpToCmd, CheckValidForCmd, CompleteForCmd, CmdExtended):
     """The command line processor of MadGraph"""    
 
     writing_dir = '.'
@@ -1610,7 +1611,7 @@
 
         # Variables to store state information
         self._multiparticles = {}
-        self._options = {}
+        self.options = {}
         self._generate_info = "" # store the first generated process
         self._model_v4_path = None
         self._use_lower_part_names = False
@@ -1618,11 +1619,7 @@
         self._export_format = 'madevent'
         self._mgme_dir = MG4DIR
         self._comparisons = None
-    
-        # Set defaults for options
-        self._options['group_subprocesses'] = 'Auto'
-        self._options['ignore_six_quark_processes'] = False
-        
+            
         # Load the configuration file
         self.set_configuration()
 
@@ -1678,13 +1675,13 @@
             cpu_time1 = time.time()
 
             # Generate processes
-            if self._options['group_subprocesses'] == 'Auto':
+            if self.options['group_subprocesses'] == 'Auto':
                     collect_mirror_procs = True
             else:
-                collect_mirror_procs = self._options['group_subprocesses']
+                collect_mirror_procs = self.options['group_subprocesses']
             ignore_six_quark_processes = \
-                           self._options['ignore_six_quark_processes'] if \
-                           "ignore_six_quark_processes" in self._options \
+                           self.options['ignore_six_quark_processes'] if \
+                           "ignore_six_quark_processes" in self.options \
                            else []
 
             myproc = diagram_generation.MultiProcess(myprocdef,
@@ -1901,15 +1898,31 @@
                 print 'No couplings information available in V4 model'
                 return
             text = ''
-            try:
-                ufomodel = ufomodels.load_model(self._curr_model.get('name'))
-            except:
-                raise self.InvalidCmd, 'no couplings %s in current model' % args[1]
-            for coup in ufomodel.all_couplings:
-                order = ', '.join(['%s=%s' %val for val in coup.order.items()])
-                text += '%s = %s\t( %s)\n' % (coup.name, coup.value, order)
+            text = "Current model contains %i couplings\n" % \
+                    sum([len(part) for part in 
+                                        self._curr_model['couplings'].values()])
+            keys = self._curr_model['couplings'].keys()
+            def key_sort(x, y):
+                if ('external',) == x:
+                    return -1
+                elif ('external',) == y:
+                    return +1
+                elif  len(x) < len(y):
+                    return -1
+                else:
+                    return 1
+            keys.sort(key_sort)
+            for key in keys:
+                item = self._curr_model['couplings'][key]
+                text += '\ncouplings type: %s\n' % str(key)
+                for value in item:
+                    if value.value is not None:
+                        text+= '        %s = %s = %s\n' % (value.name, value.expr ,value.value)
+                    else:
+                        text+= '        %s = %s\n' % (value.name, value.expr)
+
             pydoc.pager(text)
-            
+                    
         elif args[0] == 'couplings':
             if self._model_v4_path:
                 print 'No couplings information available in V4 model'
@@ -2196,13 +2209,20 @@
                 if len(forbidden_particles_re.groups()) > 2:
                     line = line + forbidden_particles_re.group(3)
 
-        # Now check for forbidden schannels, specified using "$"
-        forbidden_schannels_re = re.match("^(.+)\s*\$\s*(.+)\s*$", line)
+        # Now check for forbidden schannels, specified using "$$"
+        forbidden_schannels_re = re.match("^(.+)\s*\$\s*\$\s*(.+)\s*$", line)
         forbidden_schannels = ""
         if forbidden_schannels_re:
             forbidden_schannels = forbidden_schannels_re.group(2)
             line = forbidden_schannels_re.group(1)
 
+        # Now check for forbidden onshell schannels, specified using "$"
+        forbidden_onsh_schannels_re = re.match("^(.+)\s*\$\s*(.+)\s*$", line)
+        forbidden_onsh_schannels = ""
+        if forbidden_onsh_schannels_re:
+            forbidden_onsh_schannels = forbidden_onsh_schannels_re.group(2)
+            line = forbidden_onsh_schannels_re.group(1)
+
         # Now check for required schannels, specified using "> >"
         required_schannels_re = re.match("^(.+?)>(.+?)>(.+)$", line)
         required_schannels = ""
@@ -2254,8 +2274,15 @@
                 raise self.InvalidCmd,\
                       "Multiparticle %s is or-multiparticle" % part_name + \
                       " which can be used only for required s-channels"
+            forbidden_onsh_schannel_ids = \
+                              self.extract_particle_ids(forbidden_onsh_schannels)
             forbidden_schannel_ids = \
                               self.extract_particle_ids(forbidden_schannels)
+            if forbidden_onsh_schannel_ids and \
+               isinstance(forbidden_onsh_schannel_ids[0], list):
+                raise self.InvalidCmd,\
+                      "Multiparticle %s is or-multiparticle" % part_name + \
+                      " which can be used only for required s-channels"
             if forbidden_schannel_ids and \
                isinstance(forbidden_schannel_ids[0], list):
                 raise self.InvalidCmd,\
@@ -2274,7 +2301,9 @@
                               'id': proc_number,
                               'orders': orders,
                               'forbidden_particles': forbidden_particle_ids,
-                              'forbidden_s_channels': forbidden_schannel_ids,
+                              'forbidden_onsh_s_channels': forbidden_onsh_schannel_ids,
+                              'forbidden_s_channels': \
+                                                forbidden_schannel_ids,
                               'required_s_channels': required_schannel_ids,
                               'overall_orders': overall_orders
                               })
@@ -2684,7 +2713,8 @@
         else:
             subprocess.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 = subprocess.call(['tar', '-xzpvf', '%s.tgz' % name], cwd=MG5DIR, 
+                                     stdout=open(os.devnull, 'w'))
         if returncode:
             raise MadGraph5Error, 'Fail to download correctly the File. Stop'
         
@@ -2721,8 +2751,12 @@
                 text = text.replace('FC=g77','FC=gfortran')
                 open(path, 'w').writelines(text)            
         
-        subprocess.call(['make', 'clean'], cwd = os.path.join(MG5DIR, name))
-        status = subprocess.call(['make'], cwd = os.path.join(MG5DIR, name))
+        if logger.level <= logging.INFO: 
+            subprocess.call(['make', 'clean'], )
+            status = subprocess.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')
 
@@ -2759,13 +2793,15 @@
         """ assign all configuration variable from file 
             ./input/mg5_configuration.txt. assign to default if not define """
             
-        self.configuration = {'pythia8_path': './pythia8',
+        self.options = {'pythia8_path': './pythia8',
                               'web_browser':None,
                               'eps_viewer':None,
                               'text_editor':None,
                               'fortran_compiler':None,
-                              'automatic_html_opening':True}
-        
+                              'automatic_html_opening':True,
+                              'group_subprocesses': 'Auto',
+                              'ignore_six_quark_processes': False}
+                
         if not config_path:
             try:
                 config_file = open(pjoin(os.environ['HOME'],'.mg5', 'mg5_configuration.txt'))
@@ -2788,25 +2824,25 @@
             else:
                 name = name.strip()
                 value = value.strip()
-                self.configuration[name] = value
+                self.options[name] = value
                 if value.lower() == "none":
-                    self.configuration[name] = None
+                    self.options[name] = None
 
         if test:
-            return self.configuration
+            return self.options
 
         # Treat each expected input
         # 1: Pythia8_path
         # try relative path
-        for key in self.configuration:
+        for key in self.options:
             if key == 'pythia8_path':
-                if self.configuration['pythia8_path'] in ['None', None]:
-                    self.configuration['pythia8_path'] = None
+                if self.options['pythia8_path'] in ['None', None]:
+                    self.options['pythia8_path'] = None
                     continue
-                pythia8_dir = pjoin(MG5DIR, self.configuration['pythia8_path'])
+                pythia8_dir = pjoin(MG5DIR, self.options['pythia8_path'])
                 if not os.path.isfile(pjoin(pythia8_dir, 'include', 'Pythia.h')):
-                    if not os.path.isfile(pjoin(self.configuration['pythia8_path'], 'include', 'Pythia.h')):
-                       self.configuration['pythia8_path'] = None
+                    if not os.path.isfile(pjoin(self.options['pythia8_path'], 'include', 'Pythia.h')):
+                       self.options['pythia8_path'] = None
                     else:
                         continue
                     
@@ -2817,16 +2853,16 @@
             elif key not in ['text_editor','eps_viewer','web_browser']:
                 # Default: try to set parameter
                 try:
-                    self.do_set("%s %s" % (key, self.configuration[key]), log=False)
+                    self.do_set("%s %s" % (key, self.options[key]), log=False)
                 except MadGraph5Error, error:
                     print error
                     logger.warning("Option %s from config file not understood" \
                                    % key)
         
         # Configure the way to open a file:
-        launch_ext.open_file.configure(self.configuration)
+        launch_ext.open_file.configure(self.options)
           
-        return self.configuration
+        return self.options
      
     def check_for_export_dir(self, filepath):
         """Check if the files is in a valid export directory and assign it to
@@ -2886,16 +2922,16 @@
             
             if len(generate_info.split('>')[0].strip().split())>1:
                 ext_program = launch_ext.MELauncher(args[1], self.timeout, self,
-                                pythia=self.configuration['pythia-pgs_path'],
-                                delphes=self.configuration['delphes_path'],
+                                pythia=self.options['pythia-pgs_path'],
+                                delphes=self.options['delphes_path'],
                                 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.configuration['pythia-pgs_path'],
-                                delphes=self.configuration['delphes_path'],
+                                pythia=self.options['pythia-pgs_path'],
+                                delphes=self.options['delphes_path'],
                                 shell = hasattr(self, 'do_shell'),
                                 **options)
 
@@ -3002,53 +3038,8 @@
                 raise self.InvalidCmd('No processes to save!')
         
         elif args[0] == 'options':
-            self.write_configuration(args[1])
-    
-    
-    def write_configuration(self, path):
-        """Write the configuration file"""
-        # We use the default configuration file as a template.
-        # to ensure that all configuration information are written we 
-        # keep track of all key that we need to write.
+            CmdExtended.do_save(self, line)
 
-        to_write = self._options.keys()[:] + self.configuration.keys()[:]
-        writer = open(path,'w')
-        # Use local configuration => Need to update the path
-        conf = os.path.join(MG5DIR, 'input', 'mg5_configuration.txt')
-        for line in file(conf):
-            if '#' in line:
-                data, comment = line.split('#',1)
-            else: 
-                data, comment = line, ''
-            data = data.split('=')
-            if len(data) !=2:
-                writer.writelines(line)
-                continue
-            key = data[0].strip()
-            if key in self._options:
-                value = str(self._options[key])
-            elif key in self.configuration:
-                value = str(self.configuration[key])
-            else:
-                value = data[1].strip()
-            try:
-                to_write.remove(key)
-            except:
-                pass
-            if '_path' in key:       
-                # special case need to update path
-                # check if absolute path
-                if value.startswith('./'):
-                    value = os.path.realpath(os.path.join(MG5DIR, value))
-            writer.writelines('%s = %s # %s \n' % (key, value, comment))
-        for key in to_write:
-            if key in self._options:
-                writer.writelines('%s = %s \n' % (key,self._options[key]))
-            else:
-                writer.writelines('%s = %s \n' % (key,self.configuration[key]))
-                
-        writer.close()
-    
     
     # Set an option
     def do_set(self, line, log=True):
@@ -3062,9 +3053,9 @@
 
         if args[0] == 'ignore_six_quark_processes':
             if args[1] == 'False':
-                self._options[args[0]] = False
+                self.options[args[0]] = False
                 return
-            self._options[args[0]] = list(set([abs(p) for p in \
+            self.options[args[0]] = list(set([abs(p) for p in \
                                       self._multiparticles[args[1]]\
                                       if self._curr_model.get_particle(p).\
                                       is_fermion() and \
@@ -3074,16 +3065,16 @@
                 logger.info('Ignore processes with >= 6 quarks (%s)' % \
                         ",".join([\
                             self._curr_model.get_particle(q).get('name') \
-                            for q in self._options[args[0]]]))
+                            for q in self.options[args[0]]]))
             
         elif args[0] == 'group_subprocesses':
             if args[1] != 'Auto':
-                self._options[args[0]] = eval(args[1])
+                self.options[args[0]] = eval(args[1])
             else:
-                self._options[args[0]] = 'Auto'
+                self.options[args[0]] = 'Auto'
             if log:
                 logger.info('Set group_subprocesses to %s' % \
-                        str(self._options[args[0]]))
+                        str(self.options[args[0]]))
                 logger.info('Note that you need to regenerate all processes')
             self._curr_amps = diagram_generation.AmplitudeList()
             self._curr_matrix_elements = helas_objects.HelasMultiProcess()
@@ -3098,19 +3089,19 @@
             if args[1] != 'None':
                 if log:
                     logger.info('set fortran compiler to %s' % args[1])
-                self.configuration['fortran_compiler'] = args[1]
+                self.options['fortran_compiler'] = args[1]
             else:
-                self.configuration['fortran_compiler'] = None
-        elif args[0] in self._options:
+                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])
+                self.options[args[0]] = eval(args[1])
             else:
-                self._options[args[0]] = args[1] 
-        elif args[0] in self.configuration:
+                self.options[args[0]] = args[1] 
+        elif args[0] in self.options:
             if args[1] in ['None','True','False']:
-                self.configuration[args[0]] = eval(args[1])
+                self.options[args[0]] = eval(args[1])
             else:
-                self.configuration[args[0]] = args[1]             
+                self.options[args[0]] = args[1]             
 
     
     def do_open(self, line):
@@ -3157,8 +3148,8 @@
         #check if we need to group processes
         group_subprocesses = False
         if self._export_format == 'madevent' and \
-                                            self._options['group_subprocesses']:
-                if self._options['group_subprocesses'] is True:
+                                            self.options['group_subprocesses']:
+                if self.options['group_subprocesses'] is True:
                     group_subprocesses = True
                 elif self._curr_amps[0].get_ninitial()  == 2:
                     group_subprocesses = True
@@ -3216,9 +3207,9 @@
 
             # Check if we need to group the SubProcesses or not
             group = True
-            if self._options['group_subprocesses'] is False:
+            if self.options['group_subprocesses'] is False:
                 group = False
-            elif self._options['group_subprocesses'] == 'Auto' and \
+            elif self.options['group_subprocesses'] == 'Auto' and \
                                          self._curr_amps[0].get_ninitial() == 1:
                    group = False 
 
@@ -3440,6 +3431,11 @@
                                             wanted_couplings)
             export_cpp.make_model_cpp(self._export_dir)
 
+        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)
+
         if self._export_format in ['madevent', 'standalone']:
             
             self._curr_exporter.finalize_v4_directory( \
@@ -3448,15 +3444,12 @@
                                            self.history,
                                            not nojpeg,
                                            online,
-                                           self.configuration['fortran_compiler'])
+                                           self.options['fortran_compiler'])
 
         if self._export_format in ['madevent', 'standalone', 'standalone_cpp']:
             logger.info('Output to directory ' + self._export_dir + ' done.')
-        if 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)
-            
+
+        if self._export_format == 'madevent':              
             logger.info('Type \"launch\" to generate events from this process, or see')
             logger.info(self._export_dir + '/README')
             logger.info('Run \"open index.html\" to see more information about this process.')
@@ -3479,7 +3472,7 @@
                 last_action_2 = '%s %s' % (last_action, args[1])
             else: 
                 last_action_2 = 'none'
-        
+                
 #===============================================================================
 # Command Parser
 #=============================================================================== 

=== modified file 'madgraph/interface/master_interface.py'
--- madgraph/interface/master_interface.py	2012-02-21 23:49:21 +0000
+++ madgraph/interface/master_interface.py	2012-03-09 00:04:18 +0000
@@ -47,6 +47,15 @@
 
 class Switcher(object):
     """ Helping class containing all the switching routine """
+
+    def __init__(self, main='MadGraph', *args, **opt):
+            
+        # define the interface
+        self.change_principal_cmd(main)
+        self.cmd.__init__(self, *args, **opt)       
+        
+
+
         
     def debug_link_to_command(self):
         """redefine all the command to call directly the appropriate child"""
@@ -350,17 +359,12 @@
     def test_interface(self, *args, **opts):
         return self.cmd.test_interface(self, *args, **opts)
 
+    def set_configuration(self, *args, **opts):
+        return self.cmd.set_configuration(self, *args, **opts)
 
 
 class MasterCmd(Switcher, LoopCmd.LoopInterface, cmd.CmdShell):
 
-    def __init__(self, main='MadGraph', *args, **opt):
-            
-        # define the interface
-        self.change_principal_cmd(main)
-        self.cmd.__init__(self, *args, **opt)       
-        
-
     def change_principal_cmd(self, name):
         if name == 'MadGraph':
             self.cmd = MGcmd.MadGraphCmd
@@ -387,7 +391,7 @@
             
         
         #standard initialization
-        MasterCmd.__init__(self, mgme_dir = '', *arg, **opt)
+        Switcher.__init__(self, mgme_dir = '', *arg, **opt)
         
     def change_principal_cmd(self, name):
         if name == 'MadGraph':
@@ -403,7 +407,7 @@
     def finalize(self, nojpeg):
         """Finalize web generation""" 
         
-        Switcher.finalize(self, nojpeg, online = True)
+        self.cmd.finalize(self, nojpeg, online = True)
 
     # Generate a new amplitude
     def do_generate(self, line):

=== modified file 'madgraph/iolibs/export_cpp.py'
--- madgraph/iolibs/export_cpp.py	2011-11-10 06:06:00 +0000
+++ madgraph/iolibs/export_cpp.py	2012-03-09 00:04:18 +0000
@@ -32,13 +32,14 @@
 import madgraph.iolibs.drawing_eps as draw
 import madgraph.iolibs.files as files
 import madgraph.iolibs.helas_call_writers as helas_call_writers
-import madgraph.iolibs.misc as misc
 import madgraph.iolibs.file_writers as writers
 import madgraph.iolibs.template_files as template_files
 import madgraph.iolibs.ufo_expression_parsers as parsers
 from madgraph import MadGraph5Error, InvalidCmd, MG5DIR
 from madgraph.iolibs.files import cp, ln, mv
 
+import madgraph.various.misc as misc
+
 import aloha.create_aloha as create_aloha
 import aloha.aloha_writers as aloha_writers
 

=== modified file 'madgraph/iolibs/export_python.py'
--- madgraph/iolibs/export_python.py	2011-10-29 12:42:14 +0000
+++ madgraph/iolibs/export_python.py	2012-03-09 00:04:18 +0000
@@ -29,13 +29,14 @@
 import madgraph.iolibs.drawing_eps as draw
 import madgraph.iolibs.files as files
 import madgraph.iolibs.helas_call_writers as helas_call_writers
-import madgraph.iolibs.misc as misc
 import madgraph.iolibs.file_writers as writers
 import madgraph.iolibs.template_files as Template
 import madgraph.iolibs.ufo_expression_parsers as parsers
 import madgraph.iolibs.group_subprocs as group_subprocs
 from madgraph import MadGraph5Error, MG5DIR
 
+import madgraph.various.misc as misc
+
 import aloha.create_aloha as create_aloha
 import aloha.aloha_writers as aloha_writers
 

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2012-02-03 21:44:27 +0000
+++ madgraph/iolibs/export_v4.py	2012-03-09 00:04:18 +0000
@@ -18,6 +18,7 @@
 import fractions
 import glob
 import logging
+import math
 import os
 import re
 import shutil
@@ -30,15 +31,16 @@
 import madgraph.iolibs.drawing_eps as draw
 import madgraph.iolibs.files as files
 import madgraph.iolibs.group_subprocs as group_subprocs
-import madgraph.iolibs.misc as misc
 import madgraph.iolibs.file_writers as writers
 import madgraph.iolibs.gen_infohtml as gen_infohtml
 import madgraph.iolibs.template_files as template_files
 import madgraph.iolibs.ufo_expression_parsers as parsers
 import madgraph.various.diagram_symmetry as diagram_symmetry
+import madgraph.various.misc as misc
 import madgraph.various.process_checks as process_checks
 
 
+
 import aloha.create_aloha as create_aloha
 import models.write_param_card as param_writer
 import models.check_param_card as check_param_card
@@ -1068,9 +1070,6 @@
         # Add the combine_events.f 
         filename = os.path.join(self.dir_path,'Source','combine_events.f')
         self.write_combine_events(writers.FortranWriter(filename))
-        # Add the write_banner.f 
-        filename = os.path.join(self.dir_path,'Source','write_banner.f')
-        self.write_write_banner(writers.FortranWriter(filename))
         # Add the symmetry.f 
         filename = os.path.join(self.dir_path,'SubProcesses','symmetry.f')
         self.write_symmetry(writers.FortranWriter(filename))
@@ -1093,7 +1092,7 @@
                             self.dir_path+'/bin/internal/madevent_interface.py')
         cp(_file_path+'/interface/extended_cmd.py',
                                   self.dir_path+'/bin/internal/extended_cmd.py')
-        cp(_file_path+'/iolibs/misc.py', self.dir_path+'/bin/internal/misc.py')        
+        cp(_file_path+'/various/misc.py', self.dir_path+'/bin/internal/misc.py')        
         cp(_file_path+'/iolibs/files.py', self.dir_path+'/bin/internal/files.py')
         cp(_file_path+'/iolibs/save_load_object.py', 
                               self.dir_path+'/bin/internal/save_load_object.py') 
@@ -1316,7 +1315,7 @@
         for file in linkfiles:
             ln('../' + file , '.')
 
-        #import nexternal/leshouch in Source
+        #import nexternal/leshouche in Source
         ln('nexternal.inc', '../../Source', log=False)
         ln('leshouche.inc', '../../Source', log=False)
         ln('maxamps.inc', '../../Source', log=False)
@@ -1418,10 +1417,6 @@
                 os.remove('madevent.tar.gz')
             misc.compile(mode='None')
 
-        if online:
-            # Touch "Online" file
-            os.system('touch %s/Online' % self.dir_path)
-
         subprocess.call([os.path.join(old_pos, self.dir_path, 'bin', 'internal', 'gen_cardhtml-pl')],
                         stdout = devnull)
 
@@ -1960,24 +1955,6 @@
         return True
 
     #===========================================================================
-    # write_write_banner
-    #===========================================================================
-    def write_write_banner(self, writer):
-        """Write the SubProcess/driver.f file for MG4"""
-
-        path = os.path.join(_file_path,'iolibs','template_files','madevent_write_banner.f')
-        
-        if self.model_name == 'mssm' or self.model_name.startswith('mssm-'):
-            card = 'Source/MODEL/MG5_param.dat'
-        else:
-            card = 'param_card.dat' 
-        text = open(path).read() % {'param_card_name':card} 
-
-        writer.write(text)
-        
-        return True
-
-    #===========================================================================
     # write_combine_events
     #===========================================================================
     def write_combine_events(self, writer):
@@ -2290,10 +2267,11 @@
         """Write the files symfact.dat for MG4 by comparing diagrams using
         the internal matrix element value functionality."""
 
-
+        pos = max(2, int(math.ceil(math.log10(len(symmetry)))))
+        form = "%"+str(pos)+"r %"+str(pos+1)+"r"
         # Write out lines for symswap.inc file (used to permute the
         # external leg momenta
-        lines = [ "%3r %3r" %(i+1, s) for i,s in enumerate(symmetry) if s != 0] 
+        lines = [ form %(i+1, s) for i,s in enumerate(symmetry) if s != 0] 
 
         # Write the file
         writer.writelines(lines)

=== modified file 'madgraph/iolibs/group_subprocs.py'
--- madgraph/iolibs/group_subprocs.py	2011-10-29 03:50:27 +0000
+++ madgraph/iolibs/group_subprocs.py	2012-03-09 00:04:18 +0000
@@ -31,11 +31,12 @@
 import madgraph.core.helas_objects as helas_objects
 import madgraph.iolibs.drawing_eps as draw
 import madgraph.iolibs.files as files
-import madgraph.iolibs.misc as misc
 import madgraph.iolibs.file_writers as writers
 import madgraph.iolibs.template_files as template_files
 import madgraph.iolibs.ufo_expression_parsers as parsers
 
+import madgraph.various.misc as misc
+
 import aloha.create_aloha as create_aloha
 
 import models.sm.write_param_card as write_param_card

=== modified file 'madgraph/iolibs/import_v4.py'
--- madgraph/iolibs/import_v4.py	2011-10-20 02:47:51 +0000
+++ madgraph/iolibs/import_v4.py	2012-03-09 00:04:18 +0000
@@ -25,14 +25,12 @@
 import madgraph.core.color_algebra as color
 import madgraph.iolibs.files as files
 import madgraph.iolibs.save_load_object as save_load_object
-import madgraph.iolibs.misc as misc
+
+import madgraph.various.misc as misc
 
 from madgraph.core.base_objects import Particle, ParticleList
 from madgraph.core.base_objects import Interaction, InteractionList
 
-
-
-
 logger = logging.getLogger('madgraph.import_v4')
 
 #===============================================================================

=== modified file 'madgraph/iolibs/template_files/madevent_combine_events.f'
--- madgraph/iolibs/template_files/madevent_combine_events.f	2012-02-08 08:52:30 +0000
+++ madgraph/iolibs/template_files/madevent_combine_events.f	2012-03-09 00:04:18 +0000
@@ -651,12 +651,10 @@
 c
       character*(*) plist
       parameter (plist='subproc.mg')
-      integer    maxsubprocesses
-      parameter (maxsubprocesses=999)
 c
 c     Arguments
 c
-      character*300 subname(maxsubprocesses)
+      character*300 subname(*)
       integer ns
 c-----
 c  Begin Code

=== modified file 'madgraph/iolibs/template_files/madevent_makefile_source'
--- madgraph/iolibs/template_files/madevent_makefile_source	2011-07-19 20:04:10 +0000
+++ madgraph/iolibs/template_files/madevent_makefile_source	2012-03-09 00:04:18 +0000
@@ -15,7 +15,6 @@
           rw_events.o rw_routines.o kin_functions.o open_file.o basecode.o setrun.o \
           run_printout.o dgauss.o readgrid.o getissud.o
 INCLUDEF= coupl.inc genps.inc hbook.inc DECAY/decay.inc psample.inc cluster.inc sudgrid.inc
-BANNER  =  write_banner.o  rw_events.o ranmar.o  kin_functions.o open_file.o  rw_routines.o alfas_functions.o
 COMBINE = combine_events.o  rw_events.o ranmar.o  kin_functions.o open_file.o rw_routines.o alfas_functions.o setrun.o
 GENSUDGRID = gensudgrid.o is-sud.o setrun_gen.o rw_routines.o open_file.o
 
@@ -25,7 +24,7 @@
 
 # Binaries
 
-BINARIES = $(BINDIR)sum_html $(BINDIR)gen_ximprove $(BINDIR)combine_events \
+BINARIES = $(BINDIR)gen_ximprove $(BINDIR)combine_events \
            $(BINDIR)gensudgrid $(BINDIR)combine_runs
 
 # Compile commands
@@ -48,8 +47,6 @@
 $(LIBDIR)libmodel.$(libext): MODEL
 	cd MODEL; make	
 
-$(BINDIR)sum_html: sum_html.o 
-	$(FC) $(FFLAGS) -o $@ $^
 $(BINDIR)gen_ximprove: gen_ximprove.o ranmar.o rw_routines.o open_file.o
 	$(FC) $(FFLAGS) -o $@ $^
 $(BINDIR)combine_events: $(COMBINE) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libpdf.$(libext)
@@ -64,7 +61,6 @@
 dsample.o: dsample.f genps.inc
 invarients.o: invarients.f genps.inc
 setrun.o: setrun.f nexternal.inc leshouche.inc genps.inc
-sum_html.o: sum_html.f genps.inc
 gen_ximprove.o: gen_ximprove.f run_config.inc
 combine_events.o: combine_events.f run_config.inc
 select_events.o: select_events.f run_config.inc

=== modified file 'madgraph/iolibs/template_files/madevent_symmetry.f'
--- madgraph/iolibs/template_files/madevent_symmetry.f	2012-01-30 03:26:48 +0000
+++ madgraph/iolibs/template_files/madevent_symmetry.f	2012-03-09 00:04:18 +0000
@@ -217,7 +217,7 @@
 c     local
 c
       integer i, j, nbw, ic, icode
-      integer ncode, nconf
+      integer ncode, nconf, nsym
       double precision dconfig
       character*10 formstr
       integer iarray(imax)
@@ -294,6 +294,7 @@
 c     Now write out the symmetry factors for each graph
 c
       open (unit=26, file = 'symfact.dat', status='unknown')
+      nsym=int(dlog10(dble(mapconfig(0))))+3
       do i=1,mapconfig(0)
          if (use_config(i) .gt. 0) then
 c
@@ -326,17 +327,19 @@
                call enCode(icode,iarray,ibase,imax)
                if (icode .gt. 0) then
                   nconf=int(dlog10(dble(mapconfig(i))))+1
-                  write(formstr,'(a,i1,a,i1,a)') '(F',nconf+ncode+1,
-     $                 '.',ncode,',i6)'
+                  write(formstr,'(a,i1,a,i1,a,i1,a)') '(F',nconf+ncode+1,
+     $                 '.',ncode,',i',nsym,')'
                   dconfig=mapconfig(i)+icode*1d0/10**ncode
                   write(26,formstr) dconfig,use_config(i)
                else
-                  write(26,'(2i6)') mapconfig(i),use_config(i)
+                  write(formstr,'(a,i1,a)') '(2i',nsym,')'
+                  write(26,formstr) mapconfig(i),use_config(i)
                endif
                call bw_increment_array(iarray,imax,ibase,done)
             enddo
          else
-            write(26,'(2i6)') mapconfig(i), use_config(i)
+            write(formstr,'(a,i1,a)') '(2i',nsym,')'
+            write(26,formstr) mapconfig(i),use_config(i)
          endif
       enddo
       end

=== removed file 'madgraph/iolibs/template_files/madevent_write_banner.f'
--- madgraph/iolibs/template_files/madevent_write_banner.f	2011-07-14 16:19:56 +0000
+++ madgraph/iolibs/template_files/madevent_write_banner.f	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-      program write_banner
-      implicit none
-c
-c     parameters
-c
-      integer    MaxParticles
-      parameter (MaxParticles=15)
-c
-c     Local
-c
-      integer lunr, lunw,luni
-      data luni,lunr,lunw/14,15,16/ ! unit numbers for reading and writing
-      integer ic(7,MaxParticles),next
-      double precision P(0:4,MaxParticles),wgt
-      real*8 sum,mxwgt
-      logical done
-      integer i,imax,j
-      integer nevent,nfound
-      character*25 infile,outfile
-      integer iseed
-      data iseed/9999/
-      character*30 process,QED,QCD
-      double precision scale,aqcd,aqed
-      integer ievent
-c--cuts
-c      double precision etmin(3:nexternal),etamax(3:nexternal)
-c      double precision                    r2min(3:nexternal,3:nexternal)
-c      double precision s_min(nexternal,nexternal)
-c      common/to_cuts/  etmin     ,etamax     , r2min, s_min
-c
-c     open the event file
-c
-      write(*,*) 'input the event file (e.g. Events/events.dat)'
-      read(*,'(a)')  infile
-      open(unit=lunr,file=infile,status='old')
-c
-c     open banner file
-c
-      write(*,*) 'input the banner file name (e.g. banner-events.dat)'
-      read(*,'(a)')  outfile
-      open(lunw,file=outfile,status='unknown')
-c
-c     gather the info
-c
-      call setpara('%(param_card_name)s')
-c      call setcuts
-c      call get_seed(iseed)
-c
-c     All the info is gathered. Now start writing it out.
-c
-      call write_para(lunw)
-      write(lunw,'(a70)') '##                                                                    '
-      write(lunw,'(a70)') '##-------------------                                                 '
-      write(lunw,'(a70)') '## Run-time options                                                   '
-      write(lunw,'(a70)') '##-------------------                                                 '
-      write(lunw,'(a70)') '##                                                                    '
-c      write(lunw,'(a70)') '##********************************************************************'     
-c      write(lunw,'(a70)') '## Standard Cuts                                                     *'
-c      write(lunw,'(a70)') '##********************************************************************'    
-c      write(lunw,'(a13,8i8)')   '## Particle  ',(i,i=3,nexternal)
-c      write(lunw,'(a13,8f8.1)') '## Et       >',(etmin(i),i=3,nexternal)
-c      write(lunw,'(a13,8f8.1)') '## Eta      <',(etamax(i),i=3,nexternal)
-c      do j=3,nexternal-1
-c         write(lunw,'(a,i2,a,8f8.1)') '## d R #',j,'  >',(-0.0,i=3,j),
-c     &        (r2min(i,j),i=j+1,nexternal)
-c         do i=j+1,nexternal
-c            r2min(i,j)=r2min(i,j)**2 !Since r2 returns distance squared
-c         enddo
-c      enddo
-c      do j=3,nexternal-1
-c         write(lunw,'(a,i2,a,8f8.1)') '## s min #',j,'>',
-c     &        (s_min(i,j),i=3,nexternal)
-c      enddo
-      write(lunw,'(a70)') '##********************************************************************'    
-c
-c     Now write out specific information on the event set
-c
-      done=.false.
-      nevent=0
-      nfound=0
-      sum=0d0
-      mxwgt=-1d0
-      do while (.not. done)
-         call read_event(lunr,P,wgt,next,ic,ievent,scale,aqcd,aqed,done)
-         sum=sum+wgt
-         mxwgt = max(wgt,mxwgt)
-         nevent=nevent+1
-      enddo
-
-      write(lunw,'(a70)') '##                                                                    '
-      write(lunw,'(a70)') '##-------------------                                                 '
-      write(lunw,'(a70)') '## Event information                                                  '
-      write(lunw,'(a70)') '##-------------------                                                 '
-      write(lunw,'(a70)') '##                                                                    '
-      write(lunw,'(a70)') '##********************************************************************'    
-      write(lunw,'(a30,i10)')   '##  Number of Events       :  ',nevent
-      write(lunw,'(a30,e10.5)') '##  Integrated weight (pb) :  ',sum
-      write(lunw,'(a30,e10.5)') '##  Max wgt                :  ',mxwgt
-      write(lunw,'(a30,e10.5)') '##  Average wgt            :  ',sum/nevent
-      write(lunw,'(a70)') '##********************************************************************'    
-
-      rewind(lunr)
-      done = .false.
-      nevent=0
-      do while (.not. done)
-         call read_event(lunr,P,wgt,next,ic,ievent,scale,aqcd,aqed,done)
-         nevent=nevent+1
-         if (.not. done) then
-            call write_event(lunw,p,wgt,next,ic,nevent,scale,aqcd,aqed)
-         endif
-      enddo
-
-      close(lunw)
-      close(lunr)
-
-      end

=== modified file 'madgraph/various/banner.py'
--- madgraph/various/banner.py	2012-02-15 08:20:08 +0000
+++ madgraph/various/banner.py	2012-03-09 00:04:18 +0000
@@ -21,7 +21,7 @@
 pjoin = os.path.join
 
 try:
-    import madgraph.iolibs.misc as misc
+    import madgraph.various.misc as misc
     from madgraph import MG5DIR
     MADEVENT = False
 except:
@@ -95,7 +95,16 @@
             self.add(pjoin(medir,'Cards', 'proc_card_mg5.dat'))
         else:
             self.add(pjoin(medir,'Cards', 'proc_card.dat'))
-        
+    
+    
+    def change_seed(self, seed):
+        """Change the seed value in the banner"""
+        #      0       = iseed
+        p = re.compile(r'''^\s*\d+\s*=\s*iseed''', re.M)
+        new_seed_str = "     %s       = iseed" % seed
+        self['mgruncard'] = p.sub(new_seed_str, self['mgruncard'])
+    
+    
     ############################################################################
     #  SPLIT BANNER
     ############################################################################

=== modified file 'madgraph/various/cluster.py'
--- madgraph/various/cluster.py	2012-02-05 01:19:01 +0000
+++ madgraph/various/cluster.py	2012-03-09 00:04:18 +0000
@@ -29,6 +29,33 @@
     pass
 
 
+def multiple_try(nb_try=5, sleep=1):
+
+    def deco_retry(f):
+        def deco_f_retry(*args, **opt):
+            for i in range(nb_try):
+                try:
+                    return f(*args, **opt)
+                except KeyboardInterrupt:
+                    raise
+                except:
+                    time.sleep(sleep)
+            raise
+        return deco_f_retry
+    return deco_retry
+
+def check_interupt(error=KeyboardInterrupt):
+
+    def deco_interupt(f):
+        def deco_f_interupt(self, *args, **opt):
+            try:
+                return f(self, *args, **opt)
+            except error:
+                self.remove(*args, **opt)
+                raise error
+        return deco_f_interupt
+    return deco_interupt
+
 
 class Cluster(object):
     """Basic Class for all cluster type submission"""
@@ -40,7 +67,8 @@
         self.submitted_ids = []
         self.finish = 0
         self.cluster_queue = cluster_queue
-
+        
+    
     def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
         """How to make one submission. Return status id on the cluster."""
         raise NotImplemented, 'No implementation of how to submit a job to cluster \'%s\'' % self.name
@@ -68,6 +96,7 @@
         """ control the status of a single job with it's cluster id """
         raise NotImplemented, 'No implementation of how to control the job status to cluster \'%s\'' % self.name
 
+    @check_interupt()
     def wait(self, me_dir, fct):
         """Wait that all job are finish"""
         
@@ -83,6 +112,7 @@
         self.submitted = 0
         self.submitted_ids = []
 
+    @check_interupt()
     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"""
@@ -92,12 +122,18 @@
             if not status in ['R','I']:
                 break
             time.sleep(30)
+            
+    def remove(self, *args):
+        """ """
+        logger.warning("""This cluster didn't support job removal, 
+    the jobs are still running on the cluster.""")
 
 class CondorCluster(Cluster):
     """Basic class for dealing with cluster submission"""
     
     name = 'condor'
 
+    @multiple_try()
     def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
         """Submit the """
         
@@ -110,6 +146,7 @@
                   notification = Error
                   Initialdir = %(cwd)s
                   %(requirement)s
+                  getenv=True
                   queue 1
                """
         
@@ -153,13 +190,16 @@
         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 = '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)
         return status.stdout.readline().strip()
-        
+    
+    @check_interupt()
+    @multiple_try()
     def control(self, me_dir):
         """ control the status of a single job with it's cluster id """
         
@@ -180,7 +220,17 @@
                 fail += 1
 
         return idle, run, self.submitted - (idle+run+fail), fail
-
+    
+    @multiple_try()
+    def remove(self, *args):
+        """Clean the jobson the cluster"""
+        
+        if not self.submitted_ids:
+            return
+        cmd = "condor_rm %s" % ' '.join(self.submitted_ids)
+        
+        status = subprocess.Popen([cmd], shell=True, stdout=open(os.devnull,'w'))
+        
 class PBSCluster(Cluster):
     """Basic class for dealing with cluster submission"""
     
@@ -188,7 +238,7 @@
     idle_tag = ['Q']
     running_tag = ['T','E','R']
 
-
+    @multiple_try()
     def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
         """Submit the prog to the cluser"""
         
@@ -229,8 +279,10 @@
             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 '+str(id)
@@ -249,7 +301,7 @@
         return 'F'
         
 
-        
+    @multiple_try()    
     def control(self, me_dir):
         """ control the status of a single job with it's cluster id """
         cmd = "qstat"
@@ -275,6 +327,16 @@
 
         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'))
+
+
 class SGECluster(Cluster):
     """Basic class for dealing with cluster submission"""
     # Class written by Arian Abrahantes.
@@ -291,6 +353,7 @@
             location = location.replace(homePath,'$HOME')
         return location
 
+    @multiple_try()
     def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
         """Submit the prog to the cluser"""
 
@@ -350,10 +413,12 @@
             raise ClusterManagmentError, 'fail to submit to the cluster: \n%s' \
                                                                         % output 
         self.submitted += 1
+        self.submitted_ids.append(id)
         logger.debug(output)
 
         return id
 
+    @multiple_try()
     def control_one_job(self, id):
         """ control the status of a single job with it's cluster id """
         #cmd = 'qstat '+str(id)
@@ -375,6 +440,7 @@
             return 'R' 
         return 'F'
 
+    @multiple_try()
     def control(self, me_dir):
         """ control the status of a single job with it's cluster id """
         cmd = "qstat "
@@ -399,9 +465,138 @@
                     fail += 1
 
         return idle, run, self.submitted - (idle+run+fail), fail
-
-
-from_name = {'condor':CondorCluster, 'pbs': PBSCluster, 'sge': SGECluster}
+    
+    
+    @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'))
+
+class LSFCluster(Cluster):
+    """Basic class for dealing with cluster submission"""
+    
+    name = 'lsf'
+
+    @multiple_try()
+    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
+        """Submit the """
+        
+        me_dir = os.path.realpath(os.path.join(cwd,prog)).rsplit('/SubProcesses',1)[0]
+        me_dir = hashlib.md5(me_dir).hexdigest()[-14:]
+        if not me_dir[0].isalpha():
+            me_dir = 'a' + me_dir[1:]
+        
+        text = ""
+        if cwd is None:
+            cwd = os.getcwd()
+        else: 
+            text = " cd %s;" % cwd
+        if stdout is None:
+            stdout = '/dev/null'
+        if stderr is None:
+            stderr = '/dev/null'
+        elif stderr == -2: # -2 is subprocess.STDOUT
+            stderr = stdout
+        if log is None:
+            log = '/dev/null'
+        
+        text += prog
+        if argument:
+            text += ' ' + ' '.join(argument)
+
+        a = subprocess.Popen(['bsub','-o', stdout,
+                                     '-J', me_dir, 
+                                     '-e', stderr,
+                                     '-q', self.cluster_queue],
+                                     stdout=subprocess.PIPE, 
+                                     stderr=subprocess.STDOUT,
+                                     stdin=subprocess.PIPE, cwd=cwd)
+            
+        output = a.communicate(text)[0]
+        #Job <nnnn> is submitted to default queue <normal>.
+        try:
+            id = output.split('>',1)[0].split('<')[1]
+        except:
+            raise ClusterManagmentError, 'fail to submit to the cluster: \n%s' \
+                                                                        % output 
+        if not id.isdigit():
+            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 = 'bjobs '+str(id)
+        status = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE)
+        
+        for line in status.stdout:
+            line = line.strip().upper()
+            if 'JOBID' in line:
+                continue
+            elif str(id) not in line:
+                continue
+            status = line.split()[2]
+            if status == 'RUN':
+                return 'R'
+            elif status == 'PEND':
+                return 'I'
+            elif status == 'DONE':
+                return 'F'
+            else:
+                return 'H'
+            return 'F'
+
+    @multiple_try()   
+    def control(self, me_dir):
+        """ control the status of a single job with it's cluster id """
+        
+        if not self.submitted_ids:
+            return 0, 0, 0, 0
+        
+        cmd = "bjobs " + ' '.join(self.submitted_ids) 
+        status = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE)
+
+        idle, run, fail = 0, 0, 0
+        for line in status.stdout:
+            line = line.strip()
+            if 'JOBID' in line:
+                continue
+            splitline = line.split()
+            id = splitline[0]
+            if id not in self.submitted_ids:
+                continue
+            status = splitline[2]
+            if status == 'RUN':
+                run += 1
+            elif status == 'PEND':
+                idle += 1
+            elif status == 'DONE':
+                pass
+            else:
+                fail += 1
+
+        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 = "bdel %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}
 
 
     

=== modified file 'madgraph/various/diagram_symmetry.py'
--- madgraph/various/diagram_symmetry.py	2011-11-29 23:31:51 +0000
+++ madgraph/various/diagram_symmetry.py	2012-03-09 00:04:18 +0000
@@ -35,7 +35,6 @@
 import madgraph.iolibs.group_subprocs as group_subprocs
 import madgraph.iolibs.helas_call_writers as helas_call_writer
 import models.import_ufo as import_ufo
-import madgraph.iolibs.misc as misc
 import madgraph.iolibs.save_load_object as save_load_object
 
 import madgraph.core.base_objects as base_objects
@@ -45,6 +44,7 @@
 import madgraph.core.diagram_generation as diagram_generation
 
 import madgraph.various.process_checks as process_checks
+import madgraph.various.misc as misc
 
 from madgraph import MG5DIR
 

=== modified file 'madgraph/various/gen_crossxhtml.py'
--- madgraph/various/gen_crossxhtml.py	2012-02-15 04:45:27 +0000
+++ madgraph/various/gen_crossxhtml.py	2012-03-09 00:04:18 +0000
@@ -54,6 +54,10 @@
 function check_link(url,alt, id){
     var obj = document.getElementById(id);
     if ( ! UrlExists(url)){
+       if ( ! UrlExists(alt)){
+         obj.href = url;
+         return 1==1;
+        }
        obj.href = alt;
        return 1 == 2;
     }
@@ -110,7 +114,7 @@
                     %(pgs_card)s
                     %(delphes_card)s
         </TD>
-        <TD nowrap ROWSPAN=2> <A HREF="./HTML/%(run_name)s/results.html">%(cross).4g <font face=symbol>&#177</font> %(error).4g (%(unit)s)</A> </TD> 
+        <TD nowrap ROWSPAN=2> %(results)s </TD> 
         %(status)s
  </TR>
  <tr></tr>
@@ -307,6 +311,11 @@
                             'tag_name': self.current['tag'],
                             'unit': self[self.current['run_name']].info['unit']}
 
+            if exists(pjoin(self.path, 'HTML',self.current['run_name'], 
+                        'results.html')):
+                status_dict['results'] = """<A HREF="./HTML/%(run_name)s/results.html">%(cross).4g <font face=symbol>&#177</font> %(error).4g (%(unit)s)</A>""" % status_dict
+            else:
+                status_dict['results'] = "No results yet"
             if exists(pjoin(self.path, 'Cards', 'plot_card.dat')):
                 status_dict['plot_card'] = """ <a href="./Cards/plot_card.dat">plot_card</a><BR>"""
             else:

=== renamed file 'madgraph/iolibs/misc.py' => 'madgraph/various/misc.py'
--- madgraph/iolibs/misc.py	2011-12-21 14:44:13 +0000
+++ madgraph/various/misc.py	2012-03-09 00:04:18 +0000
@@ -171,7 +171,7 @@
         if 'makefile' not in all_file:
             raise OSError, 'no makefile present in %s' % os.path.realpath(cwd)
 
-        if mode == 'fortran' and (not which('g77') or not which('gfortran')):
+        if mode == 'fortran' and  not (which('g77') or which('gfortran')):
             error_msg = 'A fortran compilator (g77 or gfortran) is required to create this output.\n'
             error_msg += 'Please install g77 or gfortran on your computer and retry.'
             raise MadGraph5Error, error_msg
@@ -192,6 +192,7 @@
         error_text += 'If you think that this is a bug, you can report this at https://bugs.launchpad.net/madgraph5'
 
         raise MadGraph5Error, error_text
+    return p.returncode
 
 
 ################################################################################
@@ -330,11 +331,11 @@
         
         for p in possibility:
             if which(p):
-                logger.warning('Using default %s \"%s\". ' % (program, p) + \
+                logger.info('Using default %s \"%s\". ' % (program, p) + \
                              'Set another one in ./input/mg5_configuration.txt')
                 return p
         
-        logger.warning('No valid %s found. ' % program + \
+        logger.info('No valid %s found. ' % program + \
                                    'Please set in ./input/mg5_configuration.txt')
         return None
         
@@ -345,11 +346,11 @@
       if mac_check==True and sys.platform == 'darwin':
           return self.open_mac_program(program, file_path)
 
-      arguments = program.split() # allow argument in program definition
-      arguments.append(file_path)
-
       # Shell program only                                                                                                                                                                 
       if program:
+          arguments = program.split() # allow argument in program definition
+          arguments.append(file_path)
+
           if not background:
               subprocess.call(arguments)
           else:

=== modified file 'madgraph/various/process_checks.py'
--- madgraph/various/process_checks.py	2011-11-13 10:33:10 +0000
+++ madgraph/various/process_checks.py	2012-03-09 00:04:18 +0000
@@ -34,7 +34,6 @@