Merge lp:~maddevelopers/mg5amcnlo/NLO_with_1.4 into lp:~maddevelopers/mg5amcnlo/NLO

[Olivier Mattelaer]

Merge with last version of 1.4.0.
update the aloha code for loop.

Hi Valentin,

This is a merge with the beta version of the code,
this version has some unit-test that are not fine,
but less than the current NLO branch, so in principle this doesn't add any additional trouble.

This include a new way to deal with the tags, as you asked. For the drawing, this branch doesn't fix the problem. We can skype for that if you want.

Cheers,

Olivier

[lp:~maddevelopers/mg5amcnlo/NLO_with_1.4]

215. By Olivier Mattelaer on 2012-02-02

correct some of the unit_test failure

216. By Olivier Mattelaer on 2012-02-10

fix a couple of unit tests

217. By mattelaer-olivier on 2012-02-15

try to merge

218. By mattelaer-olivier on 2012-02-15

acceptance tests working

219. By mattelaer-olivier on 2012-02-16

only 3 tests didn't pass

[Olivier Mattelaer (olivier-mattelaer)]

Hi Valentin, the three test remaining are clearly linked to NLO stuff:

======================================================================
ERROR: test_madevent_subproc_group_symmetry (tests.acceptance_tests.test_cmd.TestCmdShell2)
Check that symmetry.f gives right output
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/omatt/Documents/Eclipse/NLO1.4/tests/acceptance_tests/test_cmd.py", line 729, in test_madevent_subproc_group_symmetry
    self.do('output %s ' % self.out_dir)
  File "/Users/omatt/Documents/Eclipse/NLO1.4/tests/acceptance_tests/test_cmd.py", line 168, in do
    self.cmd.exec_cmd(line)
  File "/Users/omatt/Documents/Eclipse/NLO1.4/madgraph/interface/extended_cmd.py", line 443, in exec_cmd
    stop = cmd.Cmd.onecmd(current_interface, line)
  File "/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/cmd.py", line 219, in onecmd
    return func(arg)
  File "/Users/omatt/Documents/Eclipse/NLO1.4/madgraph/interface/cmd_interface.py", line 3106, in do_output
    if self._curr_amps.has_any_loop_process() and \
  File "/Users/omatt/Documents/Eclipse/NLO1.4/madgraph/core/diagram_generation.py", line 1005, in has_any_loop_process
    if amp.get('process').get('perturbation_couplings'):
  File "/Users/omatt/Documents/Eclipse/NLO1.4/madgraph/core/diagram_generation.py", line 314, in get
    return Amplitude.__bases__[0].get(self, name) #return the mother routine
  File "/Users/omatt/Documents/Eclipse/NLO1.4/madgraph/core/base_objects.py", line 91, in get
    return self[name]
  File "/Users/omatt/Documents/Eclipse/NLO1.4/madgraph/core/base_objects.py", line 67, in __getitem__
    self.is_valid_prop(name) #raise the correct error
  File "/Users/omatt/Documents/Eclipse/NLO1.4/madgraph/core/base_objects.py", line 84, in is_valid_prop
    (name, self.__class__.__name__)
PhysicsObjectError: process is not a valid property for this object: DecayChainAmplitude

Could you try to fix those? call me if you need help off course.

[Olivier Mattelaer (olivier-mattelaer)]

I Valentin, could you run the test on your computer (just for security)
and after that approve offically the merge?
as soon as this is done, I'll merge this version in the NLO branch.

[lp:~maddevelopers/mg5amcnlo/NLO_with_1.4]

220. By Olivier Mattelaer on 2012-02-16

merge with NLO branch

[Valentin Hirschi (valentin-hirschi)]

All unit and acceptance tests pass on my computer so I approve the merge.

review: Approve

=== modified file 'Template/Cards/run_card.dat'
--- Template/Cards/run_card.dat	2011-12-05 08:47:14 +0000
+++ Template/Cards/run_card.dat	2012-02-16 18:25:20 +0000
@@ -20,7 +20,7 @@
 #*********************************************************************
 # Tag name for the run (one word)                                    *
 #*********************************************************************
-  fermi     = run_tag ! name of the run 
+  tag_1     = run_tag ! name of the run 
 #*********************************************************************
 # Run to generate the grid pack                                      *
 #*********************************************************************

=== modified file 'Template/HTML/sortable.js'
--- Template/HTML/sortable.js	2011-12-06 16:10:41 +0000
+++ Template/HTML/sortable.js	2012-02-16 18:25:20 +0000
@@ -2,17 +2,14 @@
 Table sorting script  by Joost de Valk, check it out at http://www.joostdevalk.nl/code/sortable-table/.
 Based on a script from http://www.kryogenix.org/code/browser/sorttable/.
 Distributed under the MIT license: http://www.kryogenix.org/code/browser/licence.html .
+Modify by the MG team for compatibility issue
 
 Copyright (c) 1997-2007 Stuart Langridge, Joost de Valk.
 
 Version 1.5.7
 */
 
-/* You can change these values */
-var image_path = "http://www.joostdevalk.nl/code/sortable-table/";
-var image_up = "arrowup.gif";
-var image_down = "arrowdown.gif";
-var image_none = "arrownone.gif";
+/* You can change these values */ 
 var europeandate = true;
 var alternate_row_colors = true;
 
@@ -30,6 +27,18 @@
 		thisTbl = tbls[ti];
 		if (((' '+thisTbl.className+' ').indexOf("sortable") != -1) && (thisTbl.id)) {
 			ts_makeSortable(thisTbl);
+			// make it sortable according to the second column
+			if (thisTbl.tHead && thisTbl.tHead.rows.length > 0) {
+			    var firstRow = thisTbl.tHead.rows[thisTbl.tHead.rows.length-1];
+			} else {
+			    var firstRow = thisTbl.rows[0];
+			}
+
+			for (var ci=0;ci<firstRow.cells[1].childNodes.length;ci++) {
+			    if (firstRow.cells[1].childNodes[ci].tagName && firstRow.cells[1].childNodes[ci].tagName.toLowerCase() == 'a') var lnk = firstRow.cells[1].childNodes[ci];
+			}
+                        ts_resortTable(lnk, 1); //order by cross-section
+                        ts_resortTable(lnk, 1); //order by cross-section
 		}
 	}
 }
@@ -50,7 +59,7 @@
 		var cell = firstRow.cells[i];
 		var txt = ts_getInnerText(cell);
 		if (cell.className != "unsortable" && cell.className.indexOf("unsortable") == -1) {
-			cell.innerHTML = '<a href="#" class="sortheader" onclick="ts_resortTable(this, '+i+');return false;">'+txt+'<span class="sortarrow">&nbsp;&nbsp;<img src="'+ image_path + image_none + '" alt="&darr;"/></span></a>';
+			cell.innerHTML = '<a href="#" class="sortheader" onclick="ts_resortTable(this, '+i+');return false;">'+txt+'<span class="sortarrow"></span></a>';
 		}
 	}
 	if (alternate_row_colors) {
@@ -106,6 +115,7 @@
 	if (itm.match(/^\d\d[\/\.-]\d\d[\/\.-]\d\d\d{2}?$/)) sortfn = ts_sort_date;
 	if (itm.match(/^-?[£$€Û¢´]\d/)) sortfn = ts_sort_numeric;
 	if (itm.match(/^-?(\d+[,\.]?)+(E[-+][\d]+)?%?$/)) sortfn = ts_sort_numeric;
+	if (itm.match(/^-?(\d+[,\.]?\d+e[-+][\d]+)?%?$/)) sortfn = ts_sort_numeric;
 	if (itm.match(/^-?(\d+[,\.]?)+([\d]+)?%?$/)) sortfn = ts_sort_numeric;
 	SORT_COLUMN_INDEX = column;
 	var firstRow = new Array();
@@ -130,11 +140,11 @@
 	}
 	newRows.sort(sortfn);
 	if (span.getAttribute("sortdir") == 'down') {
-			ARROW = '&nbsp;&nbsp;<img src="'+ image_path + image_down + '" alt="&darr;"/>';
+			ARROW = '&nbsp;&nbsp;&darr;';
 			newRows.reverse();
 			span.setAttribute('sortdir','up');
 	} else {
-			ARROW = '&nbsp;&nbsp;<img src="'+ image_path + image_up + '" alt="&uarr;"/>';
+			ARROW = '&nbsp;&nbsp;&uarr;';
 			span.setAttribute('sortdir','down');
 	} 
     // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
@@ -154,7 +164,7 @@
 	for (var ci=0;ci<allspans.length;ci++) {
 		if (allspans[ci].className == 'sortarrow') {
 			if (getParent(allspans[ci],"table") == getParent(lnk,"table")) { // in the same table as us?
-				allspans[ci].innerHTML = '&nbsp;&nbsp;<img src="'+ image_path + image_none + '" alt="&darr;"/>';
+				allspans[ci].innerHTML = '';
 			}
 		}
 	}		
@@ -235,7 +245,7 @@
 }
 function ts_sort_numeric(a,b) {
 	var aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
-	aa = clean_num(aa);
+        aa = clean_num(aa);
 	var bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
 	bb = clean_num(bb);
 	return compare_numeric(aa,bb);
@@ -269,6 +279,7 @@
 	}
 	return 1;
 }
+
 function addEvent(elm, evType, fn, useCapture)
 // addEvent and removeEvent
 // cross-browser event handling for IE5+,	NS6 and Mozilla
@@ -285,7 +296,7 @@
 	}
 }
 function clean_num(str) {
-	str = str.replace(new RegExp(/[^-?0-9.]/g),"");
+	str = str.replace(new RegExp(/[^-?0-9.eE]/g),"");
 	return str;
 }
 function trim(s) {

=== renamed file 'Template/Events/banner_header.txt' => 'Template/Source/banner_header.txt'
=== modified file 'Template/Source/gen_ximprove.f'
--- Template/Source/gen_ximprove.f	2011-11-18 17:35:49 +0000
+++ Template/Source/gen_ximprove.f	2012-02-16 18:25:20 +0000
@@ -196,9 +196,8 @@
      $        i,nevents,gname,nhel_refine)
       else
          open(unit=25,file='../results.dat',status='old',err=199)
+         read(25,*) xtot
          write(*,'(a,e12.3)') 'Reading total xsection ',xtot
-         read(25,*) xtot
-         write(*,'(e12.3)') xtot
  199     close(25)
          if (gridpack) then
             call write_gen_grid(err_goal,dble(ngran),i,nevents,gname,

=== modified file 'Template/SubProcesses/cuts.f'
--- Template/SubProcesses/cuts.f	2011-11-10 06:06:00 +0000
+++ Template/SubProcesses/cuts.f	2012-02-16 18:25:20 +0000
@@ -300,7 +300,7 @@
          endif
       endif
       if (mmnl.gt.0d0.or.mmnlmax.lt.1d5)then
-         if(SumDot(ptemp,ptemp2,1d0).lt.mmnl.or.SumDot(ptemp, ptemp2,1d0).gt.mmnlmax) then
+         if(dsqrt(SumDot(ptemp,ptemp2,1d0)).lt.mmnl.or.dsqrt(SumDot(ptemp, ptemp2,1d0)).gt.mmnlmax) then
             if(debug) write (*,*) 'lepton invariant mass -> fails'
             passcuts=.false.
             return

=== modified file 'Template/SubProcesses/reweight.f'
--- Template/SubProcesses/reweight.f	2011-11-16 10:55:44 +0000
+++ Template/SubProcesses/reweight.f	2012-02-16 18:25:20 +0000
@@ -723,6 +723,9 @@
       integer              ISPROC 
       DOUBLE PRECISION PD(0:MAXPROC)
       COMMON /SubProc/ PD, ISPROC
+      INTEGER SUBDIAG(MAXSPROC),IB(2)
+      COMMON/TO_SUB_DIAG/SUBDIAG,IB
+      data IB/1,2/
 c     q2bck holds the central q2fact scales
       real*8 q2bck(2)
       common /to_q2bck/q2bck
@@ -825,7 +828,7 @@
       endif
 c     Set x values for the two sides, for IS Sudakovs
       do i=1,2
-        xnow(i)=xbk(i)
+        xnow(i)=xbk(ib(i))
       enddo
       if(btest(mlevel,3))then
         write(*,*) 'Set x values to ',xnow(1),xnow(2)
@@ -999,11 +1002,12 @@
      $                          ' to: ',sqrt(pt2pdf(imocl(n)))
                      else if(pt2pdf(idacl(n,i)).lt.q2now
      $                       .and.isjet(ipdgcl(idacl(n,i),igraphs(1),iproc))) then
-                        pdfj1=pdg2pdf(abs(lpp(j)),ipdgcl(idacl(n,i),
-     $                       igraphs(1),iproc)*sign(1,ibeam(j)),xnow(j),sqrt(q2now))
-                        pdfj2=pdg2pdf(abs(lpp(j)),ipdgcl(idacl(n,i),
-     $                       igraphs(1),iproc)*sign(1,ibeam(j)),xnow(j),
-     $                       sqrt(pt2pdf(idacl(n,i))))
+                        pdfj1=pdg2pdf(abs(lpp(IB(j))),ipdgcl(idacl(n,i),
+     $                       igraphs(1),iproc)*sign(1,lpp(IB(j))),
+     $                       xnow(j),sqrt(q2now))
+                        pdfj2=pdg2pdf(abs(lpp(IB(j))),ipdgcl(idacl(n,i),
+     $                       igraphs(1),iproc)*sign(1,lpp(IB(j))),
+     $                       xnow(j),sqrt(pt2pdf(idacl(n,i))))
                         if(pdfj2.lt.1d-10)then
 c                          Scale too low for heavy quark
                            rewgt=0d0

=== modified file 'Template/bin/generate_events'
--- Template/bin/generate_events	2011-11-17 20:45:50 +0000
+++ Template/bin/generate_events	2012-02-16 18:25:20 +0000
@@ -27,25 +27,23 @@
 pjoin = os.path.join
 sys.path.append(pjoin(root_path,'bin','internal'))
 import madevent_interface as ME        
-################################################################################  
-##   EXECUTABLE
-################################################################################                                
-if '__main__' == __name__:
-    # Check that python version is valid
-    if not (sys.version_info[0] == 2 or sys.version_info[1] > 5):
-        sys.exit('MadEvent works with python 2.6 or higher (but not python 3.X).\n\
+
+if not (sys.version_info[0] == 2 or sys.version_info[1] > 5):
+    sys.exit('MadEvent works with python 2.6 or higher (but not python 3.X).\n\
                Please upgrade your version of python.')
-    
-    # MadEvent is sensitive to the initial directory.
-    # So go to the main directory
-    os.chdir(root_path)
- 
+
+
+def set_configuration():
+    import coloring_logging
     logging.config.fileConfig(os.path.join(root_path, 'bin', 'internal', 'me5_logging.conf'))
     logging.root.setLevel(logging.INFO)
     logging.getLogger('madevent').setLevel(logging.INFO)
-    logging.getLogger('madgraph').setLevel(logging.INFO)
- 
-    argument = sys.argv
+    logging.getLogger('madgraph').setLevel(logging.INFO)    
+
+
+def treat_old_argument(argument):
+    """Have the MG4 behavior for this script"""
+
     try:
         mode = int(argument[1])
     except:
@@ -69,7 +67,7 @@
         except:
             name = raw_input('enter run name\n')
 
-    launch = ME.MadEventCmd(me_dir=os.getcwd())
+    launch = ME.MadEventCmd(me_dir=root_path)
         
 
     if mode == 1:
@@ -81,7 +79,40 @@
     else:
         launch.run_cmd('generate_events -f %s' % name)
     
-    launch.run_cmd('quit')
+    launch.run_cmd('quit')    
+
+
+
+
+
+
+
+
+################################################################################  
+##   EXECUTABLE
+################################################################################                                
+if '__main__' == __name__:
+    # Check that python version is valid
+
+    set_configuration()
+    argument = sys.argv
+    try:
+        if '-h' in argument or '--help' in argument:
+            launch = ME.MadEventCmd(me_dir=root_path)
+            launch.exec_cmd('help generate_events')
+        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'))
+    except KeyboardInterrupt:
+        pass
+    except ME.MadEventAlreadyRunning, error:
+        logging.error(str(error))
+        sys.exit()
+                          
+    if os.path.exists(pjoin(root_path, 'RunWeb')):  
+        os.remove(pjoin(root_path, 'RunWeb'))      
             
     # reconfigure path for the web 
     #if len(argument) == 5:

=== modified file 'Template/bin/internal/Gridpack/compile'
--- Template/bin/internal/Gridpack/compile	2011-07-26 16:15:01 +0000
+++ Template/bin/internal/Gridpack/compile	2012-02-16 18:25:20 +0000
@@ -45,6 +45,10 @@
     unset lhapdf
 fi
 
+# Clean the previous compilation
+cd Source
+make clean
+cd -
 #
 #  Now let shell know where to find important executables
 #

=== modified file 'Template/bin/internal/Gridpack/gridrun'
--- Template/bin/internal/Gridpack/gridrun	2011-12-06 16:10:41 +0000
+++ Template/bin/internal/Gridpack/gridrun	2012-02-16 18:25:20 +0000
@@ -48,7 +48,7 @@
 
 # Check if optimize mode is (and should be) activated
 if __debug__ and not options.debug and \
-    (not os.path.exists(os.path.join(root_path,'../..', 'bin','create_release.py')) or options.web):
+    (not os.path.exists(os.path.join(root_path,'../..', 'bin','create_release.py'))):
         subprocess.call([sys.executable] + ['-O'] + sys.argv)
         sys.exit()
 
@@ -84,10 +84,12 @@
     cmd_line = cmd_interface.GridPackCmd(me_dir=root_path, nb_event=args[0], seed=args[1])            
 except KeyboardInterrupt:
     print 'Quit on KeyboardInterrupt' 
-    
+
+print 'DONE'
+
 try:
     # Remove lock file
-    os.remove(os.path.join(root_path,os.pardir, 'RunWeb'))
+    os.remove(os.path.join(root_path, 'RunWeb'))
     if cmd_line.history[-1] not in ['EOF','quit','exit']:
         cmd_line.results.store_result()
 except:

=== modified file 'Template/bin/internal/Gridpack/run.sh'
--- Template/bin/internal/Gridpack/run.sh	2011-10-31 16:33:58 +0000
+++ Template/bin/internal/Gridpack/run.sh	2012-02-16 18:25:20 +0000
@@ -57,20 +57,24 @@
 echo "Now generating $num_events events with random seed $seed and granularity $gran"
 
 
-if [[ ! -x ./madevent/bin/internal/gridrun ]]; then
+if [[ ! -x ./madevent/bin/gridrun ]]; then
     echo "Error: gridrun script not found !"
     exit
 else
     cd ./madevent
-    ./bin/internal/gridrun.py $num_events $seed
-fi
-
-if [[ ! -e ./Events/unweighted_events.lhe ]]; then
+    ./bin/gridrun $num_events $seed
+fi
+
+if [[ -e ./Events/GridRun_${seed}/unweighted_events.lhe.gz ]]; then
+	gunzip ./Events/GridRun_${seed}/unweighted_events.lhe.gz
+fi
+
+if [[ ! -e  ./Events/GridRun_${seed}/unweighted_events.lhe ]]; then
     echo "Error: event file not found !"
     exit
 else
-    echo "Moving events from madevent/Events/unweighted_events.lhe to events.lhe"
-    mv ./Events/unweighted_events.lhe ../events.lhe
+    echo "Moving events from  events.lhe"
+    mv ./Events/GridRun_${seed}/unweighted_events.lhe ../events.lhe
     cd ..
 fi
 

=== removed file 'Template/bin/internal/collect_decay_widths.py'
--- Template/bin/internal/collect_decay_widths.py	2011-11-22 08:36:23 +0000
+++ Template/bin/internal/collect_decay_widths.py	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-#!/usr/bin/python
-#
-# Collect the decay widths and calculate BRs for all particles, and put in param_card form
-
-import glob
-import optparse
-import os
-import re
-
-root_path = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                         os.path.pardir, os.path.pardir))
-
-# Main routine
-if __name__ == "__main__":
-
-    # Find available runs
-    run_names = glob.glob(os.path.join(root_path, "Events", "*_banner.txt"))
-    run_names = [os.path.basename(name) for name in run_names]
-    run_names = [re.match("(.*)_banner.txt", name).group(1) for name in run_names]
-    usage = "usage: %prog run_name"
-    usage +="\n      where run_name in (%s)" % ",".join(run_names)
-    parser = optparse.OptionParser(usage=usage)
-    (options, args) = parser.parse_args()
-    if len(args) != 1 or args[0] not in run_names:
-        if len(run_names) == 1:
-            args = run_names
-        else:
-            parser.error("Please give a run name")
-            exit
-    run_name = args[0].strip()
-
-    print "Collecting results for run ", run_name
-    
-    # Start collecting results
-    subproc_dirs = \
-           open(os.path.join(root_path, "SubProcesses", "subproc.mg")).read().split('\n')
-    
-    particle_dict = {}
-    for subdir in subproc_dirs[:-1]:
-        subdir = os.path.join(root_path, "SubProcesses", subdir)
-        leshouche = open(os.path.join(subdir, 'leshouche.inc')).read().split('\n')[0]
-        particles = re.search("/([\d,-]+)/", leshouche)
-        if not particles:
-            continue
-        particles = [int(p) for p in particles.group(1).split(',')]
-        results = \
-             open(os.path.join(subdir, run_name + '_results.dat')).read().split('\n')[0]
-        result = float(results.strip().split(' ')[0])
-        try:
-            particle_dict[particles[0]].append([particles[1:], result])
-        except KeyError:
-            particle_dict[particles[0]] = [[particles[1:], result]]
-
-
-    # Open the param_card.dat and insert the calculated decays and BRs
-    param_card_file = open(os.path.join(root_path, 'Cards', 'param_card.dat'))
-    param_card = param_card_file.read().split('\n')
-    param_card_file.close()
-
-    decay_lines = []
-    line_number = 0
-    # Read and remove all decays from the param_card
-    while line_number < len(param_card):
-        line = param_card[line_number]
-        if line.lower().startswith('decay'):
-            # Read decay if particle in particle_dict
-            # DECAY  6   1.455100e+00
-            line = param_card.pop(line_number)
-            line = line.split()
-            particle = 0
-            if int(line[1]) not in particle_dict:
-                try: # If formatting is wrong, don't want this particle
-                    particle = int(line[1])
-                    width = float(line[2])
-                except:
-                    particle = 0
-            # Read BRs for this decay
-            line = param_card[line_number]
-            while line.startswith('#') or line.startswith(' '):
-                line = param_card.pop(line_number)
-                if not particle or line.startswith('#'):
-                    line=param_card[line_number]
-                    continue
-                #    6.668201e-01   3    5  2  -1
-                line = line.split()
-                try: # Remove BR if formatting is wrong
-                    partial_width = float(line[0])*width
-                    decay_products = [int(p) for p in line[2:2+int(line[1])]]
-                except:
-                    line=param_card[line_number]
-                    continue
-                try:
-                    particle_dict[particle].append([decay_products, partial_width])
-                except KeyError:
-                    particle_dict[particle] = [[decay_products, partial_width]]
-                line=param_card[line_number]
-            if particle and particle not in particle_dict:
-                # No decays given, only total width
-                particle_dict[particle] = [[[], width]]
-        else: # Not decay
-            line_number += 1
-    # Clean out possible remaining comments at the end of the card
-    while not param_card[-1] or param_card[-1].startswith('#'):
-        param_card.pop(-1)
-
-    # Append calculated and read decays to the param_card
-    param_card.append("#\n#*************************")
-    param_card.append("#      Decay widths      *")
-    param_card.append("#*************************")
-    for key in sorted(particle_dict.keys()):
-        width = sum([r for p,r in particle_dict[key]])
-        param_card.append("#\n#      PDG        Width")
-        param_card.append("DECAY  %i   %e" % (key, width))
-        if not width:
-            continue
-        if particle_dict[key][0][0]:
-            param_card.append("#  BR             NDA  ID1    ID2   ...")
-            brs = [[val[1]/width, val[0]] for val in particle_dict[key] if val[1]]
-            for val in sorted(brs, reverse=True):
-                param_card.append("   %e   %i    %s" % (val[0], len(val[1]),
-                                           "  ".join([str(v) for v in val[1]])))
-    output_name = os.path.join(root_path, run_name + "_param_card.dat")
-    decay_table = open(output_name, 'w')
-    decay_table.write("\n".join(param_card) + "\n")
-    print "Results written to ", output_name
-    

=== modified file 'Template/bin/internal/create_matching_plots.sh'
--- Template/bin/internal/create_matching_plots.sh	2011-11-18 23:12:02 +0000
+++ Template/bin/internal/create_matching_plots.sh	2012-02-16 18:25:20 +0000
@@ -12,25 +12,27 @@
     export PATH=$ROOTSYS/bin:$PATH
 fi
 donerun=0
-if [[ -e $1_pythia_events.tree.gz ]];then
+if [[ -e $1/$2_pythia_events.tree.gz ]];then
     donerun=1
-    echo gunzip $1_pythia_events.tree.gz
-    gunzip -c $1_pythia_events.tree.gz > events.tree
-    cp $1_pythia_xsecs.tree xsecs.tree
+    echo gunzip $1/$2_pythia_events.tree.gz
+    gunzip -c $1/$2_pythia_events.tree.gz > events.tree
+    cp $1/$2_pythia_xsecs.tree xsecs.tree
 fi
+
 if [[ ! -e events.tree || ! -e xsecs.tree ]];then
     echo "No events.tree or xsecs.tree files found"
     exit
 fi
 echo Running root
-root -q -b ../bin/internal/read_tree_files.C
+root -q -b ../bin/internal/read_tree_files.C &> /dev/null
 echo Creating plots
-root -q -b ../bin/internal/create_matching_plots.C
-mv pythia.root $1_pythia.root
-if [[ ! -d $1_pythia ]];then
-  mkdir $1_pythia
+root -q -b ../bin/internal/create_matching_plots.C &> /dev/null
+mv pythia.root $1/$2_pythia.root
+
+if [[ ! -d ../HTML/$1/plots_pythia_$2 ]];then
+  mkdir ../HTML/$1/plots_pythia_$2
 fi
-for i in DJR*.eps; do mv $i $1_pythia/${i%.*}.ps;done
+for i in DJR*.eps; do mv $i ../HTML/$1/plots_pythia_$2/${i%.*}.ps;done
 if [[ donerun -eq 1 ]];then
     rm events.tree xsecs.tree
 fi

=== modified file 'Template/bin/internal/put_banner'
--- Template/bin/internal/put_banner	2011-06-29 14:15:21 +0000
+++ Template/bin/internal/put_banner	2012-02-16 18:25:20 +0000
@@ -19,12 +19,14 @@
 else
     c=$1
 fi
+
+
 if [[ -d Events ]]; then
     cd Events
 # Put all the info in a long banner
 # First the header
 # $B$ begin_banner $B$ !this is a tag for MadWeight. Don't edit this line
-  cat banner_header.txt >& b.txt
+  cat ../Source/banner_header.txt >& b.txt
 # $E$ begin_banner $E$ !this is a tag for MadWeight. Don't edit this line
 # Now the version information
 # grab the info first

=== modified file 'Template/bin/internal/run_delphes'
--- Template/bin/internal/run_delphes	2011-12-06 16:10:41 +0000
+++ Template/bin/internal/run_delphes	2012-02-16 18:25:20 +0000
@@ -7,7 +7,8 @@
 
 delphesdir=$1
 run=$2
-tag=$3 
+tag=$3
+cross=$4 
 
 main=`pwd`
 
@@ -38,6 +39,7 @@
 if [ -e delphes_events.lhco ]; then
 # write the delphes banner
     sed -e "s/^/#/g" ${run}/${run}_${tag}_banner.txt > ${run}/${tag}_delphes_events.lhco
+    echo "##  Integrated weight (pb)  : ${cross}" >> ${run}/${tag}_delphes_events.lhco
     cat delphes_events.lhco >> ${run}/${tag}_delphes_events.lhco
     rm -f delphes_events.lhco
 fi

=== removed file 'Template/bin/internal/store'
--- Template/bin/internal/store	2011-12-05 08:47:14 +0000
+++ Template/bin/internal/store	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-#!/bin/bash
-#  
-# Need to launch as store RUN_NAME TAG_NAME
-#
-#
-if [[  ! -d ./bin  ]]; then
-    cd ../
-    if [[ ! -d ./bin ]]; then
-	echo "Error: store must be executed from the main, or bin directory"
-	exit
-    fi
-fi
-if [[ ! -d SubProcesses ]]; then
-    echo "Error: SubProcesses directory not found"
-    exit
-fi
-cd SubProcesses
-if [[  "$1" == ""  ]]; then
-    echo 'Enter you must specify a name to store files under. (eg store TeV)'     
-    exit
-fi
-#$i=1;
-#$max_store = 99;
-#while(-e "SubProcesses/".$t.$i."_results.html" && $i < $max_store){
-#    $i++;
-#}
-
-if [[ -e $1_results.html ]]; then
-    rm -f $1_results.html
-fi
-sed s/results.html/$1_results.html/g results.html | sed s/log.txt/$1_log.txt/g | sed s/results.dat/$1_results.dat/g | sed s/plots.html/$1_plots.html/g | sed s/pyplots.html/$1_pyplots.html/g > $1_results.html
-mv -f results.dat $1_results.dat  >& /dev/null
-for i in `cat subproc.mg` ; do
-    cd $i
-    echo $i
-    if [[ -e $1_results.html ]]; then
-	rm -f $1_results.html
-    fi    
-    mv -f results.dat $1_results.dat  >& /dev/null
-    sed s/results.html/$1_results.html/g results.html | sed s/log.txt/$1_log.txt/g | sed s/results.dat/$1_results.dat/g > $1_results.html
-    for k in G* ; do
-	if [[ ! -d $k ]]; then
-	    continue
-	fi
-	cd $k
-	if [[ -e events.lhe ]]; then
-	    rm -f events.lhe
-#	    cp -f events.lhe $1_events.lhe
-#	    rm -f $1_events.lhe.gz >& /dev/null
-#	    gzip $1_events.lhe
-	fi
-	for j in results.dat log.txt ; do
-	    if [[ -e $j ]]; then
-		mv -f $j $1_$j
-	    fi
-	done
-	for j in ftn25 ftn99 ; do
-	    if [[ -e $j ]]; then
-		mv -f $j $1_$j
-		rm -f $1_$j.gz >&/dev/null
-		gzip $1_$j
-	    fi
-	done
-	cd ../
-    done
-    cd ../
-done
-cd ..
-./bin/internal/gen_cardhtml-pl
-if [[ ! -e Events/$1 ]];
-if [[ -e Events/events.lhe ]]; then
-    mv -f Events/events.lhe Events/$1_events.lhe 
-    rm -f Events/$1_events.lhe.gz >& /dev/null
-    gzip -f Events/$1_events.lhe
-fi
-if [[ -e Events/banner.txt ]]; then
-    mv -f Events/banner.txt Events/$1_banner.txt
-fi
-if [[ -e Events/unweighted_events.lhe ]]; then
-    mv -f Events/unweighted_events.lhe Events/$1_unweighted_events.lhe 
-    rm -f Events/$1_unweighted_events.lhe.gz >& /dev/null
-    gzip -f Events/$1_unweighted_events.lhe 
-fi
-cd Events
-if [[ -e plots.html ]]; then
-    mv -f plots.html $1_plots.html
-fi
-if [[ -e pyplots.html ]]; then
-    mv -f pyplots.html $1_pyplots.html
-fi
-if [[ -e ./$1/events.list ]]; then
-    sed s/unweighted_events.root/$1_unweighted_events.root/g ./$1/events.list >  ./$1/events.list.temp
-    mv -f ./$1/events.list.temp ./$1/events.list
-fi
-if [[ -e unweighted_events.root ]]; then
-    mv -f unweighted_events.root $1_unweighted_events.root
-fi
-if [[ -e pythia_events.hep ]]; then
-    mv -f pythia_events.hep $1_pythia_events.hep
-    gzip -f $1_pythia_events.hep
-    mv -f pythia.log $1_pythia.log
-fi
-
-if [[ -e pythia_events.lhe ]]; then
-# write the pythia banner
-    echo \<LesHouchesEvents version=\"1.0\"\> > temp.lhe
-    echo \<\!-- >> temp.lhe
-    echo "# Warning\! Never use this file for detector studies\!" >> temp.lhe
-    echo --\> >> temp.lhe
-    cat $1_banner.txt >> temp.lhe
-    sed /'<LesHouchesEvents version=\"1.0\">'/s//'-->'/ pythia_events.lhe >> temp.lhe
-    rm -f pythia_events.lhe
-    mv -f temp.lhe $1_pythia_events.lhe
-    gzip -f $1_pythia_events.lhe
-fi
-
-if [[ -e pythia_lhe_events.root ]]; then
-    mv -f pythia_lhe_events.root $1_pythia_lhe_events.root
-fi
-
-if [[ -e events.tree ]]; then
-    mv -f events.tree $1_pythia_events.tree
-    gzip -f $1_pythia_events.tree
-    mv -f xsecs.tree $1_pythia_xsecs.tree
-    mv -f beforeveto.tree $1_pythia_beforeveto.tree
-    gzip -f $1_pythia_beforeveto.tree
-fi
-if [[ -e pgs_events.lhco ]]; then
-    mv -f pgs_events.lhco $1_pgs_events.lhco
-    gzip -f $1_pgs_events.lhco
-    if [ -e olympics.log ];then
-	mv -f olympics.log $1_pgs.log
-    else
-	mv -f pgs.log $1_pgs.log
-    fi
-    mv -f pgs_uncleaned_events.lhco $1_pgs_uncleaned_events.lhco
-    gzip -f $1_pgs_uncleaned_events.lhco
-fi
-if [[ -e pgs_events.root ]]; then
-    mv -f pgs_events.root $1_pgs_events.root
-fi
-if [[ -e pythia_events.root ]]; then
-    mv -f pythia_events.root $1_pythia_events.root
-fi
-if [ -e delphes_events.lhco ]; then
-    mv -f delphes_events.lhco $1_delphes_events.lhco
-    gzip -f $1_delphes_events.lhco
-    mv -f delphes_run.log $1_delphes.log
-fi
-if [ -e delphes.root ]; then
-    mv -f delphes.root $1_delphes_events.root
-fi
-cd ..

=== removed file 'Template/bin/internal/store4grid'
--- Template/bin/internal/store4grid	2011-10-26 01:11:44 +0000
+++ Template/bin/internal/store4grid	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-#!/bin/bash
-#  
-#   First we need to get into the main directory
-#
-if [[  ! -d ./bin  ]]; then
-    cd ../
-    if [[ ! -d ./bin ]]; then
-	echo "Error: store must be executed from the main, or bin directory"
-	exit
-    fi
-fi
-if [[ ! -d SubProcesses ]]; then
-    echo "Error: SubProcesses directory not found"
-    exit
-fi
-cd SubProcesses
-if [[  "$1" == ""  ]]; then
-    echo 'Enter you must specify a name to store files under. (eg store TeV)'     
-    exit
-fi
-#$i=1;
-#$max_store = 99;
-#while(-e "SubProcesses/".$t.$i."_results.html" && $i < $max_store){
-#    $i++;
-#}
-
-if [[ -e $1_results.html ]]; then
-    rm -f $1_results.html
-fi
-sed s/results.html/$1_results.html/g results.html | sed s/log.txt/$1_log.txt/g | sed s/results.dat/$1_results.dat/g | sed s/plots.html/$1_plots.html/g | sed s/pyplots.html/$1_pyplots.html/g > $1_results.html
-mv -f results.dat $1_results.dat  >& /dev/null
-for i in `cat subproc.mg` ; do
-    cd $i
-    echo $i
-    if [[ -e $1_results.html ]]; then
-	rm -f $1_results.html
-    fi    
-    mv -f results.dat $1_results.dat  >& /dev/null
-    sed s/results.html/$1_results.html/g results.html | sed s/log.txt/$1_log.txt/g | sed s/results.dat/$1_results.dat/g > $1_results.html
-    for k in G* ; do
-	if [[ ! -d $k ]]; then
-	    continue
-	fi
-	cd $k
-	if [[ -e events.lhe ]]; then
-	    rm -f events.lhe
-#	    cp -f events.lhe $1_events.lhe
-#	    rm -f $1_events.lhe.gz >& /dev/null
-#	    gzip $1_events.lhe
-	fi
-	for j in results.dat log.txt ; do
-	    if [[ -e $j ]]; then
-		mv -f $j $1_$j
-	    fi
-	done
-	for j in ftn26 ; do
-	    if [[ -e $j ]]; then
-		mv -f $j $1_$j
-		rm -f $1_$j.gz >&/dev/null
-		gzip $1_$j
-	    fi
-	done
-	cd ../
-    done
-    cd ../
-done
-cd ..
-./bin/internal/gen_cardhtml-pl
-if [[ -e Events/events.lhe ]]; then
-    mv -f Events/events.lhe Events/$1_events.lhe 
-    rm -f Events/$1_events.lhe.gz >& /dev/null
-    gzip -f Events/$1_events.lhe
-fi
-if [[ -e Events/unweighted_events.lhe ]]; then
-    ./bin/internal/extract_banner-pl Events/unweighted_events.lhe  Events/$1_banner.txt 
-    mv -f Events/unweighted_events.lhe Events/$1_unweighted_events.lhe 
-    rm -f Events/$1_unweighted_events.lhe.gz >& /dev/null
-    gzip -f Events/$1_unweighted_events.lhe 
-fi
-cd Events
-if [[ -e plots.html ]]; then
-    mv -f plots.html $1_plots.html
-fi
-if [[ -e pyplots.html ]]; then
-    mv -f pyplots.html $1_pyplots.html
-fi
-if [[ -e ./$1/events.list ]]; then
-    sed s/unweighted_events.root/$1_unweighted_events.root/g ./$1/events.list >  ./$1/events.list.temp
-    mv -f ./$1/events.list.temp ./$1/events.list
-fi
-if [[ -e unweighted_events.root ]]; then
-    mv -f unweighted_events.root $1_unweighted_events.root
-fi
-if [[ -e pythia_events.hep ]]; then
-    mv -f pythia_events.hep $1_pythia_events.hep
-    gzip -f $1_pythia_events.hep
-    mv -f pythia.log $1_pythia.log
-# pythia_card.dat
-   echo "<MGPythiaCard>" >>$1_banner.txt
-   if [[ -e ../Cards/pythia_card.dat ]]; then cat ../Cards/pythia_card.dat   >> $1_banner.txt; fi
-   echo "</MGPythiaCard>" >>$1_banner.txt
-fi
-
-if [[ -e pythia_events.lhe ]]; then
-# write the pythia banner
-    echo \<LesHouchesEvents version=\"1.0\"\> > temp.lhe
-    echo \<\!-- >> temp.lhe
-    cat $1_banner.txt >> temp.lhe
-    sed /'<LesHouchesEvents version=\"1.0\">'/s//'-->'/ pythia_events.lhe >> temp.lhe
-    rm -f pythia_events.lhe
-    mv -f temp.lhe $1_pythia_events.lhe
-    gzip -f $1_pythia_events.lhe
-fi
-
-if [[ -e pythia_lhe_events.root ]]; then
-    mv -f pythia_lhe_events.root $1_pythia_lhe_events.root
-fi
-
-if [[ -e events.tree ]]; then
-    mv -f events.tree $1_pythia_events.tree
-    gzip -f $1_pythia_events.tree
-    mv -f xsecs.tree $1_pythia_xsecs.tree
-    mv -f beforeveto.tree $1_pythia_beforeveto.tree
-    gzip -f $1_pythia_beforeveto.tree
-fi
-if [[ -e pgs_events.lhco ]]; then
-# pgs_card.dat
-   echo "<MGPGSCard>" >>$1_banner.txt
-   if [[ -e ../Cards/pgs_card.dat ]]; then cat ../Cards/pgs_card.dat   >> $1_banner.txt; fi
-   echo "</MGPGSCard>" >>$1_banner.txt
-# write the pgs banner
-    sed -e "s/^/#/g" $1_banner.txt > temp.dat
-    cat pgs_events.lhco >> temp.dat
-    rm -f pgs_events.lhco
-    mv -f temp.dat $1_pgs_events.lhco
-    gzip -f $1_pgs_events.lhco
-    mv -f pgs.log $1_pgs.log
-fi
-if [[ -e pgs_events.root ]]; then
-    mv -f pgs_events.root $1_pgs_events.root
-fi
-if [[ -e pythia_events.root ]]; then
-    mv -f pythia_events.root $1_pythia_events.root
-fi
-cd ..

=== modified file 'Template/bin/madevent'
--- Template/bin/madevent	2011-10-14 22:45:25 +0000
+++ Template/bin/madevent	2012-02-16 18:25:20 +0000
@@ -53,6 +53,7 @@
 # Check if optimize mode is (and should be) activated
 if __debug__ and not options.debug and \
     (not os.path.exists(os.path.join(root_path,'../..', 'bin','create_release.py')) or options.web):
+        print 'launch in debug mode'
         subprocess.call([sys.executable] + ['-O'] + sys.argv)
         sys.exit()
 
@@ -101,6 +102,7 @@
 
 # Set logging level according to the logging level given by options
 #logging.basicConfig(level=vars(logging)[options.logging])
+import internal.coloring_logging
 try:
     if __debug__ and options.logging == 'INFO':
         options.logging = 'DEBUG'    
@@ -142,6 +144,9 @@
 except KeyboardInterrupt:
     print 'writting history and directory and quit on KeyboardInterrupt' 
     pass
+except cmd_interface.MadEventAlreadyRunning, error:
+    logging.error(str(error))
+    SystemError.exit()
 try: 
     readline.set_history_length(100)
     if not os.path.exists(os.path.join(os.environ['HOME'], '.mg5')):
@@ -151,9 +156,9 @@
     pass
     
 try:
+    if cmd_line.history[-1] not in ['EOF','quit','exit']:
+        cmd_line.results.store_result()
     # Remove lock file
     os.remove(os.path.join(root_path,os.pardir, 'RunWeb'))
-    if cmd_line.history[-1] not in ['EOF','quit','exit']:
-        cmd_line.results.store_result()
 except:
     pass
\ No newline at end of file

=== modified file 'Template/makefile'
--- Template/makefile	2011-09-13 02:02:28 +0000
+++ Template/makefile	2012-02-16 18:25:20 +0000
@@ -15,7 +15,6 @@
 gridpack.tar: 
 	mv Events Events1
 	mkdir Events
-	cp Events1/banner_header.txt Events/
 	mkdir madevent
 	cp bin/internal/Gridpack/run.sh ./
 	cp bin/internal/Gridpack/* bin/

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2011-12-07 00:15:33 +0000
+++ UpdateNotes.txt	2012-02-16 18:25:20 +0000
@@ -1,23 +1,51 @@
 Update notes for MadGraph 5 (in reverse time order)
 
-1.4.b6 (1/12/11): OM: New structure for madevent script (./bin/madevent)
-                      allowing to have an interface similar to MG5 
-                      for running madevent.
-                      (accessible from MG5 via launch [DIR] -i)
-                      This script replaces most of the earlier scripts in
-                      ./bin/ (such as survey/refine/combine/run_XXXX/
-                      multi_run/plot)
-                      The script generate_events still exists but now calls
-                      ./bin/madevent. 
-                  OM: MadEvent checks that the param_card is coherent with the 
-                      restriction used during the model generation. 
+1.4.b10 (19/01/12): OM: New Interface to controll the madevent run.
+                       This one is accessible by 
+                        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
                       converted to SLAH2 during the MadEvent run since the UFO 
                       model uses SLAH2. This allows to use Pythia 6,
                       as well as have a coherent definition for the flavor.
+                  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 associates values, and with the 
+                     Branching ratio associated (usefull for pythia). 
+                  NOTE: This param_card makes sense for future run ONLY if all 
+                     relevant decay are generated.
+                  EXAMPLE: (after launch bin/mg5):
+                       import model sm-full
+                       generate t > b w+
+                       define all = p b b~ l+ l- ta+ ta- vl vl~
+                       add process w+ > all all
+                       add process z > all all
+                       define v = z w+ w-
+                       add process h > all all
+                       add process h > v v, v > all all
+                       output
+                       launch
+                  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 allow to 
+                      run mulitple times pythia/pgs/delphes for the same set of 
+                      events (with different parameters).
+                  OM: MadEvent checks that the param_card is coherent with the 
+                      restriction used during the model generation. 
+                  OM: Restriction Model 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 
                       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 
+                      Lorentz structure associates to the vertex.
+                  OM: Add a check that color representation is coherent. 
+                      This allow to detect/fix various problem linked to the new model
+                      created by FR and SARAH.
                   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 
@@ -40,40 +68,43 @@
                         their associated weight (for automatic order restriction)
                       d) display couplings now returns the list of all couplings
                         with the associated expression
-                  OM: New Python script for the creation of the crossx.html/results.html page
-                      Requiring less disk access for the generation of the file.
+                      e) display interactions PART1 [PART2] [PART3] ...
+		         display all interactions containing at least the particles set in arguments
+                  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
                       and Configuration problems.
-		  JA: Add new run mode, calculate_decay_widths, which calculates 
-                      decay widths for processes of type A > B C ... and inserts
-                      decay widths and branching ratios into the param_card.
-                      Example of use (after launch bin/mg5):
-                       import model sm-full
-                       generate t > b w+
-                       define all = p b b~ l+ l- ta+ ta- vl vl~
-                       add process w+ > all all
-                       add process z > all all
-                       define v = z w+ w-
-                       add process h > all all
-                       add process h > v v, v > all all
-                       output
-                       launch -i
-                       calculate_decay_widths
-		  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
-		      Thanks to Arian Abrahantes for the SGE implementation.
-		  OM: Improve the parralel suite and change the release script to run
-		      some of the parralel suite. This ensures more stability of the 
-		      code for the future release.
-
-                  Thanks to Johan Alwall, Sho Iwamoto for all the important testing/bug reports
+                  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 parralel suite and change the release script to run
+                      some of the parralel suite. This ensures more stability of the 
+                      code for the future release.
+                  
+
+                  Thanks to Johan Alwall, Sho Iwamoto for all the important 
+                  testing/bug reports.
+
+1.3.32 (21/12/11) JA: Fixed a bug in the PDF reweighting routine,
+                      which caused skewed eta distributions for
+                      matched samples with pdfwgt=T. Thanks to Giulio
+                      Lenzi and the CMS MC generation team for finding this.
+ 
+1.3.31 (29/11/11) OM: Fix a bug an overflow in RAMBO (affects standalone 
+                     output only)
+                  PdA (via OM): Change RS model (add a width to the spin2)
+                  OM: Fix a bug in the cuts associate to  allowed mass of all 
+                      neutrinos+leptons (thanks to Brock Tweedie for finding it)
+                  OM: Remove some limitation in the name for the particles
+
 
 1.3.30 (18/11/11) OM: Fix a bug for the instalation of pythia-pgs on a 64 bit
-       		      UNIX machine.
-		  OM: If ROOTSYS is define but root in the PATH, add it 
-		      automatically in create_matching_plots.sh
-		      This is require for the UIUC cluster.
+                      UNIX machine.
+                  OM: If ROOTSYS is define but root in the PATH, add it 
+                      automatically in create_matching_plots.sh
+                     This is require for the UIUC cluster.
 
 1.3.29 (16/11/11) OM: Fixed particle identities in the Feynman diagram drawing
                   JA: Fixed bug in pdf reweighting when external LHAPDF is used.

=== added file 'aloha/aloha_fct.py'
--- aloha/aloha_fct.py	1970-01-01 00:00:00 +0000
+++ aloha/aloha_fct.py	2012-02-16 18:25:20 +0000
@@ -0,0 +1,76 @@
+################################################################################
+#
+# Copyright (c) 2012 The ALOHA Development team and Contributors
+#
+# This file is a part of the ALOHA project, an application which 
+# automatically generates HELAS ROUTINES
+#
+# It is subject to the ALOHA license which should accompany this 
+# distribution.
+#
+#
+################################################################################
+from aloha.aloha_object import *
+import cmath
+
+class WrongFermionFlow(Exception):
+    pass
+
+################################################################################    
+##  CHECK FLOW VALIDITY OF A LORENTZ STRUCTURE
+################################################################################    
+def check_flow_validity(expression, nb_fermion):
+    """Check that the fermion flow follows the UFO convention
+       1) Only one flow is defined and is 1 -> 2, 3 -> 4, ...
+       2) that 1/3/... are on the left side of any Gamma matrices
+    """
+    
+    assert nb_fermion != 0 and (nb_fermion % 2) == 0
+    
+    # Need to expand the expression in order to have a simple sum of expression
+    expr = eval(expression)
+    expr = expr.simplify()
+    #expr is now a valid AddVariable object if they are a sum or
+    if expr.vartype != 1: # not AddVariable 
+        expr = [expr] # put in a list to allow comparison
+    
+    for term in expr:
+        if term.vartype == 0: # Single object
+            if not term.spin_ind in [[1,2], [2,1]]:
+                raise WrongFermionFlow, 'Fermion should be the first particles of any interactions'
+            if isinstance(term, (Gamma, Gamma5, Sigma)):
+                if not term.spin_ind == [2,1]:
+                    raise WrongFermionFlow, 'Not coherent Incoming/outcoming fermion flow'
+        
+        elif term.vartype == 2: # product of object
+            link, rlink = {}, {}
+            for obj in term:
+                if not obj.spin_ind:
+                    continue
+                ind1, ind2 = obj.spin_ind
+                if isinstance(obj, (Gamma, Gamma5, Sigma)):
+                    if (ind1 in range(1, nb_fermion+1) and ind1 % 2 == 1) or \
+                       (ind2 in range(2, nb_fermion+1) and ind2 % 2 == 0 ):
+                        raise WrongFermionFlow, 'Not coherent Incoming/outcoming fermion flow'
+                if ind1 not in link.keys():
+                    link[ind1] = ind2
+                else:
+                    rlink[ind1] = ind2
+                if ind2 not in link.keys():
+                    link[ind2] = ind1
+                else: 
+                    rlink[ind2] = ind1                    
+            for i in range(1, nb_fermion,2):
+                old = []
+                pos = i
+                while 1:
+                    old.append(pos)
+                    if pos in link.keys() and link[pos] not in old:
+                        pos = link[pos]
+                    elif pos in rlink.keys() and rlink[pos] not in old:
+                        pos = rlink[pos]
+                    elif pos != i+1:
+                        raise WrongFermionFlow, 'Not coherent Incoming/outcoming fermion flow'
+                    elif pos == i+1:
+                        break
+        

=== modified file 'aloha/aloha_lib.py'
--- aloha/aloha_lib.py	2011-08-09 18:34:24 +0000
+++ aloha/aloha_lib.py	2012-02-16 18:25:20 +0000
@@ -1715,3 +1715,9 @@
     
     def __str__(self):
         return str(self.value)
+    
+
+
+
+
+

=== modified file 'aloha/aloha_object.py'
--- aloha/aloha_object.py	2011-08-09 18:34:24 +0000
+++ aloha/aloha_object.py	2012-02-16 18:25:20 +0000
@@ -478,7 +478,7 @@
               (3,0): 0, (3,1): 0, (3,2): 0, (3,3): 1}
     
     def __init__(self, spin1, spin2, prefactor=1):
-        if spin1 < spin2:
+        if spin1 > spin2:
             aloha_lib.LorentzObject.__init__(self,[], [spin1, spin2], prefactor)
         else:
             aloha_lib.LorentzObject.__init__(self,[], [spin2, spin1], prefactor)

=== modified file 'aloha/aloha_writers.py'
--- aloha/aloha_writers.py	2012-02-03 10:07:01 +0000
+++ aloha/aloha_writers.py	2012-02-16 18:25:20 +0000
@@ -23,7 +23,7 @@
     def __init__(self, abstract_routine, dirpath):
 
 
-        name = get_routine_name(abstract_routine.name, abstract_routine.outgoing)
+        name = get_routine_name(abstract = abstract_routine)
         if dirpath:
             self.dir_out = dirpath
             self.out_path = os.path.join(dirpath, name + self.extension)
@@ -39,7 +39,8 @@
         self.comment = abstract_routine.infostr
         self.offshell = abstract_routine.outgoing 
         self.symmetries = abstract_routine.symmetries
-        self.loop_routine = abstract_routine.loop
+        self.tag = abstract_routine.tag
+        self.loop_routine = 'L' in self.tag
 
         #prepare the necessary object
         self.collect_variables() # Look for the different variables
@@ -517,7 +518,7 @@
         else:
             sym = None  # deactivate symetry
             
-        name = combine_name(self.abstractname, lor_names, offshell)
+        name = combine_name(self.abstractname, lor_names, offshell, self.tag)
 
                  
         # write header 
@@ -535,21 +536,8 @@
                 text += ' double complex TMP(%s)\n integer i' % self.type_to_size[spin]                   
         
         # 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
-        # StartValentin 30.01.2012
-        if 'L' in self.namestring and self.LOOP_MODE:
-            addon = 'L'+addon
-        # EndValentin
+        addon = ''.join(self.tag) + '_%s' % self.offshell
+        
         # how to call the routine
         if not offshell:
             main = 'vertex'
@@ -603,21 +591,38 @@
         
         return text
     
-def get_routine_name(name,outgoing):
+def get_routine_name(name=None, outgoing=None, tag=None, abstract=None):
     """ build the name of the aloha function """
     
-    return '%s_%s' % (name, outgoing) 
-
-def combine_name(name, other_names, outgoing):
+    assert (name and outgoing) or abstract
+
+    if tag is None:
+        tag = abstract.tag
+
+    if name is None:
+        name = abstract.name + ''.join(tag)
+    
+    if outgoing is None:
+        outgoing = abstract.outgoing
+
+    
+    return '%s_%s' % (name, outgoing)
+
+def combine_name(name, other_names, outgoing, tag=None):
     """ build the name for combined aloha function """
 
+    
+
     # Two possible scheme FFV1C1_2_X or FFV1__FFV2C1_X
     # If they are all in FFVX scheme then use the first
     p=re.compile('^(?P<type>[FSVT]+)(?P<id>\d+)')
     routine = ''
     if p.search(name):
         base, id = p.search(name).groups()
-        routine = name
+        if tag is not None:
+            routine = name + ''.join(tag)
+        else:
+            routine = name
         for s in other_names:
             try:
                 base2,id2 = p.search(s).groups()
@@ -632,18 +637,22 @@
     if routine:
         return routine +'_%s' % outgoing
 
-    addon = ''
-    if 'C' in name:
-        short_name, addon = name.split('C',1)
-        try:
-            addon = 'C' + str(int(addon))
-        except:
-            addon = ''
-        else:
-            name = short_name
+    if tag is not None:
+        addon = ''.join(tag)
+    else:
+        addon = ''
+        if 'C' in name:
+            short_name, addon = name.split('C',1)
+            try:
+                addon = 'C' + str(int(addon))
+            except:
+                addon = ''
+            else:
+                name = short_name
 
     return '_'.join((name,) + tuple(other_names)) + addon + '_%s' % outgoing
  
+
 class ALOHAWriterForCPP(WriteALOHA): 
     """Routines for writing out helicity amplitudes as C++ .h and .cc files."""
     
@@ -860,7 +869,7 @@
     def write_combined_h(self, lor_names, offshell=None, compiler_cmd=True):
         """Return the content of the .h file linked to multiple lorentz call."""
         
-        name = combine_name(self.abstractname, lor_names, offshell)
+        name = combine_name(self.abstractname, lor_names, offshell, self.tag)
         text= ''
         if compiler_cmd:
             text = '#ifndef '+ name + '_guard\n'
@@ -912,7 +921,7 @@
         if offshell is None:
             offshell = self.offshell
             
-        name = combine_name(self.abstractname, lor_names, offshell)
+        name = combine_name(self.abstractname, lor_names, offshell, self.tag)
 
         text = ''
         if compiler_cmd:
@@ -1032,7 +1041,7 @@
         if offshell is None:
             offshell = self.offshell
         
-        name = combine_name(self.abstractname, lor_names, offshell)
+        name = combine_name(self.abstractname, lor_names, offshell, self.tag)
         
         h_text = self.write_combined_h(lor_names, offshell, **opt)
         cc_text = self.write_combined_cc(lor_names, offshell, sym=True, **opt)
@@ -1246,7 +1255,7 @@
             offshell = self.offshell  
         else:
             sym = None
-        name = combine_name(self.abstractname, lor_names, offshell)
+        name = combine_name(self.abstractname, lor_names, offshell, self.tag)
 
         # write head - momenta - body - foot
         text = ''
@@ -1314,4 +1323,4 @@
                 text += self.write_combined(lor_names, mode, elem)
             
         return text
-        
\ No newline at end of file
+        

=== modified file 'aloha/create_aloha.py'
--- aloha/create_aloha.py	2012-02-03 10:07:01 +0000
+++ aloha/create_aloha.py	2012-02-16 18:25:20 +0000
@@ -58,7 +58,8 @@
         self.infostr = infostr
         self.symmetries = []
         self.combined = []
-        self.loop = False # Check if we need the denominator
+        #self.loop = False # Check if we need the denominator
+        self.tag = []
         
     def add_symmetry(self, outgoing):
         """ add an outgoing """
@@ -158,10 +159,10 @@
         #                  = C_ac G_bc (-1) C_bd = C_ac G_bc C_db
         self.routine_kernel = \
              C(new_id, old_id + 1) * self.routine_kernel * C(new_id + 1, old_id)
-        self.name += 'C'
 
-        if pair:
-            self.name += str(pair)
+#        self.name += 'C'
+#        if pair:
+#            self.name += str(pair)
         self.conjg.append(pair)
 
     
@@ -170,9 +171,12 @@
         """ define a simple output for this AbstractRoutine """
     
         infostr = str(self.lorentz_expr)        
-        return AbstractRoutine(self.expr, self.outgoing, self.spins, self.name, \
+        output = AbstractRoutine(self.expr, self.outgoing, self.spins, self.name, \
                                                                         infostr)
-        
+
+        output.tag += ['C%s' % pair for pair in self.conjg]
+        return output
+
     def change_sign_for_outcoming_fermion(self):
         """change the sign of P for outcoming fermion in order to 
         correct the mismatch convention between HELAS and FR"""
@@ -187,8 +191,7 @@
         momentum_pattern = re.compile(r'\bP\(([\+\-\d]+),(%s)\)' % '|'.join(flip_sign))
         lorentz_expr = momentum_pattern.sub(r'P(\1,\2, -1)', self.lorentz_expr)
         return lorentz_expr
-        
-        
+                
     def compute_aloha_high_kernel(self, mode, factorize=True):
         """compute the abstract routine associate to this mode """
         
@@ -437,11 +440,12 @@
     def set(self, lorentzname, outgoing, abstract_routine, loop=False):
         """ add in the dictionary """
     
-        if loop and not abstract_routine.loop:
+        if loop and not 'L' in abstract_routine.tag:
             abstract_routine = copy.copy(abstract_routine)
-            abstract_routine.loop = True
-            abstract_routine.name += 'L'
-            
+            abstract_routine.tag.append('L')
+
+
+
         self[(lorentzname, outgoing)] = abstract_routine
     
     def compute_all(self, save=True, wanted_lorentz = []):
@@ -504,11 +508,10 @@
 
     def compute_subset(self, data):
         """ create the requested ALOHA routine. 
-        data should be a list of tuple (lorentz, conjugate, outgoing, loop)
-        if loop is not given it's suppose to be False.
-        conjugate should be a tuple with the pair number to conjugate.
-        outgoing a tuple of the requested routines."""
-
+        data should be a list of tuple (lorentz, tag, outgoing)
+        tag should be the list of special tag (like conjugation on pair)
+        to apply on the object """
+        
         # Search identical particles in the vertices in order to avoid
         #to compute identical contribution
         self.look_for_symmetries()
@@ -518,14 +521,12 @@
         request = {}
         
         #Check Loop status
-        aloha_writers.WriteALOHA.LOOP_MODE = any([len(d)==4 for d in data])
+        aloha_writers.WriteALOHA.LOOP_MODE = any(['L' in tag for l,tag,out in data])
         # Add loop attribut for those which are not defined
 
-        for i, d in enumerate(data):
-            if len(d) == 3:
-                data[i] = data[i] + (False,)
-
-        for list_l_name, conjugate, outgoing, loop in data:
+        for list_l_name, tag, outgoing in data:
+            conjugate = tuple([int(c[1:]) for c in tag if c.startswith('C')])
+            loop = ('L' in tag)
             for l_name in list_l_name:
                 try:
                     request[l_name][conjugate].append((outgoing, loop))
@@ -565,20 +566,10 @@
                                         routines_loop=outgoing_loop )
         
         # Build mutiple lorentz call
-        for list_l_name, conjugate, outgoing, loop in data:
+        for list_l_name, tag, outgoing in data:
             if len(list_l_name) >1:
-                lorentzname = list_l_name[0]
-                # StartValentin 30.01.2012
-                others=list(list_l_name[1:])
-                for c in conjugate:
-                    lorentzname += 'C%s' % c
-                if loop:
-                    lorentzname += 'L'
-#                    for i, name in enumerate(others):
-#                       others[i]=name+'L'
-#                self[(lorentzname, outgoing)].add_combine(list_l_name[1:])
-                # EndValentin 30.01.2012
-                self[(lorentzname, outgoing)].add_combine(tuple(others))
+                lorentzname = list_l_name[0] + ''.join(tag)
+                self[(lorentzname, outgoing)].add_combine(list_l_name[1:])
                         
     def compute_aloha(self, builder, symmetry=None, routines=None, routines_loop=None):
         """ define all the AbstractRoutine linked to a given lorentz structure
@@ -604,7 +595,8 @@
             else:
                 wavefunction = builder.compute_routine(outgoing)
                 #Store the information
-                self.set(name, outgoing, wavefunction)
+                realname = name + ''.join(wavefunction.tag)
+                self.set(realname, outgoing, wavefunction)
         
         # Creates the Loop routines
         for outgoing in routines_loop:

=== modified file 'bin/mg5'
--- bin/mg5	2011-09-13 02:02:28 +0000
+++ bin/mg5	2012-02-16 18:25:20 +0000
@@ -60,6 +60,7 @@
 
 import logging
 import logging.config
+import madgraph.interface.coloring_logging
 
 try: 
     import readline

=== modified file 'input/mg5_configuration.txt'
--- input/mg5_configuration.txt	2012-01-05 12:58:34 +0000
+++ input/mg5_configuration.txt	2012-02-16 18:25:20 +0000
@@ -14,7 +14,9 @@
 ################################################################################
 #
 # This File contains some configuration variable for MadGraph/MadEvent
-# This File is use if the file ~/.mg5/mg5_configuration.txt is not present.
+# This File is use if the file ~/.mg5/mg5_configuration.txt is NOT present.
+# If you place this files in ~/.mg5/mg5_configuration.txt then all path should
+# be absolute.
 #
 ################################################################################
 
@@ -39,7 +41,7 @@
 
 # Prefered Fortran Compiler
 # If None: try to find g77 or gfortran on the system
-fortran_compiler = gfortran
+fortran_compiler = None
 
 
 ################################################################################

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2011-12-07 00:15:33 +0000
+++ madgraph/VERSION	2012-02-16 18:25:20 +0000
@@ -1,3 +1,3 @@
-version = 1.4.0.beta_6
-date = 2011-12-1
+version = 1.4.0.beta_10
+date = 2012-01-19
 

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2011-12-19 17:55:05 +0000
+++ madgraph/core/base_objects.py	2012-02-16 18:25:20 +0000
@@ -80,7 +80,8 @@
 
         if name not in self.keys():
             raise self.PhysicsObjectError, \
-                        "%s is not a valid property for this object" % name
+                        "%s is not a valid property for this object: %s" % \
+                                       (name, self.__class__.__name__)
 
         return True
 
@@ -228,9 +229,8 @@
         """Filter for valid particle property values."""
 
         if name in ['name', 'antiname']:
-            # Must start with a letter, followed by letters,  digits,
-            # - and + only
-            p = re.compile('\A[a-zA-Z]+[\w]*[\-\+]*~?\Z')
+            # Forbid special character but +-~_
+            p=re.compile('''^[\w\-\+~_]+$''')
             if not p.match(value):
                 raise self.PhysicsObjectError, \
                         "%s is not a valid particle name" % value

=== modified file 'madgraph/core/helas_objects.py'
--- madgraph/core/helas_objects.py	2012-01-05 12:58:34 +0000
+++ madgraph/core/helas_objects.py	2012-02-16 18:25:20 +0000
@@ -3649,10 +3649,10 @@
         return self.generate_color_amplitudes(self['color_basis'],self['diagrams'])
 
     def get_used_lorentz(self):
-        """Return a list of (lorentz_name, conjugate, outgoing) with
+        """Return a list of (lorentz_name, conjugate_tag, outgoing) with
         all lorentz structures used by this HelasMatrixElement."""
 
-        return [(tuple(wa.get('lorentz')), tuple(wa.get_conjugate_index()),
+        return [(tuple(wa.get('lorentz')), tuple(['C%s' % w for w in wa.get_conjugate_index()]),
                  wa.find_outgoing_number()) for wa in \
                 self.get_all_wavefunctions() + self.get_all_amplitudes() \
                 if wa.get('interaction_id') != 0]

=== modified file 'madgraph/interface/.mg5_logging.conf'
--- madgraph/interface/.mg5_logging.conf	2011-07-26 16:15:01 +0000
+++ madgraph/interface/.mg5_logging.conf	2012-02-16 18:25:20 +0000
@@ -9,13 +9,16 @@
 
 
 [formatter_cmdprint]
-format: %(message)s
+class: logging.ColorFormatter
+format: $COLOR%(message)s$RESET
 
 [formatter_simple]
+class: logging.ColorFormatter
 format: %(name)s: %(message)s
 
 [formatter_madgraph]
-format: %(levelname)s: %(message)s
+class: logging.ColorFormatter
+format: $COLOR%(levelname)s: %(message)s $RESET
 
 [handler_cmdprint]
 class: StreamHandler

=== modified file 'madgraph/interface/__init__.py'
--- madgraph/interface/__init__.py	2010-06-16 13:50:52 +0000
+++ madgraph/interface/__init__.py	2012-02-16 18:25:20 +0000
@@ -0,0 +1,1 @@
+

=== modified file 'madgraph/interface/cmd_interface.py'
--- madgraph/interface/cmd_interface.py	2012-02-15 12:45:43 +0000
+++ madgraph/interface/cmd_interface.py	2012-02-16 18:25:20 +0000
@@ -239,20 +239,20 @@
               " FILENAME")
         logger.info("-- imports file(s) in various formats")
         logger.info("")
-        logger.info("   import model MODEL[-RESTRICTION] [-modelname]:")
+        logger.info("   import model MODEL[-RESTRICTION] [--modelname]:")
         logger.info("      Import a UFO model.")
         logger.info("      MODEL should be a valid UFO model name")
         logger.info("      Model restrictions are specified by MODEL-RESTRICTION")
         logger.info("        with the file restrict_RESTRICTION.dat in the model dir.")
         logger.info("        By default, restrict_default.dat is used.")
         logger.info("        Specify model_name-full to get unrestricted model.")
-        logger.info("      -modelname keeps the original particle names for the model")
+        logger.info("      '--modelname' keeps the original particle names for the model")
         logger.info("")
-        logger.info("   import model_v4 MODEL [-modelname] :")
+        logger.info("   import model_v4 MODEL [--modelname] :")
         logger.info("      Import an MG4 model.")
         logger.info("      Model should be the name of the model")
         logger.info("      or the path to theMG4 model directory")
-        logger.info("      -modelname keeps the original particle names for the model")
+        logger.info("      '--modelname' keeps the original particle names for the model")
         logger.info("")
         logger.info("   import proc_v4 [PATH] :"  )
         logger.info("      Execute MG5 based on a proc_card.dat in MG4 format.")
@@ -308,8 +308,9 @@
         logger.info("   - If mode is standalone_cpp, create a standalone C++")
         logger.info("     directory in \"path\".")
         logger.info("   - If mode is pythia8, output all files needed to generate")
-        logger.info("     the processes using Pythia 8. Directory \"path\"")
-        logger.info("     should be a Pythia 8 main directory (v. 8.150 or later).")
+        logger.info("     the processes using Pythia 8. The files are written in")
+        logger.info("     the Pythia 8 directory (default).")
+        logger.info("     NOTE: The Pythia 8 directory is set in the ./input/mg5_configuration.txt")
         logger.info("   path: The path of the process directory.")
         logger.info("     If you put '.' as path, your pwd will be used.")
         logger.info("     If you put 'auto', an automatic directory PROC_XX_n will be created.")
@@ -326,7 +327,7 @@
         
     def help_check(self):
 
-        logger.info("syntax: check " + "|".join(self._check_opts) + " [param_card] process_definition")
+        logger.info("syntax: check [" + "|".join(self._check_opts) + "] [param_card] process_definition")
         logger.info("-- check a process or set of processes. Options:")
         logger.info("full: Perform all three checks described below:")
         logger.info("   permutation, gauge and lorentz_invariance.")
@@ -382,12 +383,14 @@
     def help_set(self):
         logger.info("syntax: set %s argument" % "|".join(self._set_options))
         logger.info("-- set options for generation or output")
-        logger.info("   group_subprocesses True/False: ")
-        logger.info("     (default True) Smart grouping of subprocesses into ")
+        logger.info("   group_subprocesses True/False/Auto: ")
+        logger.info("     (default Auto) Smart grouping of subprocesses into ")
         logger.info("     directories, mirroring of initial states, and ")
         logger.info("     combination of integration channels.")
         logger.info("     Example: p p > j j j w+ gives 5 directories and 184 channels")
         logger.info("     (cf. 65 directories and 1048 channels for regular output)")
+        logger.info("     Auto means False for decay computation and True for") 
+        logger.info("     collisions.")
         logger.info("   ignore_six_quark_processes multi_part_label")
         logger.info("     (default none) ignore processes with at least 6 of any")
         logger.info("     of the quarks given in multi_part_label.")
@@ -461,9 +464,12 @@
         syntax: display XXXXX
         """
             
-        if len(args) < 1 or args[0] not in self._display_opts:
-            self.help_display()
-            raise self.InvalidCmd
+        if len(args) < 1:
+            self.help_display()
+            raise self.InvalidCmd, 'display requires an argument specifying what to display'
+        if args[0] not in self._display_opts:
+            self.help_display()
+            raise self.InvalidCmd, 'Invalid arguments for display command: %s' % args[0]
 
         if not self._curr_model:
             raise self.InvalidCmd("No model currently active, please import a model!")
@@ -503,7 +509,7 @@
 
         if len(args) < 2:
             self.help_check()
-            raise self.InvalidCmd("\"check\" requires an argument and a process.")
+            raise self.InvalidCmd("\"check\" requires a process.")
 
         param_card = None
         if os.path.isfile(args[1]):
@@ -569,7 +575,10 @@
         modelname = False
         if '-modelname' in args:
             args.remove('-modelname')
-            modelname = True    
+            modelname = True   
+        elif '--modelname' in args:
+            args.remove('--modelname')
+            modelname = True              
                 
         if not args:
             self.help_import()
@@ -664,8 +673,9 @@
             path = os.path.realpath(args[0])
         else:    
             raise self.InvalidCmd, '%s is not a valid directory' % args[0]
-            
+                
         mode = self.find_output_type(path)
+        
         args[0] = mode
         args.append(path)
         # inform where we are for future command
@@ -714,7 +724,10 @@
 
         if os.path.isfile(pjoin(include_path, 'Pythia.h')):
             return 'pythia8'
-        elif os.path.isdir(src_path):
+        elif not os.path.isdir(os.path.join(path, 'SubProcesses')):
+            raise self.InvalidCmd, '%s : Not a valid directory' % path
+        
+        if os.path.isdir(src_path):
             return 'standalone_cpp'
         elif os.path.isfile(pjoin(bin_path,'generate_events')):
             return 'madevent'
@@ -751,8 +764,8 @@
                                   self._set_options)
 
         if args[0] in ['group_subprocesses']:
-            if args[1] not in ['False', 'True']:
-                raise self.InvalidCmd('%s needs argument False or True' % \
+            if args[1] not in ['False', 'True', 'Auto']:
+                raise self.InvalidCmd('%s needs argument False, True or Auto' % \
                                       args[0])
         if args[0] in ['ignore_six_quark_processes']:
             if args[1] not in self._multiparticles.keys():
@@ -835,12 +848,23 @@
             if path == 'auto' and self._export_format in \
                      ['madevent', 'standalone', 'standalone_cpp']:
                 self.get_default_path()
-            else:
+            elif path != 'auto':
                 self._export_dir = path
+            elif path == 'auto':
+                if self.configuration['pythia8_path']:
+                    self._export_dir = self.configuration['pythia8_path']
+                else:
+                    self._export_dir = '.'
         else:
-            # No valid path
-            self.get_default_path()
-
+            if self._export_format != 'pythia8':
+                # No valid path
+                self.get_default_path()
+            else:
+                if self.configuration['pythia8_path']:
+                    self._export_dir = self.configuration['pythia8_path']
+                else:
+                    self._export_dir = '.'
+                    
         self._export_dir = os.path.realpath(self._export_dir)
 
     def get_default_path(self):
@@ -882,8 +906,8 @@
             auto_path = lambda i: pjoin(self.writing_dir,
                                                name_dir(i))
         elif self._export_format == 'pythia8':
-            if self.pythia8_path:
-                self._export_dir = self.pythia8_path
+            if self.configuration['pythia8_path']:
+                self._export_dir = self.configuration['pythia8_path']
             else:
                 self._export_dir = '.'
             return
@@ -1290,7 +1314,6 @@
 
     def complete_set(self, text, line, begidx, endidx):
         "Complete the set command"
-
         args = self.split_arg(line[0:begidx])
 
         # Format
@@ -1300,7 +1323,7 @@
 
         if len(args) == 2:
             if args[1] in ['group_subprocesses']:
-                return self.list_completion(text, ['False', 'True'])
+                return self.list_completion(text, ['False', 'True', 'Auto'])
             
             elif args[1] in ['ignore_six_quark_processes']:
                 return self.list_completion(text, self._multiparticles.keys())
@@ -1322,7 +1345,7 @@
         
     def complete_import(self, text, line, begidx, endidx):
         "Complete the import command"
-
+        
         args=self.split_arg(line[0:begidx])
         
         # Format
@@ -1334,68 +1357,68 @@
         elif args[1] in self._import_formats:
             mode = args[1]
         else:
+            args.insert(1, 'all')
             mode = 'all'
 
+
+        completion_categories = {}
         # restriction continuation (for UFO)
-        if mode in ['model', 'all'] and ('-' in args[-1] + text):
+        if mode in ['model', 'all'] and '-' in  text:
             # deal with - in readline splitting (different on some computer)
-            if not GNU_SPLITTING:
-                prefix = '-'.join([part for part in text.split('-')[:-1]])+'-'
-                args.append(prefix)
-                text = text.split('-')[-1]
-            #model name
-            path = args[-1][:-1] # remove the final - for the model name
+            path = '-'.join([part for part in text.split('-')[:-1]])
+            # remove the final - for the model name
             # find the different possibilities
             all_name = self.find_restrict_card(path, no_restrict=False)
             all_name += self.find_restrict_card(path, no_restrict=False,
                                         base_dir=pjoin(MG5DIR,'models'))
 
-            # select the possibility according to the current line            
-            all_name = [name.split('-')[-1] for name in  all_name ]
+            # select the possibility according to the current line           
             all_name = [name+' ' for name in  all_name if name.startswith(text)
                                                        and name.strip() != text]
-            # adapt output for python2.7 (due to different splitting)
-            if not GNU_SPLITTING:
-                all_name = [prefix + name for name in  all_name ]
+            
                 
             if all_name:
-                return all_name
+                completion_categories['Restricted model'] = all_name
 
         # Path continuation
-        if os.path.sep in args[-1] + text and text:
-            if mode.startswith('model'):
+        if os.path.sep in args[-1]:
+            if mode.startswith('model') or mode == 'all':
                 # Directory continuation
-                cur_path = pjoin('.',*[a for a in args \
+                try:
+                    cur_path = pjoin(*[a for a in args \
                                                    if a.endswith(os.path.sep)])
-                all_dir = self.path_completion(text, cur_path, only_dirs = True)
-                if mode == 'model_v4':
-                    return all_dir
-                new = []
-                data =   [new.__iadd__(self.find_restrict_card(name, base_dir=cur_path))
-                                                            for name in all_dir]
-                if data:
-                    return data[0]
+                except:
+                    pass
                 else:
-                    return []
-            else:
-                cur_path = pjoin('.',*[a for a in args \
-                                                   if a.endswith(os.path.sep)])
-                all_path =  self.path_completion(text, cur_path)
-                if mode == 'all':
-                    new = [] 
-                    data =   [new.__iadd__(self.find_restrict_card(name, base_dir=cur_path)) 
-                                                           for name in all_path]
+                    all_dir = self.path_completion(text, cur_path, only_dirs = True)
+                    if mode in ['model_v4','all']:
+                        completion_categories['Path Completion'] = all_dir
+                    # Only UFO model here
+                    new = []
+                    data =   [new.__iadd__(self.find_restrict_card(name, base_dir=cur_path))
+                                                                for name in all_dir]
                     if data:
-                        return data[0]
+                        completion_categories['Path Completion'] = all_dir + new
+            else:
+                try:
+                    cur_path = pjoin(*[a for a in args \
+                                                   if a.endswith(os.path.sep)])
+                except:
+                    pass
+                else:
+                    all_path =  self.path_completion(text, cur_path)
+                    if mode == 'all':
+                        new = [] 
+                        data =   [new.__iadd__(self.find_restrict_card(name, base_dir=cur_path)) 
+                                                               for name in all_path]
+                        if data:
+                            completion_categories['Path Completion'] = data[0]
                     else:
-                        return []
-                else:
-                    return all_path
-
-
+                        completion_categories['Path Completion'] = all_path
+                
         # Model directory name if directory is not given
-        if (mode != 'all' and len(self.split_arg(line[0:begidx])) == 2) or \
-            (mode =='all' and len(self.split_arg(line[0:begidx]))==1):
+        if (len(args) == 2):
+            is_model = True
             if mode == 'model':
                 file_cond = lambda p : os.path.exists(pjoin(MG5DIR,'models',p,'particles.py'))
                 mod_name = lambda name: name
@@ -1412,46 +1435,42 @@
                 cur_path = pjoin('.',*[a for a in args \
                                                    if a.endswith(os.path.sep)])
                 all_path =  self.path_completion(text, cur_path)
-                return all_path
+                completion_categories['model name'] = all_path
+                is_model = False
+            
+            if is_model:
+                model_list = [mod_name(name) for name in \
+                                                self.path_completion(text,
+                                                pjoin(MG5DIR,'models'),
+                                                only_dirs = True) \
+                                                if file_cond(name)]
                 
-            model_list = [mod_name(name) for name in \
-                                            self.path_completion(text,
-                                            pjoin(MG5DIR,'models'),
-                                            only_dirs = True) \
-                                            if file_cond(name)]
-            
-            if mode == 'model_v4':
-                return model_list
-            else:
-                # need to update the  list with the possible restriction
-                all_name = []
-                for model_name in model_list:
-                    all_name += self.find_restrict_card(model_name, 
-                                        base_dir=pjoin(MG5DIR,'models'))
-            if mode == 'all':
-                cur_path = pjoin('.',*[a for a in args \
-                                                    if a.endswith(os.path.sep)])
-                all_path =  self.path_completion(text, cur_path)
-                return all_path + all_name 
-            else:
-                return all_name                
+                if mode == 'model_v4':
+                    completion_categories['model name'] = model_list
+                else:
+                    # need to update the  list with the possible restriction
+                    all_name = []
+                    for model_name in model_list:
+                        all_name += self.find_restrict_card(model_name, 
+                                            base_dir=pjoin(MG5DIR,'models'))
+                if mode == 'all':
+                    cur_path = pjoin('.',*[a for a in args \
+                                                        if a.endswith(os.path.sep)])
+                    all_path =  self.path_completion(text, cur_path)
+                    completion_categories['model name'] = all_path + all_name 
+                elif mode == 'model':
+                    completion_categories['model name'] = all_name 
 
         # Options
         if mode == 'all' and len(args)>1:
-            mode = self.find_import_type(args[1])
-            opt_len = 1
-        else:
-            opt_len =2        
-        
-        
-        if len(args) > opt_len and mode.startswith('model') and args[-1][0] != '-':
-                return ['-modelname']
-            
-        if len(args) > (opt_len+1) and mode[1].startswith('model') and args[-1][0] == '-':
-           if GNU_SPLITTING:
-               return ['modelname']
-           else: 
-               return ['-modelname']
+            mode = self.find_import_type(args[2])
+   
+        if len(args) >= 3 and mode.startswith('model') and not '-modelname' in line:
+            if not text and not completion_categories:
+                return ['--modelname']
+            elif not (os.path.sep in args[-1] and line[-1] != ' '):
+                completion_categories['options'] = self.list_completion(text, ['--modelname','-modelname'])
+        return self.deal_multiple_categories(completion_categories) 
         
         
             
@@ -1528,8 +1547,6 @@
     _curr_exporter = None
     _done_export = False
 
-    # Configuration variable
-    pythia8_path = None
     
     def __init__(self, mgme_dir = '', *completekey, **stdin):
         """ add a tracker of the history """
@@ -1568,7 +1585,7 @@
             self._cuttools_dir=str(os.path.join(self._mgme_dir,'loop_material','CutTools'))
 
         # Set defaults for options
-        self._options['group_subprocesses'] = True
+        self._options['group_subprocesses'] = 'Auto'
         self._options['ignore_six_quark_processes'] = False
         
         # Load the configuration file
@@ -1628,7 +1645,10 @@
             cpu_time1 = time.time()
 
             # Generate processes
-            collect_mirror_procs = self._options['group_subprocesses']
+            if self._options['group_subprocesses'] == 'Auto':
+                    collect_mirror_procs = True
+            else:
+                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 \
@@ -1695,7 +1715,7 @@
                                              self.multiparticle_string(label))
     
     # Display
-    def do_display(self, line):
+    def do_display(self, line, output=sys.stdout):
         """Display current internal status"""
 
         args = self.split_arg(line)
@@ -1758,7 +1778,7 @@
                 text += '\n'
             pydoc.pager(text)
 
-        elif args[0] == 'interactions':
+        elif args[0] == 'interactions' and len(args)==2 and args[1].isdigit():
             for arg in args[1:]:
                 if int(arg) > len(self._curr_model['interactions']):
                     raise self.InvalidCmd, 'no interaction %s in current model' % arg
@@ -1768,6 +1788,43 @@
                     print "Interactions %s has the following property:" % arg
                     print self._curr_model['interactions'][int(arg)-1]
 
+        elif args[0] == 'interactions':
+            request_part = args[1:]
+            text = ''
+            for i, inter in enumerate(self._curr_model['interactions']):
+                present_part = [part['is_part'] and part['name'] or part['antiname']
+                                 for part in inter['particles']
+                                if (part['is_part'] and  part['name'] in request_part) or
+                                   (not part['is_part'] and part['antiname'] in request_part)]
+                if len(present_part) < len(request_part):
+                    continue
+                # check that all particles are selected at least once
+                if set(present_part) != set(request_part):
+                    continue
+                # check if a particle is asked more than once
+                if len(request_part) > len(set(request_part)):
+                    for p in request_part:
+                        print p, request_part.count(p),present_part.count(p)
+                        if request_part.count(p) > present_part.count(p):
+                            continue
+                        
+                name = str(i+1) + ' : '
+                for part in inter['particles']:
+                    if part['is_part']:
+                        name += part['name']
+                    else:
+                        name += part['antiname']
+                    name += " "                   
+                text += "\nInteractions %s has the following property:\n" % name
+                text += str(self._curr_model['interactions'][i]) 
+
+                text += '\n'
+                print name
+            if text =='':
+                text += 'No matching for any interactions'
+            pydoc.pager(text)
+
+
         elif args[0] == 'parameters' and len(args) == 1:
             text = "Current model contains %i parameters\n" % \
                     sum([len(part) for part in 
@@ -1802,7 +1859,8 @@
                 print self.multiparticle_string(key)
                 
         elif args[0] == 'coupling_order':
-            hierarchy = self._curr_model.get_order_hierarchy().items()
+            hierarchy = self._curr_model['order_hierarchy'].items()
+            #self._curr_model.get_order_hierarchy().items()
             def order(first, second):
                 if first[1] < second[1]:
                     return -1
@@ -1881,7 +1939,7 @@
             pydoc.pager(outstr)            
         
         elif args[0] in  ["options", "variable"]:
-            super(MadGraphCmd, self).do_display(line)
+            super(MadGraphCmd, self).do_display(line, output)
                 
             
     def multiparticle_string(self, key):
@@ -2701,7 +2759,7 @@
 
 
     
-    def set_configuration(self, config_path=None):
+    def set_configuration(self, config_path=None, test=False):
         """ assign all configuration variable from file 
             ./input/mg5_configuration.txt. assign to default if not define """
             
@@ -2709,7 +2767,8 @@
                               'web_browser':None,
                               'eps_viewer':None,
                               'text_editor':None,
-                              'fortran_compiler':None}
+                              'fortran_compiler':None,
+                              'automatic_html_opening':True}
         
         if not config_path:
             try:
@@ -2737,6 +2796,9 @@
                 if value.lower() == "none":
                     self.configuration[name] = None
 
+        if test:
+            return self.configuration
+
         # Treat each expected input
         # 1: Pythia8_path
         # try relative path
@@ -2744,11 +2806,11 @@
             if key == 'pythia8_path':
                 pythia8_dir = pjoin(MG5DIR, self.configuration['pythia8_path'])
                 if not os.path.isfile(pjoin(pythia8_dir, 'include', 'Pythia.h')):
-                    if os.path.isfile(pjoin(self.configuration['pythia8_path'], 'include', 'Pythia.h')):
-                        pythia8_dir = self.configuration['pythia8_path']
+                    if not os.path.isfile(pjoin(self.configuration['pythia8_path'], 'include', 'Pythia.h')):
+                       self.configuration['pythia8_path'] = None
                     else:
-                        pythia8_dir = None
-                self.pythia8_path = pythia8_dir
+                        continue
+                    
             elif key.endswith('path'):
                 pass
             elif key in ['cluster_type', 'automatic_html_opening']:
@@ -2804,12 +2866,25 @@
                 if hasattr(self, 'do_shell'):
                     ME = madevent_interface.MadEventCmdShell(me_dir=args[1])
                 else:
-                     ME = madevent_interface.MadEventCmdShell(me_dir=args[1])
-                stop = self.define_child_cmd_interface(ME)
+                     ME = madevent_interface.MadEventCmd(me_dir=args[1])
+                # transfer interactive configuration
+                config_line = [l for l in self.history if l.strip().startswith('set')]
+                for line in config_line:
+                    ME.exec_cmd(line)
+                stop = self.define_child_cmd_interface(ME)                
                 return stop
             
             #check if this is a cross-section
-            if len(self._generate_info.split('>')[0].strip().split())>1:
+            if not self._generate_info:
+                # This relaunch an old run -> need to check if this is a 
+                # cross-section or a width
+                info = open(pjoin(args[1],'SubProcesses','procdef_mg5.dat')).read()
+                generate_info = info.split('# Begin PROCESS',1)[1].split('\n')[1]
+                generate_info = generate_info.split('#')[0]
+            else:
+                generate_info = self._generate_info
+            
+            if len(generate_info.split('>')[0].strip().split())>1:
                 ext_program = launch_ext.MELauncher(args[1], self.timeout, self,
                                 pythia=self.configuration['pythia-pgs_path'],
                                 delphes=self.configuration['delphes_path'],
@@ -2823,8 +2898,9 @@
                                 delphes=self.configuration['delphes_path'],
                                 shell = hasattr(self, 'do_shell'),
                                 **options)
+
         elif args[0] == 'pythia8':
-            ext_program = launch_ext.Pythia8Launcher(self, args[1], self.timeout,
+            ext_program = launch_ext.Pythia8Launcher( args[1], self.timeout, self,
                                                 **options)
         else:
             os.chdir(start_cwd) #ensure to go to the initial path
@@ -2944,7 +3020,10 @@
                             for q in self._options[args[0]]]))
             
         elif args[0] == 'group_subprocesses':
-            self._options[args[0]] = eval(args[1])
+            if args[1] != 'Auto':
+                self._options[args[0]] = eval(args[1])
+            else:
+                self._options[args[0]] = 'Auto'
             logger.info('Set group_subprocesses to %s' % \
                         str(self._options[args[0]]))
             logger.info('Note that you need to regenerate all processes')
@@ -3015,8 +3094,14 @@
             if answer != 'y':
                 raise self.InvalidCmd('Stopped by user request')
 
-        group_subprocesses = self._export_format == 'madevent' and \
-                             self._options['group_subprocesses']
+        #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:
+                    group_subprocesses = True
+                elif self._curr_amps[0].get_ninitial()  == 2:
+                    group_subprocesses = True
 
         if self._curr_amps.has_any_loop_process() and \
            self._export_format not in ['standalone','matrix']:
@@ -3079,10 +3164,20 @@
             self._curr_amps.sort(lambda a1, a2: a2.get_number_of_diagrams() - \
                                  a1.get_number_of_diagrams())
 
+            # Check if we need to group the SubProcesses or not
+            group = True
+            if self._options['group_subprocesses'] is False:
+                group = False
+            elif self._options['group_subprocesses'] == 'Auto' and \
+                                         self._curr_amps[0].get_ninitial() == 1:
+                   group = False 
+
+
+
             cpu_time1 = time.time()
             ndiags = 0
             if not self._curr_matrix_elements.get_matrix_elements():
-                if self._options['group_subprocesses']:
+                if group:
                     cpu_time1 = time.time()
                     dc_amps = [amp for amp in self._curr_amps if isinstance(amp, \
                                         diagram_generation.DecayChainAmplitude)]

=== added file 'madgraph/interface/coloring_logging.py'
--- madgraph/interface/coloring_logging.py	1970-01-01 00:00:00 +0000
+++ madgraph/interface/coloring_logging.py	2012-02-16 18:25:20 +0000
@@ -0,0 +1,52 @@
+import logging
+
+BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
+
+COLORS = {
+    'WARNING'  : RED,
+    'INFO'     : BLACK,
+    'DEBUG'    : BLUE,
+    'CRITICAL' : RED,
+    'ERROR'    : RED,
+    'RED'      : RED,
+    'GREEN'    : GREEN,
+    'YELLOW'   : YELLOW,
+    'BLUE'     : BLUE,
+    'MAGENTA'  : MAGENTA,
+    'CYAN'     : CYAN,
+    'WHITE'    : WHITE,
+}
+
+RESET_SEQ = "\033[0m"
+COLOR_SEQ = "\033[1;%dm"
+BOLD_SEQ  = "\033[1m"
+
+class ColorFormatter(logging.Formatter):
+
+    def __init__(self, *args, **kwargs):
+        # can't do super(...) here because Formatter is an old school class
+        logging.Formatter.__init__(self, *args, **kwargs)
+
+    def format(self, record):
+        levelname = record.levelname
+        message   = logging.Formatter.format(self, record) + RESET_SEQ
+        for k,v in COLORS.items():
+            message = message.replace("$" + k,    COLOR_SEQ % (v+30))\
+                         .replace("$BG" + k,  COLOR_SEQ % (v+40))\
+                         .replace("$BG-" + k, COLOR_SEQ % (v+40))        
+        
+        
+        if levelname == 'INFO':
+            message   = message.replace("$RESET", '')\
+                           .replace("$BOLD",  '')\
+                           .replace("$COLOR", '')
+            return message
+        else:    
+            color     = COLOR_SEQ % (30 + COLORS[levelname])
+            message   = message.replace("$RESET", RESET_SEQ)\
+                           .replace("$BOLD",  BOLD_SEQ)\
+                           .replace("$COLOR", color)
+
+        return message 
+
+logging.ColorFormatter = ColorFormatter
\ No newline at end of file

=== modified file 'madgraph/interface/extended_cmd.py'
--- madgraph/interface/extended_cmd.py	2011-12-07 16:17:13 +0000
+++ madgraph/interface/extended_cmd.py	2012-02-16 18:25:20 +0000
@@ -21,6 +21,7 @@
 import pydoc
 import signal
 import subprocess
+import sys
 import traceback
 try:
     import readline
@@ -72,14 +73,23 @@
                 continue
             name = name.replace(' ', '_')
             valid += 1
-            out.append(opt[0]+'@@'+name+'@@')
+            out.append(opt[0].rstrip()+'@@'+name+'@@')
+            # Remove duplicate
+            d = {}
+            for x in opt:
+                d[x] = 1    
+            opt = list(d.keys())
+            opt.sort()
             out += opt
+
+            
         if valid == 1:
             out = out[1:]
         return out
 
     def print_suggestions(self, substitution, matches, longest_match_length) :
         """print auto-completions by category"""
+        longest_match_length += len(self.completion_prefix)
         try:
             if len(matches) == 1:
                 self.stdout.write(matches[0]+' ')
@@ -95,10 +105,12 @@
                         category = category.replace('_',' ')
                         self.stdout.write('\n %s:\n%s\n' % (category, '=' * (len(category)+2)))
                         start = 0
+                        pos = 0
                         continue
                     elif pos and pos % nb_column ==0:
                         self.stdout.write('\n')
-                    self.stdout.write(val + ' ' * (longest_match_length +1 -len(val)))
+                    self.stdout.write(self.completion_prefix + val + \
+                                      ' ' * (longest_match_length +1 -len(val)))
                     pos +=1
                 self.stdout.write('\n')
             else:
@@ -107,7 +119,8 @@
                 for i,val in enumerate(matches):
                     if i and i%nb_column ==0:
                         self.stdout.write('\n')
-                    self.stdout.write(val + ' ' * (longest_match_length +1 -len(val)))
+                    self.stdout.write(self.completion_prefix + val + \
+                                     ' ' * (longest_match_length +1 -len(val)))
                 self.stdout.write('\n')
     
             self.stdout.write(self.prompt+readline.get_line_buffer())
@@ -139,6 +152,66 @@
             except:
                 cr = (25, 80)
         return int(cr[1])
+    
+    def complete(self, text, state):
+        """Return the next possible completion for 'text'.
+         If a command has not been entered, then complete against command list.
+         Otherwise try to call complete_<command> to get list of completions.
+        """
+        if state == 0:
+            import readline
+            origline = readline.get_line_buffer()
+            line = origline.lstrip()
+            stripped = len(origline) - len(line)
+            begidx = readline.get_begidx() - stripped
+            endidx = readline.get_endidx() - stripped
+            
+            if ';' in line:
+                begin, line = line.rsplit(';',1)
+                begidx = begidx - len(begin) - 1
+                endidx = endidx - len(begin) - 1
+                if line[:begidx] == ' ' * begidx:
+                    begidx=0
+
+            if begidx>0:
+                cmd, args, foo = self.parseline(line)
+                if cmd == '':
+                    compfunc = self.completedefault
+                else:
+                    try:
+                        compfunc = getattr(self, 'complete_' + cmd)
+                    except AttributeError:
+                        compfunc = self.completedefault
+            else:
+                compfunc = self.completenames
+            # correct wrong splitting with '-'
+            if line and line[begidx-1] == '-':
+             try:    
+                Ntext = line.split()[-1]
+                self.completion_prefix = Ntext.rsplit('-',1)[0] +'-'
+                to_rm = len(self.completion_prefix)
+                Nbegidx = len(line.rsplit(None, 1)[0])
+                data = compfunc(Ntext, line, Nbegidx, endidx)
+                self.completion_matches = [p[to_rm:] for p in data 
+                                              if len(p)>to_rm]
+             except Exception, error:
+                 print error
+            else:
+                self.completion_prefix = ''
+                self.completion_matches = compfunc(text, line, begidx, endidx)
+        #print self.completion_matches
+
+        self.completion_matches = [ (l[-1] in [' ','@','=',os.path.sep] 
+                      and l or (l+' ')) for l in self.completion_matches if l]
+        
+        try:
+            return self.completion_matches[state]
+        except IndexError, error:
+            #if __debug__:
+            #    print '\n Completion ERROR:'
+            #    print error
+            #    print '\n'
+            return None    
 
 class Cmd(BasicCmd):
     """Extension of the cmd.Cmd command line.
@@ -196,10 +269,15 @@
 
         # Update the history of this suite of command,
         # except for useless commands (empty history and help calls)
-        if line != "history" and \
-            not line.startswith('help') and \
-            not line.startswith('#*'):
-            self.history.append(line)
+        if ';' in line: 
+            lines = line.split(';')
+        else:
+            lines = [line]
+        for l in lines:
+            l = l.strip()
+            if not (l.startswith("history") or l.startswith('help') or \
+                                                            l.startswith('#*')):
+                self.history.append(l)
 
         # Check if we are continuing a line:
         if self.save_line:
@@ -234,7 +312,13 @@
         os.chdir(self.__initpos)
         # Create the debug files
         self.log = False
-        cmd.Cmd.onecmd(self, 'history %s' % self.debug_output)
+        if os.path.exists(self.debug_output):
+            os.remove(self.debug_output)
+        try:
+            cmd.Cmd.onecmd(self, 'history %s' % self.debug_output)
+        except Exception, error:
+            print error
+            
         debug_file = open(self.debug_output, 'a')
         traceback.print_exc(file=debug_file)
         # Create a nice error output
@@ -249,6 +333,13 @@
                                             str(error).replace('\n','\n\t'))
         error_text += self.error_debug % {'debug': self.debug_output}
         logger_stderr.critical(error_text)
+                
+        # Add options status to the debug file
+        try:
+            self.do_display('options', debug_file)
+        except Exception, error:
+            debug_file.write('Fail to write options with error %s' % error)
+        
         #stop the execution if on a non interactive mode
         if self.use_rawinput == False:
             return True 
@@ -292,11 +383,18 @@
         error_text += '%s : %s' % (error.__class__.__name__,
                                                 str(error).replace('\n','\n\t'))
         logger_stderr.error(error_text)
+        
+        # Add options status to the debug file
+        try:
+            self.do_display('options', debug_file)
+        except Exception, error:
+            debug_file.write('Fail to write options with error %s' % error)
         #stop the execution if on a non interactive mode                                
         if self.use_rawinput == False:
             return True
         # Remove failed command from history                                            
-        self.history.pop()
+        if self.history:
+            self.history.pop()
         return False
 
 
@@ -381,6 +479,17 @@
                 out.append(data)
         return out
 
+    def correct_splitting(line):
+        """if the line finish with a '-' the code splits in a weird way
+           on GNU_SPLITTING"""
+                
+        line = line.lstrip()
+        if line[-1] in [' ','\t']:
+            return '', line, len(line),len(enidx)
+        return text, line, begidx, endidx
+        
+        
+        
      
     # Write the list of command line use in this session
     def do_history(self, line):
@@ -780,7 +889,7 @@
             text+='\t %s \n' % option      
         print text
 
-    def do_display(self, line):
+    def do_display(self, line, output=sys.stdout):
         """Advanced commands: basic display"""
         
         args = self.split_arg(line)
@@ -791,10 +900,10 @@
             raise self.InvalidCmd, 'display require at least one argument'
         
         if args[0] == "options":
-            outstr = "Value of current MG5 Options:\n" 
+            outstr = "Value of current Options:\n" 
             for key, value in self.configuration.items() + self._options.items():
                 outstr += '%25s \t:\t%s\n' %(key,value)
-            print outstr
+            output.write(outstr)
             
         elif args[0] == "variable":
             outstr = "Value of Internal Variable:\n"
@@ -836,18 +945,6 @@
     def list_completion(text, list, line=''):
         """Propose completions of text in list"""
 
-        rm=0
-        if text:
-            line = line[:-len(text)]
-        
-        if line.endswith('-'):
-            if line.endswith('--'):
-                rm += 2
-                text =  '--%s' % text 
-            else:
-                rm += 1
-                text =  '-%s' % text
-        
         if not text:
             completions = list
         else:
@@ -855,13 +952,8 @@
                             for f in list
                             if f.startswith(text)
                             ]
-        def put_space(name, rm): 
-            if name.endswith(' '): 
-                return name
-            else:
-                return '%s ' % name[rm:] 
             
-        return [put_space(name, rm) for name in completions] 
+        return completions
             
 
     @staticmethod

=== modified file 'madgraph/interface/launch_ext_program.py'
--- madgraph/interface/launch_ext_program.py	2012-01-05 12:58:34 +0000
+++ madgraph/interface/launch_ext_program.py	2012-02-16 18:25:20 +0000
@@ -40,14 +40,14 @@
     
     force = False
     
-    def __init__(self, running_dir, card_dir='', timeout=None,
+    def __init__(self, cmd, running_dir, card_dir='', timeout=None,
                  **options):
         """ initialize an object """
         
         self.running_dir = running_dir
         self.card_dir = os.path.join(self.running_dir, card_dir)
         self.timeout = timeout
-        
+        self.cmd_int = cmd
         #include/overwrite options
         for key,value in options.items():
             setattr(self, key, value)
@@ -91,7 +91,7 @@
         """nice handling of question"""
      
         if not self.force:
-            return cmd.Cmd().ask(question, default, choices=choices, path_msg=path_msg,
+            return self.cmd_int.ask(question, default, choices=choices, path_msg=path_msg,
                                timeout=self.timeout, fct_timeout=self.timeout_fct)
         else:
             return str(default)
@@ -132,10 +132,10 @@
 class SALauncher(ExtLauncher):
     """ A class to launch a simple Standalone test """
     
-    def __init__(self, running_dir, timeout, **options):
+    def __init__(self, cmd_int, running_dir, timeout, **options):
         """ initialize the StandAlone Version"""
         
-        ExtLauncher.__init__(self, running_dir, './Cards', timeout, **options)
+        ExtLauncher.__init__(self, cmd_int, running_dir, './Cards', timeout, **options)
         self.cards = ['param_card.dat']
 
     
@@ -158,8 +158,7 @@
     def __init__(self, running_dir, timeout, cmd_int , unit='pb', **option):
         """ initialize the StandAlone Version"""
 
-        super(MELauncher,self).__init__(running_dir, './Cards', timeout, **option)
-        #self.executable = os.path.join('.', 'bin','generate_events')
+        ExtLauncher.__init__(self, cmd_int, running_dir, './Cards', timeout, **option)
 
         assert hasattr(self, 'cluster')
         assert hasattr(self, 'multicore')
@@ -167,7 +166,6 @@
         assert hasattr(self, 'shell')
 
         self.unit = unit
-        self.cmd_int = cmd_int
         
         if self.cluster:
             self.cluster = 1
@@ -204,13 +202,30 @@
         import madgraph.interface.madevent_interface as ME
         
         if self.shell:
-            usecmd = ME.MadEventCmdShell
+            usecmd = ME.MadEventCmdShell(me_dir=self.running_dir)
         else:
-            usecmd = ME.MadEventCmd
+            usecmd = ME.MadEventCmd(me_dir=self.running_dir)
+        
+        #Check if some configuration were overwritten by a command. If so use it    
+        set_cmd = [l for l in self.cmd_int.history if l.strip().startswith('set')]
+        for line in set_cmd:
+            try:
+                usecmd.exec_cmd(line)
+            except:
+                pass
         launch = self.cmd_int.define_child_cmd_interface(
-                     usecmd(me_dir=self.running_dir), interface=False)
+                     usecmd, interface=False)
         #launch.me_dir = self.running_dir
-        command = 'generate_events %s' % self.name
+        if self.unit == 'pb':
+            command = 'generate_events %s' % self.name
+        else:
+            warning_text = '''\
+This command will create a new param_card with the computed width. 
+This param_card makes sense only if you include all processes for
+the computation of the width.'''
+            logger.warning(warning_text)
+
+            command = 'calculate_decay_widths %s' % self.name
         if mode == "1":
             command += " --cluster"
         elif mode == "2":
@@ -252,11 +267,11 @@
 class Pythia8Launcher(ExtLauncher):
     """A class to launch Pythia8 run"""
     
-    def __init__(self, running_dir, timeout, **option):
+    def __init__(self, running_dir, timeout, cmd_int, **option):
         """ initialize launching Pythia 8"""
 
         running_dir = os.path.join(running_dir, 'examples')
-        ExtLauncher.__init__(self, running_dir, '.', timeout, **option)
+        ExtLauncher.__init__(self, cmd_int, running_dir, '.', timeout, **option)
         self.cards = []
     
     def prepare_run(self):

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2011-12-07 16:17:13 +0000
+++ madgraph/interface/madevent_interface.py	2012-02-16 18:25:20 +0000
@@ -56,6 +56,7 @@
     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 models.check_param_card as check_param_card    
     from madgraph import InvalidCmd, MadGraph5Error
     MADEVENT = False
@@ -64,6 +65,7 @@
         print error
     # import from madevent directory
     import internal.extended_cmd as cmd
+    import internal.banner as banner_mod
     import internal.misc as misc    
     from internal import InvalidCmd, MadGraph5Error
     import internal.files as files
@@ -228,11 +230,16 @@
                 self.results.current and 'run_name' in self.results.current and \
                 hasattr(self, 'me_dir'):
             name = self.results.current['run_name']
-            self.debug_output = pjoin(self.me_dir, '%s_debug.log' % name)
+            tag = self.results.current['tag']
+            self.debug_output = pjoin(self.me_dir, '%s_%s_debug.log' % (name,tag))
             self.results.current.debug = self.debug_output
         else:
             #Force class default
             self.debug_output = MadEventCmd.debug_output
+        if os.path.exists('ME5_debug') and not 'ME5_debug' in self.debug_output:
+            os.remove('ME5_debug')
+        if not 'ME5_debug' in self.debug_output:
+            os.system('ln -s %s ME5_debug &> /dev/null' % self.debug_output)
 
     
     def nice_user_error(self, error, line):
@@ -332,7 +339,7 @@
                                self._survey_options.items()])
         
     def help_refine(self):
-        logger.info("syntax: refine require_precision [max_channel] [run_name] [--run_options]")
+        logger.info("syntax: refine require_precision [max_channel] [--run_options]")
         logger.info("-- refine the LAST run to achieve a given precision.")
         logger.info("   require_precision: can be either the targeted number of events")
         logger.info('                      or the required relative error')
@@ -341,15 +348,23 @@
         
     def help_combine_events(self):
         """ """
-        logger.info("syntax: combine_events [run_name] [--run_options]")
+        logger.info("syntax: combine_events [--run_options]")
         logger.info("-- Combine the last run in order to write the number of events")
         logger.info("   require in the run_card.")
         self.run_options_help([])
 
-    def help_combine_events(self):
+    def help_store_events(self):
         """ """
-        logger.info("syntax: store_events [run_name] [--run_options]")
+        logger.info("syntax: store_events [--run_options]")
         logger.info("-- Write physically the events in the files.")
+        logger.info("   should be launch after \'combine_events\'")
+        self.run_options_help([])
+
+    def help_create_gridpack(self):
+        """ """
+        logger.info("syntax: create_gridpack [--run_options]")
+        logger.info("-- create the gridpack. ")
+        logger.info("   should be launch after \'store_events\'")
         self.run_options_help([])
 
     def help_import(self):
@@ -369,11 +384,11 @@
         logger.info("   -f options: answer all question by default.")
         
     def help_remove(self):
-        logger.info("syntax: remove RUN [all|parton|pythia|pgs|delphes] [-f]")
+        logger.info("syntax: remove RUN [all|parton|pythia|pgs|delphes|banner] [-f] [--tag=]")
         logger.info("-- Remove all the files linked to previous run RUN")
         logger.info("   if RUN is 'all', then all run will be cleaned.")
         logger.info("   The optional argument precise which part should be cleaned.")
-        logger.info("   By default we clean all the related files but the banner.")
+        logger.info("   By default we clean all the related files but the banners.")
         logger.info("   the optional '-f' allows to by-pass all security question")
         logger.info("   The banner can be remove only if all files are removed first.")
 
@@ -381,18 +396,21 @@
         logger.info("syntax: pythia [RUN] [--run_options]")
         logger.info("-- run pythia on RUN (current one by default)")
         self.run_options_help([('-f','answer all question by default'),
+                               ('-tag=', 'define the tag for the pythia run'),
                                ('--no_default', 'not run if pythia_card not present')])        
                 
     def help_pgs(self):
         logger.info("syntax: pgs [RUN] [--run_options]")
         logger.info("-- run pgs on RUN (current one by default)")
         self.run_options_help([('-f','answer all question by default'),
+                               ('-tag=', 'define the tag for the pgs run'),
                                ('--no_default', 'not run if pgs_card not present')]) 
 
     def help_delphes(self):
         logger.info("syntax: delphes [RUN] [--run_options]")
         logger.info("-- run delphes on RUN (current one by default)")
         self.run_options_help([('-f','answer all question by default'),
+                               ('-tag=', 'define the tag for the delphes run'),
                                ('--no_default', 'not run if delphes_card not present')]) 
        
 #===============================================================================
@@ -408,30 +426,45 @@
             self.help_banner_run()
             raise self.InvalidCmd('banner_run reauires at least one argument.')
         
+        tag = [a[6:] for a in args if a.startswith('--tag=')]
+        
+        
         if os.path.exists(args[0]):
             type ='banner'
             format = self.detect_card_type(args[0])
             if format != 'banner':
                 raise self.InvalidCmd('The file is not a valid banner.')
-        elif os.path.exists(pjoin(self.me_dir,'Events','%s_banner.txt' % args[0])):
+        elif tag:
+            args[0] = pjoin(self.me_dir,'Events', args[0], '%s_%s_banner.txt' % \
+                                    (args[0], tag))                  
+            if not os.path.exists(args[0]):
+                raise self.InvalidCmd('No banner associates to this name and tag.')
+        else:
             name = args[0]
-            args[0] = pjoin(self.me_dir,'Events','%s_banner.txt')
             type = 'run'
-        else:
-            raise self.InvalidCmd('No banner associates to this name.')
-            
-        run_name = [arg[7:] for arg in args if arg.startswith('--name')]
+            banners = glob.glob(pjoin(self.me_dir,'Events', args[0], '*_banner.txt'))
+            if not banners:
+                raise self.InvalidCmd('No banner associates to this name.')    
+            elif len(banners) == 1:
+                args[0] = banners[0]
+            else:
+                #list the tag and propose those to the user
+                tags = [os.path.basename(p)[len(args[0])+1:-11] for p in banners]
+                tag = self.ask('which tag do you want to use?', tags[0], tags)
+                args[0] = pjoin(self.me_dir,'Events', args[0], '%s_%s_banner.txt' % \
+                                    (args[0], tag))                
+                        
+        run_name = [arg[7:] for arg in args if arg.startswith('--name=')]
         if run_name:
             try:
-                os.exec_cmd('remove %s all' % run_name)
+                os.exec_cmd('remove %s all banner' % run_name)
             except:
                 pass
-            self.set_run_name(args[0], True)
+            self.set_run_name(args[0], tag=None, level='parton', reload_card=True)
         elif type == 'banner':
             self.set_run_name(self.find_available_run_name(self.me_dir))
         elif type == 'run':
-            data = glob.glob(pjoin(self.me_dir, 'Events', '%s_*' % name))
-            if len(data) > 1:
+            if os.path.exists(pjoin(self.me_dir, 'Events', name)):
                 run_name = self.find_available_run_name(self.me_dir)
                 logger.info('Run %s is not empty so will use run_name: %s' % \
                                                                (name, run_name))
@@ -439,7 +472,6 @@
             else:
                 self.set_run_name(name)
             
-
     def check_history(self, args):
         """check the validity of line"""
         
@@ -537,7 +569,7 @@
             # No run name assigned -> assigned one automaticaly 
             self.set_run_name(self.find_available_run_name(self.me_dir))
         else:
-            self.set_run_name(args[0], True)
+            self.set_run_name(args[0], None,'parton', True)
             args.pop(0)
             
         return True
@@ -634,19 +666,22 @@
     def check_refine(self, args):
         """check that the argument for survey are valid"""
 
-        # if last argument is not a number -> it's the run_name
+        # if last argument is not a number -> it's the run_name (Not allow anymore)
         try:
             float(args[-1])
         except ValueError:
-            self.set_run_name(args[-1])
-            del args[-1]
+            self.help_refine()
+            raise self.InvalidCmd('Not valid arguments')
         except IndexError:
             self.help_refine()
             raise self.InvalidCmd('require_precision argument is require for refine cmd')
 
     
         if not self.run_name:
-            raise self.InvalidCmd('No run_name currently define. Impossible to run refine')
+            if self.results.lastrun:
+                self.set_run_name(self.results.lastrun)
+            else:
+                raise self.InvalidCmd('No run_name currently define. Impossible to run refine')
 
         if len(args) > 2:
             self.help_refine()
@@ -663,11 +698,15 @@
     def check_combine_events(self, arg):
         """ Check the argument for the combine events command """
         
-        if len(arg) >1:
+        if len(arg):
             self.help_combine_events()
             raise self.InvalidCmd('Too many argument for combine_events command')
         
-        if len(arg):
+        if not self.run_name:
+            if not self.results.lastrun:
+                raise self.InvalidCmd('No run_name currently define. Impossible to run combine')
+            else:
+                self.set_run_name(self.results.lastrun)
             self.set_run_name(arg[0])
         
         return True
@@ -679,7 +718,7 @@
         """
         
         mode = None
-        laststep = [arg for arg in args if arg.startswith('--lastep=')]
+        laststep = [arg for arg in args if arg.startswith('--laststep=')]
         if laststep and len(laststep)==1:
             mode = laststep[0].split('=')[-1]
             if mode not in ['auto', 'pythia', 'pgs', 'delphes']:
@@ -688,15 +727,27 @@
         elif laststep:
             raise self.InvalidCmd('only one laststep argument is allowed')
      
+        tag = [a for a in args if a.startswith('--tag=')]
+        if tag: 
+            args.remove(tag[0])
+            tag = tag[0][6:]
+     
         if len(args) == 0 and not self.run_name:
-            self.help_pythia()
-            raise self.InvalidCmd('No run name currently define. Please add this information.')             
+            if self.results.lastrun:
+                args.insert(0, self.results.lastrun)
+            else:
+                raise self.InvalidCmd('No run name currently define. Please add this information.')             
         
         if len(args) == 1:
             if args[0] != self.run_name and\
              not os.path.exists(pjoin(self.me_dir,'Events',args[0], 'unweighted_events.lhe.gz')):
                 raise self.InvalidCmd('No events file corresponding to %s run. '% args[0])
-            self.set_run_name(args[0])
+            self.set_run_name(args[0], tag, 'pythia')
+        else:
+            if tag:
+                self.run_card['run_tag'] = tag
+            self.set_run_name(self.run_name, tag, 'pythia')
+            
 
         if  not os.path.exists(pjoin(self.me_dir,'Events',self.run_name,'unweighted_events.lhe.gz')):
             raise self.InvalidCmd('No events file corresponding to %s run. '% self.run_name)
@@ -724,19 +775,34 @@
     def check_remove(self, args):
         """Check that the remove command is valid"""
 
-
-        if len(args) == 0:
+        tmp_args = args[:]
+
+        tag = [a[6:] for a in tmp_args if a.startswith('--tag=')]
+        if tag:
+            tag = tag[0]
+            tmp_args.remove('--tag=%s' % tag)
+
+        try:
+            tmp_args.remove('-f')
+        except:
+            pass
+        else:
+            if args[0] == '-f':
+                args.pop(0)
+                args.append('-f')
+
+        if len(tmp_args) == 0:
             self.help_clean()
             raise self.InvalidCmd('clean command require the name of the run to clean')
-        elif len(args) == 1:
-            args.append('all')
+        elif len(tmp_args) == 1:
+            return tmp_args[0], tag, ['all']
         else:
-            for arg in args[1:]:
+            for arg in tmp_args[1:]:
                 if arg not in self._clean_mode and arg != '-f':
                     self.help_clean()
                     raise self.InvalidCmd('%s is not a valid options for clean command'\
                                               % arg)
-
+            return tmp_args[0], tag, tmp_args[1:]
 
     def check_plot(self, args):
         """Check the argument for the plot command
@@ -809,11 +875,19 @@
             error_msg = 'No pythia-pgs path correctly set.'
             error_msg += 'Please use the set command to define the path and retry.'
             error_msg += 'You can also define it in the configuration file.'
-            raise self.InvalidCmd(error_msg)  
-                  
+            raise self.InvalidCmd(error_msg)          
+        
+        tag = [a for a in arg if a.startswith('--tag=')]
+        if tag: 
+            arg.remove(tag[0])
+            tag = tag[0][6:]
+        
+        
         if len(arg) == 0 and not self.run_name:
-            self.help_pgs()
-            raise self.InvalidCmd('No run name currently define. Please add this information.')             
+            if self.results.lastrun:
+                args.insert(0, self.results.lastrun)
+            else:
+                raise self.InvalidCmd('No run name currently define. Please add this information.')             
         
         if len(arg) == 1 and self.run_name == arg[0]:
             arg.pop(0)
@@ -825,13 +899,19 @@
             Please specify a valid run_name''')
                               
         if len(arg) == 1:
-            self.set_run_name(arg[0])
-            if  not os.path.exists(pjoin(self.me_dir,'Events',self.run_name,'%s_pythia_events.hep.gz' % self.run_card['run_tag'])):
-                raise self.InvalidCmd('No events file corresponding to %s run. '% self.run_name)
+            prev_tag = self.set_run_name(arg[0], tag, 'pgs')
+            if  not os.path.exists(pjoin(self.me_dir,'Events',self.run_name,'%s_pythia_events.hep.gz' % prev_tag)):
+                raise self.InvalidCmd('No events file corresponding to %s run with tag %s. '% (self.run_name, prev_tag))
             else:
-                input_file = pjoin(self.me_dir,'Events', self.run_name, '%s_pythia_events.hep.gz' % self.run_card['run_tag'])
+                input_file = pjoin(self.me_dir,'Events', self.run_name, '%s_pythia_events.hep.gz' % prev_tag)
                 output_file = pjoin(self.me_dir, 'Events', 'pythia_events.hep')
-                os.system('gunzip -c %s > %s' % (input_file, output_file))
+                self.launch_job('gunzip',stdout=open(output_file,'w'), 
+                                 argument=['-c', input_file], mode=2)
+        else:
+            if tag: 
+                self.run_card['run_tag'] = tag
+            self.set_run_name(self.run_name, tag, 'pgs')
+            
 
     def check_delphes(self, arg):
         """Check the argument for pythia command
@@ -849,10 +929,18 @@
             error_msg += 'Please use the set command to define the path and retry.'
             error_msg += 'You can also define it in the configuration file.'
             raise self.InvalidCmd(error_msg)  
+
+        tag = [a for a in arg if a.startswith('--tag=')]
+        if tag: 
+            arg.remove(tag[0])
+            tag = tag[0][6:]
+            
                   
         if len(arg) == 0 and not self.run_name:
-            self.help_delphes()
-            raise self.InvalidCmd('No run name currently define. Please add this information.')             
+            if self.results.lastrun:
+                args.insert(0, self.results.lastrun)
+            else:
+                raise self.InvalidCmd('No run name currently define. Please add this information.')             
         
         if len(arg) == 1 and self.run_name == arg[0]:
             arg.pop(0)
@@ -864,14 +952,20 @@
             Please specify a valid run_name''')
                               
         if len(arg) == 1:
-            self.set_run_name(arg[0])
-            if  not os.path.exists(pjoin(self.me_dir,'Events','%s_pythia_events.hep.gz' % self.run_name)):
-                raise self.InvalidCmd('No events file corresponding to %s run. '% self.run_name)
+            prev_tag = self.set_run_name(arg[0], tag, 'delphes')
+            if  not os.path.exists(pjoin(self.me_dir,'Events',self.run_name, '%s_pythia_events.hep.gz' % prev_tag)):
+                raise self.InvalidCmd('No events file corresponding to %s run with tag %s.:%s '\
+                    % (self.run_name, prev_tag, 
+                       pjoin(self.me_dir,'Events',self.run_name, '%s_pythia_events.hep.gz' % prev_tag)))
             else:
-                input_file = pjoin(self.me_dir,'Events', '%s_pythia_events.hep.gz' % self.run_name)
+                input_file = pjoin(self.me_dir,'Events', self.run_name, '%s_pythia_events.hep.gz' % prev_tag)
                 output_file = pjoin(self.me_dir, 'Events', 'pythia_events.hep')
-                os.system('gunzip -c %s > %s' % (input_file, output_file))
-
+                self.launch_job('gunzip',stdout=open(output_file,'w'), 
+                                 argument=['-c', input_file], mode=2)
+        else:
+            if tag:
+                self.run_card['run_tag'] = tag
+            self.set_run_name(self.run_name, tag, 'delphes')               
 
     def check_display(self, args):
         """check the validity of line
@@ -913,21 +1007,44 @@
     def complete_banner_run(self, text, line, begidx, endidx):
        "Complete the banner run command"
        try:
+  
+        
         args = self.split_arg(line[0:begidx], error=False)
-        if len(args)==1:
-            comp = self.path_completion(text,
+        
+        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:
+            # only options are possible
+            tags = glob.glob(pjoin(self.me_dir, 'Events' , args[1],'%s_*_banner.txt' % args[1]))
+            tags = ['%s' % os.path.basename(t)[len(args[1])+1:-11] for t in tags]
+
+            if args[-1] != '--tag=':
+                tags = ['--tag=%s' % t for t in tags]
+            else:
+                return self.list_completion(text, tags)
+            return self.list_completion(text, tags +['--name=','-f'], line)
+        
+        # First argument
+        possibilites = {} 
+
+        comp = self.path_completion(text, os.path.join('.',*[a for a in args \
                                                     if a.endswith(os.path.sep)]))
-            run_list =  glob.glob(pjoin(self.me_dir, 'Events', '*_banner.txt'))
-            run_list = [n.rsplit('/',1)[1][:-11] for n in run_list]
-            comp += self.list_completion(text, run_list)
+        if os.path.sep in line:
             return comp
-        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)]))
+        else:
+            possibilites['Path from ./'] = comp
+
+        run_list =  glob.glob(pjoin(self.me_dir, 'Events', '*','*_banner.txt'))
+        run_list = [n.rsplit('/',2)[1] for n in run_list]
+        possibilites['RUN Name'] = self.list_completion(text, run_list)
+        
+        return self.deal_multiple_categories(possibilites)
     
-        return self.list_completion(text, ['--name=','-f'], line)
+        
        except Exception, error:
            print error
     def complete_history(self, text, line, begidx, endidx):
@@ -1009,7 +1126,9 @@
     
     complete_refine = complete_survey
     complete_combine_events = complete_survey
+    complite_store = complete_survey
     complete_generate_events = complete_survey
+    complete_create_gridpack = complete_survey
     
     def complete_generate_events(self, text, line, begidx, endidx):
         """ Complete the generate events"""
@@ -1075,11 +1194,23 @@
         """Complete the remove command """
      
         args = self.split_arg(line[0:begidx], error=False)
-        if len(args) > 1:
-            return self.list_completion(text, self._clean_mode + ['-f'])
+        if len(args) > 1 and (text.startswith('--t')):
+            run = args[1]
+            tags = ['--tag=%s' % tag['tag'] for tag in self.results[run]]
+            return self.list_completion(text, tags)
+        elif len(args) > 1 and '--' == args[-1]:
+            run = args[1]
+            tags = ['tag=%s' % tag['tag'] for tag in self.results[run]]
+            return self.list_completion(text, tags)
+        elif len(args) > 1 and '--tag=' == args[-1]:
+            run = args[1]
+            tags = [tag['tag'] for tag in self.results[run]]
+            return self.list_completion(text, tags)
+        elif len(args) > 1:
+            return self.list_completion(text, self._clean_mode + ['-f','--tag='])
         else:
-            data = glob.glob(pjoin(self.me_dir, 'Events', '*_banner.txt'))
-            data = [n.rsplit('/',1)[1].rsplit('_',1)[0] for n in data]
+            data = glob.glob(pjoin(self.me_dir, 'Events','*','*_banner.txt'))
+            data = [n.rsplit('/',2)[1] for n in data]
             return self.list_completion(text, ['all'] + data)
          
         
@@ -1089,35 +1220,37 @@
         args = self.split_arg(line[0:begidx], error=False)
         if len(args) == 1:
             #return valid run_name
-            data = glob.glob(pjoin(self.me_dir, 'Events', '*_unweighted_events.lhe.gz'))
-            data = [n.rsplit('/',1)[1][:-25] for n in data]
+            data = glob.glob(pjoin(self.me_dir, 'Events', '*','unweighted_events.lhe.gz'))
+            data = [n.rsplit('/',2)[1] for n in data]
             tmp1 =  self.list_completion(text, data)
             if not self.run_name:
                 return tmp1
             else:
-                tmp2 = self.list_completion(text, self._run_options + ['-f', '--no_default'], line)
+                tmp2 = self.list_completion(text, self._run_options + ['-f', 
+                                                '--no_default', '--tag='], line)
                 return tmp1 + tmp2
         else:
-            return self.list_completion(text, self._run_options + ['-f', '--no_default'], line)
+            return self.list_completion(text, self._run_options + ['-f', 
+                                                 '--no_default','--tag='], line)
 
     def complete_pgs(self,text, line, begidx, endidx):
         "Complete the pythia command"
-        
         args = self.split_arg(line[0:begidx], error=False) 
-                
         if len(args) == 1:
             #return valid run_name
-            data = glob.glob(pjoin(self.me_dir, 'Events', '*_pythia_events.hep.gz'))
-            data = [n.rsplit('/',1)[1][:-21] for n in data]
+            data = glob.glob(pjoin(self.me_dir, 'Events', '*', '*_pythia_events.hep.gz'))
+            data = [n.rsplit('/',2)[1] for n in data]
             tmp1 =  self.list_completion(text, data)
             if not self.run_name:
                 return tmp1
             else:
-                tmp2 = self.list_completion(text, self._run_options + ['-f', '--no_default'], line)
+                tmp2 = self.list_completion(text, self._run_options + ['-f', 
+                                                '--tag=' ,'--no_default'], line)
                 return tmp1 + tmp2        
         else:
-            return self.list_completion(text, self._run_options + ['-f', '--no_default'], line)
-    
+            return self.list_completion(text, self._run_options + ['-f', 
+                                                 '--tag=','--no_default'], line)
+
     complete_delphes = complete_pgs        
 
 
@@ -1201,6 +1334,8 @@
       
         self.to_store = []
         self.run_name = None
+        self.run_tag = None
+        self.banner = None
 
         # Get number of initial states
         nexternal = open(pjoin(me_dir,'Source','nexternal.inc')).read()
@@ -1224,6 +1359,7 @@
             process = self.process # define in find_model_name
             self.results = gen_crossxhtml.AllResults(model, process, self.me_dir)
         self.results.def_web_mode(self.web)
+
         
         self.configured = 0 # time for reading the card
         self._options = {} # for compatibility with extended_cmd
@@ -1357,10 +1493,8 @@
             elif key.startswith('cluster'):
                 pass              
             elif key == 'automatic_html_opening':
-                if self.configuration[key] == 'False':
-                    self.open_crossx = False
-                else:
-                    self.open_crossx = True
+                if self.configuration[key] in ['False', 'True']:
+                    self.configuration[key] =eval(self.configuration[key])
             elif key not in ['text_editor','eps_viewer','web_browser']:
                 # Default: try to set parameter
                 try:
@@ -1385,18 +1519,21 @@
             force = True
         else:
             force = False     
- 
-        # Split the banner
-        if MADEVENT:
-            import internal.splitbanner as splitbanner
-        else:
-            import madgraph.various.splitbanner as splitbanner
-            
-        splitbanner.split_banner(args[0], self.me_dir)
+             
+        banner_mod.split_banner(args[0], self.me_dir, proc_card=False)
+        
+        # Remove previous cards
+        for name in ['delphes_trigger.dat', 'delphes_card.dat',
+                     'pgs_card.dat', 'pythia_card.dat']:
+            try:
+                os.remove(pjoin(self.me_dir, 'Cards', name))
+            except:
+                pass
+        
         
         # Check if we want to modify the run
         if not force:
-            ans = self.ask('Do you want to modify this run?', 'n', ['y','n'], 
+            ans = self.ask('Do you want to modify the Cards?', 'n', ['y','n'], 
                                                            timeout=self.timeout)
             if ans == 'n':
                 force = True
@@ -1407,7 +1544,7 @@
  
  
     ############################################################################
-    def do_display(self, line):
+    def do_display(self, line, output=sys.stdout):
         """Display current internal status"""
 
         args = self.split_arg(line)
@@ -1415,19 +1552,27 @@
         self.check_display(args)
 
         if args[0] == 'run_name':
-            
-            
             #return valid run_name
-            data = glob.glob(pjoin(self.me_dir, 'Events', '*_banner.txt'))
-            data = [n.rsplit('/',1)[1][:-11] for n in data]
+            data = glob.glob(pjoin(self.me_dir, 'Events', '*','*_banner.txt'))
+            data = [n.rsplit('/',2)[1:] for n in data]
+            
             if data:
+                out = {}
+                for name, tag in data:
+                    tag = tag[len(name)+1:-11]
+                    if name in out:
+                        out[name].append(tag)
+                    else:
+                        out[name] = [tag]
                 print 'the runs available are:'
-                for run_name in data:
-                    print '    %s' % run_name
+                for run_name, tags in out.items():
+                    print '  run: %s' % run_name
+                    print '       tags: ', 
+                    print ', '.join(tags)
             else:
                 print 'No run detected.'
         else:
-            super(MadEventCmd, self).do_display(line)
+            super(MadEventCmd, self).do_display(line, output)
  
   
     ############################################################################
@@ -1487,6 +1632,13 @@
         elif args[0] in self.configuration:
             if args[1] in ['None','True','False']:
                 self.configuration[args[0]] = eval(args[1])
+            elif args[0].endswith('path'):
+                if os.path.exists(args[1]):
+                    self.configuration[args[0]] = args[1]
+                elif os.path.exists(pjoin(self.me_dir, args[1])):
+                    self.configuration[args[0]] = pjoin(self.me_dir, args[1])
+                else:
+                    raise self.InvalidCmd('Not a valid path: keep previous value: \'%s\'' % self.configuration[args[0]])
             else:
                 self.configuration[args[0]] = args[1]             
  
@@ -1522,9 +1674,9 @@
         self.ask_run_configuration(mode, force)
         if not args:
             # No run name assigned -> assigned one automaticaly 
-            self.set_run_name(self.find_available_run_name(self.me_dir))
+            self.set_run_name(self.find_available_run_name(self.me_dir), None, 'parton')
         else:
-            self.set_run_name(args[0], True)
+            self.set_run_name(args[0], None, 'parton', True)
             args.pop(0)
             
         if self.run_card['gridpack'] in self.true:        
@@ -1555,7 +1707,7 @@
    1) A massive s-channel particle has a width set to zero.
    2) The pdf are zero for at least one of the initial state particles.
    3) The cuts are too strong.
-   Please check/correct your param_card and your run_card.''')
+   Please check/correct your param_card and/or your run_card.''')
             
             nb_event = self.run_card['nevents']
             self.exec_cmd('refine %s' % nb_event, postcmd=False)
@@ -1580,15 +1732,16 @@
             # No run name assigned -> assigned one automaticaly 
             self.set_run_name(self.find_available_run_name(self.me_dir))
         else:
-            self.set_run_name(args[0], True)
+            self.set_run_name(args[0], reload_card=True)
             args.pop(0)
-            
+        
         # Running gridpack warmup
         opts=[('accuracy', accuracy), # default 0.01
               ('points', 1000),
               ('iterations',9)]
 
         logger.info('Calculating decay widths with run name %s' % self.run_name)
+        
         self.exec_cmd('survey  %s %s' % \
                       (self.run_name,
                        " ".join(['--' + opt + '=' + str(val) for (opt,val) \
@@ -1596,16 +1749,115 @@
                       postcmd=False)
         self.exec_cmd('combine_events', postcmd=False)
         self.exec_cmd('store_events', postcmd=False)
-        # Combine decay widths into new file
-        proc = subprocess.Popen(['python',
-                                 pjoin(self.dirbin, 'collect_decay_widths.py'),
-                                 self.run_name], 
-                                cwd=self.me_dir,
-                                stdout=subprocess.PIPE)
         
-        (stdout, stderr) = proc.communicate()
+        self.collect_decay_widths()
+        self.update_status('calculate_decay_widths done', 
+                                                 level='parton', makehtml=False)   
+
     
     ############################################################################
+    def collect_decay_widths(self):
+        """ Collect the decay widths and calculate BRs for all particles, and put 
+        in param_card form. 
+        """
+        
+        particle_dict = {} # store the results
+        run_name = self.run_name
+
+        # Looping over the Subprocesses
+        for P_path in SubProcesses.get_subP(self.me_dir):
+            ids = SubProcesses.get_subP_ids(P_path)
+            # due to grouping we need to compute the ratio factor for the 
+            # ungroup resutls (that we need here). Note that initial particles
+            # grouping are not at the same stage as final particle grouping
+            nb_output = len(ids) / (len(set([p[0] for p in ids])))
+            results = open(pjoin(P_path, run_name + '_results.dat')).read().split('\n')[0]
+            result = float(results.strip().split(' ')[0])
+            for particles in ids:
+                try:
+                    particle_dict[particles[0]].append([particles[1:], result/nb_output])
+                except KeyError:
+                    particle_dict[particles[0]] = [[particles[1:], result/nb_output]]
+
+        # Open the param_card.dat and insert the calculated decays and BRs
+        param_card_file = open(pjoin(self.me_dir, 'Cards', 'param_card.dat'))
+        param_card = param_card_file.read().split('\n')
+        param_card_file.close()
+
+        decay_lines = []
+        line_number = 0
+        # Read and remove all decays from the param_card                     
+        while line_number < len(param_card):
+            line = param_card[line_number]
+            if line.lower().startswith('decay'):
+                # Read decay if particle in particle_dict 
+                # DECAY  6   1.455100e+00                                    
+                line = param_card.pop(line_number)
+                line = line.split()
+                particle = 0
+                if int(line[1]) not in particle_dict:
+                    try: # If formatting is wrong, don't want this particle
+                        particle = int(line[1])
+                        width = float(line[2])
+                    except:
+                        particle = 0
+                # Read BRs for this decay
+                line = param_card[line_number]
+                while line.startswith('#') or line.startswith(' '):
+                    line = param_card.pop(line_number)
+                    if not particle or line.startswith('#'):
+                        line=param_card[line_number]
+                        continue
+                    #    6.668201e-01   3    5  2  -1
+                    line = line.split()
+                    try: # Remove BR if formatting is wrong
+                        partial_width = float(line[0])*width
+                        decay_products = [int(p) for p in line[2:2+int(line[1])]]
+                    except:
+                        line=param_card[line_number]
+                        continue
+                    try:
+                        particle_dict[particle].append([decay_products, partial_width])
+                    except KeyError:
+                        particle_dict[particle] = [[decay_products, partial_width]]
+                    line=param_card[line_number]
+                if particle and particle not in particle_dict:
+                    # No decays given, only total width       
+                    particle_dict[particle] = [[[], width]]
+            else: # Not decay                              
+                line_number += 1
+        # Clean out possible remaining comments at the end of the card
+        while not param_card[-1] or param_card[-1].startswith('#'):
+            param_card.pop(-1)
+
+        # Append calculated and read decays to the param_card                                   
+        param_card.append("#\n#*************************")
+        param_card.append("#      Decay widths      *")
+        param_card.append("#*************************")
+        for key in sorted(particle_dict.keys()):
+            width = sum([r for p,r in particle_dict[key]])
+            param_card.append("#\n#      PDG        Width")
+            param_card.append("DECAY  %i   %e" % (key, width))
+            if not width:
+                continue
+            if particle_dict[key][0][0]:
+                param_card.append("#  BR             NDA  ID1    ID2   ...")
+                brs = [[val[1]/width, val[0]] for val in particle_dict[key] if val[1]]
+                for val in sorted(brs, reverse=True):
+                    param_card.append("   %e   %i    %s" % (val[0], len(val[1]),
+                                           "  ".join([str(v) for v in val[1]])))
+        output_name = pjoin(self.me_dir, 'Events', run_name, "param_card.dat")
+        decay_table = open(output_name, 'w')
+        decay_table.write("\n".join(param_card) + "\n")
+        logger.info("Results written to %s" %  output_name)
+
+
+            
+
+
+
+
+    ############################################################################
     def do_multi_run(self, line):
         
         args = self.split_arg(line)
@@ -1788,10 +2040,6 @@
                                           cwd=pjoin(self.me_dir,'SubProcesses'),
                                           stdout=devnull)
         
-        #subprocess.call([pjoin(self.dirbin, 'sumall')], 
-        #                                 cwd=pjoin(self.me_dir,'SubProcesses'),
-        #                                 stdout=devnull)
-        
         self.update_status('finish refine', 'parton', makehtml=False)
         
     ############################################################################ 
@@ -1823,15 +2071,26 @@
             nb_event = pat.search(output).groups()[0]
             self.results.add_detail('nb_event', nb_event)
         
+        # Define The Banner
+        tag = self.run_card['run_tag']
+        self.banner.load_basic(self.me_dir)
+        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, 
+                                     '%s_%s_banner.txt' % (self.run_name, tag)))
+        self.banner.add(pjoin(self.me_dir, 'Cards', 'param_card.dat'))
+        self.banner.add(pjoin(self.me_dir, 'Cards', 'run_card.dat'))
+        
+        
         subprocess.call(['%s/put_banner' % self.dirbin, 'events.lhe'],
                             cwd=pjoin(self.me_dir, 'Events'))
         subprocess.call(['%s/put_banner'% self.dirbin, 'unweighted_events.lhe'],
                             cwd=pjoin(self.me_dir, 'Events'))
         
-        if os.path.exists(pjoin(self.me_dir, 'Events', 'unweighted_events.lhe')):
-            subprocess.call(['%s/extract_banner-pl' % self.dirbin, 
-                             'unweighted_events.lhe', 'banner.txt'],
-                            cwd=pjoin(self.me_dir, 'Events'))
+        #if os.path.exists(pjoin(self.me_dir, 'Events', 'unweighted_events.lhe')):
+        #    subprocess.call(['%s/extract_banner-pl' % self.dirbin, 
+        #                     'unweighted_events.lhe', 'banner.txt'],
+        #                    cwd=pjoin(self.me_dir, 'Events'))
         
         eradir = self.configuration['exrootanalysis_path']
         madir = self.configuration['madanalysis_path']
@@ -1860,24 +2119,8 @@
         if not os.path.exists(pjoin(self.me_dir, 'HTML', run)):
             os.mkdir(pjoin(self.me_dir, 'HTML', run))    
         
-        # 1) TREAT FILE PRESENT IN SubProcesses
-        # results.html
-        #input = pjoin(self.me_dir, 'SubProcesses', 'results.html')
-        #output = pjoin(self.me_dir, 'HTML', run, 'results.html')
-        #files.mv(input, output)
-        # results.dat. The usefull information is store in the pickle -> remove
-        #os.remove(pjoin(self.me_dir, 'SubProcesses','results.dat'))
-
         # 2) Treat the files present in the P directory
-        for Pdir in open(pjoin(self.me_dir, 'SubProcesses','subproc.mg')):
-            Pdir = Pdir.strip()
-            P_path = pjoin(self.me_dir, 'SubProcesses', Pdir)
-            # results.dat. 
-            #os.remove(pjoin(P_path, 'results.dat'))
-            # results.html
-            #input = pjoin(P_path, 'results.html')
-            #output = pjoin(self.me_dir, 'HTML', run, '%s_results.html' % Pdir)
-            #files.mv(input, output) 
+        for P_path in SubProcesses.get_subP(self.me_dir):
             G_dir = [G for G in os.listdir(P_path) if G.startswith('G') and 
                                                 os.path.isdir(pjoin(P_path,G))]
             for G in G_dir:
@@ -1885,16 +2128,17 @@
                 # Remove events file (if present)
                 if os.path.exists(pjoin(G_path, 'events.lhe')):
                     os.remove(pjoin(G_path, 'events.lhe'))
-                # Remove results.dat 
-                if os.path.exists(pjoin(G_path, 'results.dat')):
-                    os.remove(pjoin(G_path, 'results.dat'))
+                # Remove results.dat (but not for gridpack)
+                if self.run_card['gridpack'] not in self.true:
+                    if os.path.exists(pjoin(G_path, 'results.dat')):
+                        os.remove(pjoin(G_path, 'results.dat'))
                 # Store log
                 if os.path.exists(pjoin(G_path, 'log.txt')):
                     input = pjoin(G_path, 'log.txt')
                     output = pjoin(G_path, '%s_log.txt' % run)
                     files.mv(input, output) 
                 # Grid
-                for name in ['ftn25', 'ftn99']:
+                for name in ['ftn25', 'ftn99','ftn26']:
                     if os.path.exists(pjoin(G_path, name)):
                         if os.path.exists(pjoin(G_path, '%s_%s.gz'%(run,name))):
                             os.remove(pjoin(G_path, '%s_%s.gz'%(run,name)))
@@ -1915,18 +2159,13 @@
         for name in ['events.lhe', 'unweighted_events.lhe']:
             if os.path.exists(pjoin(E_path, name)):
                 if os.path.exists(pjoin(O_path, '%s.gz' % name)):
-                    os.remove(pjoin(O_path, '%s.lhe.gz' % name))
+                    os.remove(pjoin(O_path, '%s.gz' % name))
                 input = pjoin(E_path, name)
                 output = pjoin(O_path, name)
                 files.mv(input, output) 
                 subprocess.call(['gzip', output], stdout=devnull, stderr=devnull, 
                                                                      cwd=O_path)
-        # The banner -- This is tag dependent
-        if os.path.exists(pjoin(E_path, 'banner.txt')):
-            input = pjoin(E_path, 'banner.txt')
-            output = pjoin(O_path, '%s_%s_banner.txt' % (run, tag))            
-            files.mv(input, output)
-           
+                
         self.update_status('End Parton', level='parton', makehtml=False)
 
     ############################################################################ 
@@ -1934,23 +2173,23 @@
         """Advanced commands: Create gridpack from present run"""
 
         self.update_status('Creating gridpack', level='parton')
+        args = self.split_arg(line)
+        self.check_combine_events(args)
         os.system("sed -i.bak \"s/\s*.false.*=.*GridRun/  .true.  =  GridRun/g\" %s/Cards/grid_card.dat" \
                   % self.me_dir)
         subprocess.call(['./bin/internal/restore_data', self.run_name],
                         cwd=self.me_dir)
-        subprocess.call(['./bin/internal/store4grid', 'default'],
-                        cwd=self.me_dir)
+        self.exec_cmd('store_events')
         subprocess.call(['./bin/internal/clean'], cwd=self.me_dir)
         misc.compile(['gridpack.tar.gz'], cwd=self.me_dir)
         files.mv(pjoin(self.me_dir, 'gridpack.tar.gz'), 
                 pjoin(self.me_dir, '%s_gridpack.tar.gz' % self.run_name))
         self.update_status('gridpack created', level='gridpack')
-
+        
     ############################################################################      
     def do_pythia(self, line):
         """launch pythia"""
         
-
         # Check argument's validity
         args = self.split_arg(line)
         if '-f' in args:
@@ -1966,24 +2205,27 @@
             args.remove('--no_default')
         else:
             no_default = False
+                                    
         self.check_pythia(args)        
         # the args are modify and the last arg is always the mode
         
         self.ask_pythia_run_configuration(args[-1], force)
 
+        # Update the banner with the pythia card
+        if not self.banner:
+            self.banner = banner_mod.recover_banner(self.results, 'pythia')
                      
         # initialize / remove lhapdf mode        
         self.configure_directory()
-        
-        tag = self.run_card['run_tag']                
-        if not force:
-            if os.path.exists(pjoin(self.me_dir, 'Events', self.run_name, '%s_pythia.log' % tag)):
-                question = 'Previous run of pythia detected. Do you want to remove it?'
-                ans = self.ask(question, 'y', choices=['y','n'], timeout = 20)
-                if ans == 'n':
-                    return
+
+        #if not force:
+        #    if os.path.exists(pjoin(self.me_dir, 'Events', self.run_name, '%s_pythia.log' % tag)):
+        #        question = 'Previous run of pythia detected. Do you want to remove it?'
+        #        ans = self.ask(question, 'y', choices=['y','n'], timeout = 20)
+        #        if ans == 'n':
+        #            return
          
-        self.exec_cmd('remove %s pythia -f' % self.run_name)
+        #self.exec_cmd('remove %s pythia -f' % self.run_name)
         
         pythia_src = pjoin(self.configuration['pythia-pgs_path'],'src')
         
@@ -1994,6 +2236,7 @@
             pass
         
         ## LAUNCHING PYTHIA
+        tag = self.run_tag
         
         if self.cluster_mode == 1:
             pythia_log = pjoin(self.me_dir, 'Events', self.run_name , '%s_pythia.log' % tag)
@@ -2009,7 +2252,7 @@
                            cwd=pjoin(self.me_dir,'Events'))
 
         if not os.path.exists(pjoin(self.me_dir,'Events','pythia.done')):
-            logger.warning('Fail to produce pythia output')
+            logger.warning('Fail to produce pythia output. More info in \n     %s' % pythia_log.name)
             return
         else:
             os.remove(pjoin(self.me_dir,'Events','pythia.done'))
@@ -2029,13 +2272,10 @@
         madir = self.configuration['madanalysis_path']
         td = self.configuration['td_path']
         
-        # Update the banner with the pythia card
-        banner_path = pjoin(self.me_dir,'Events',self.run_name, '%s_%s_banner.txt' % (self.run_name, tag))
-        banner = open(banner_path, 'a')
-        banner.writelines('\n<MGPythiaCard>\n')
-        banner.writelines(open(pjoin(self.me_dir, 'Cards','pythia_card.dat')).read())
-        banner.writelines('\n</MGPythiaCard>\n')
-        banner.close()
+        
+        self.banner.add(pjoin(self.me_dir, 'Cards','pythia_card.dat'))
+        banner_path = pjoin(self.me_dir, 'Events', self.run_name, '%s_%s_banner.txt' % (self.run_name, tag))
+        self.banner.write(banner_path)
         
         # Creating LHE file
         if misc.is_executable(pjoin(pydir, 'hep2lhe')):
@@ -2069,20 +2309,20 @@
 
         if int(self.run_card['ickkw']):
             self.update_status('Create matching plots for Pythia', level='pythia')
-            subprocess.call([self.dirbin+'/create_matching_plots.sh', self.run_name],
+            subprocess.call([self.dirbin+'/create_matching_plots.sh', self.run_name, tag],
                             stdout = os.open(os.devnull, os.O_RDWR),
                             cwd=pjoin(self.me_dir,'Events'))
             #Clean output
             subprocess.call(['gzip','-f','events.tree'], 
                                                 cwd=pjoin(self.me_dir,'Events'))          
             files.mv(pjoin(self.me_dir,'Events','events.tree.gz'), 
-                     pjoin(self.me_dir,'Events',self.run_name +'_pythia_events.tree.gz'))
+                     pjoin(self.me_dir,'Events',self.run_name, tag + '_pythia_events.tree.gz'))
             subprocess.call(['gzip','-f','beforeveto.tree'], 
                                                 cwd=pjoin(self.me_dir,'Events'))
             files.mv(pjoin(self.me_dir,'Events','beforeveto.tree.gz'), 
-                     pjoin(self.me_dir,'Events',self.run_name +'_pythia_beforeveto.tree.gz'))
+                     pjoin(self.me_dir,'Events',self.run_name, tag+'_pythia_beforeveto.tree.gz'))
             files.mv(pjoin(self.me_dir,'Events','xsecs.tree'), 
-                     pjoin(self.me_dir,'Events',self.run_name +'_pythia_xsecs.tree'))            
+                     pjoin(self.me_dir,'Events',self.run_name, tag+'_pythia_xsecs.tree'))            
              
 
         # Plot for pythia
@@ -2097,30 +2337,41 @@
         
         self.update_status('finish', level='pythia', makehtml=False)
         self.exec_cmd('pgs --no_default', postcmd=False, printcmd=False)
-        self.exec_cmd('delphes --no_default', postcmd=False, printcmd=False)
+        if self.configuration['delphes_path']:
+            self.exec_cmd('delphes --no_default', postcmd=False, printcmd=False)
+    
+    def get_available_tag(self):
+        """create automatically a tag"""
         
+        used_tags = [r['tag'] for r in self.results[self.run_name]]
+        i=0
+        while 1:
+            i+=1
+            if 'tag_%s' %i not in used_tags:
+                return 'tag_%s' % i
+   
+    
+    
     ################################################################################
     def do_remove(self, line):
         """Remove one/all run or only part of it"""
 
         args = self.split_arg(line)
-        self.check_remove(args)
-        if args[0] == 'all':
+        run, tag, mode = self.check_remove(args)
+        if run == 'all':
             # Check first if they are not a run with a name run.
-            if os.path.exists(pjoin(self.me_dir, 'Events', 'all_banner.txt')):
+            if os.path.exists(pjoin(self.me_dir, 'Events', 'all')):
                 logger.warning('A run with name all exists. So we will not supress all processes.')
             else:
-                for match in glob.glob(pjoin(self.me_dir, 'Events', '*_banner.txt')):
-                    run = os.path.basename(match).rsplit('_',1)[0]
+                for match in glob.glob(pjoin(self.me_dir, 'Events','*','*_banner.txt')):
+                    run = match.rsplit(os.path.sep,2)[1]
                     try:
                         self.exec_cmd('clean %s %s' % (run, ' '.join(args[1:]) ) )
                     except self.InvalidCmd, error:
                         logger.info(error)
                         pass # run already clear
                     return
-
-        run = args[0]
-
+            
         # Check that run exists
         if not os.path.exists(pjoin(self.me_dir, 'Events', run)):
             raise self.InvalidCmd('No run \'%s\' detected' % run)
@@ -2131,20 +2382,26 @@
         except:
             pass # Just ensure that html never makes crash this function
 
-        # Found the file to suppress:
-        to_suppress = glob.glob(pjoin(self.me_dir, 'Events', '%s_*' % run))
+
+        # Found the file to suppress
+        
+        to_suppress = glob.glob(pjoin(self.me_dir, 'Events', run, '*'))
+        to_suppress += glob.glob(pjoin(self.me_dir, 'HTML', run, '*'))
+        # forbid the banner to be removed
         to_suppress = [os.path.basename(f) for f in to_suppress if 'banner' not in f]
+        if tag:
+            to_suppress = [f for f in to_suppress if tag in f]
 
-        if 'all' in args:
+        if 'all' in mode:
             pass # suppress everything
         else:
-            if 'pythia' not in args:
+            if 'pythia' not in mode:
                 to_suppress = [f for f in to_suppress if 'pythia' not in f]
-            if 'pgs' not in args:
+            if 'pgs' not in mode:
                 to_suppress = [f for f in to_suppress if 'pgs' not in f]
-            if 'delphes' not in args:
+            if 'delphes' not in mode:
                 to_suppress = [f for f in to_suppress if 'delphes' not in f]
-            if 'parton' not in args:
+            if 'parton' not in mode:
                 to_suppress = [f for f in to_suppress if 'delphes' in f 
                                                       or 'pgs' in f 
                                                       or 'pythia' in f]
@@ -2158,13 +2415,21 @@
         
         if ans == 'y':
             for file2rm in to_suppress:
-                if os.path.isdir(pjoin(self.me_dir, 'Events', file2rm)):
-                    shutil.rmtree(pjoin(self.me_dir, 'Events', file2rm))
+                if os.path.exists(pjoin(self.me_dir, 'Events', run, file2rm)):
+                    try:
+                        os.remove(pjoin(self.me_dir, 'Events', run, file2rm))
+                    except:
+                        shutil.rmtree(pjoin(self.me_dir, 'Events', run, file2rm))
                 else:
-                    os.remove(pjoin(self.me_dir, 'Events', file2rm))
+                    try:
+                        os.remove(pjoin(self.me_dir, 'HTML', run, file2rm))
+                    except:
+                        shutil.rmtree(pjoin(self.me_dir, 'HTML', run, file2rm))
+
+
 
         # Remove file in SubProcess directory
-        if 'all' in args or 'channel' in args:
+        if 'all' in mode or 'channel' in mode:
             to_suppress = glob.glob(pjoin(self.me_dir, 'SubProcesses', '%s*' % run))
             to_suppress += glob.glob(pjoin(self.me_dir, 'SubProcesses', '*','%s*' % run))
             to_suppress += glob.glob(pjoin(self.me_dir, 'SubProcesses', '*','*','%s*' % run))
@@ -2180,23 +2445,35 @@
                 for file2rm in to_suppress:
                     os.remove(file2rm)
 
-        if 'banner' in args[1:]:
-            to_suppress = glob.glob(pjoin(self.me_dir, 'Events', '%s_*' % run))
-            if len(to_suppress) > 1:
-                raise MadGraph5Error, '''Some output still exists for this run. 
+        if 'banner' in mode:
+            to_suppress = glob.glob(pjoin(self.me_dir, 'Events', run, '*'))
+            if tag:
+                # remove banner
+                try:
+                    os.remove(pjoin(self.me_dir, 'Events',run,'%s_%s_banner.txt' % (run,tag)))
+                except:
+                    logger.warning('fail to remove the banner')
+                # remove the run from the html output
+                if run in self.results:
+                    self.results.delete_run(run, tag)
+                    return
+            elif any(['banner' not in os.path.basename(p) for p in to_suppress]):
+                if to_suppress:
+                    raise MadGraph5Error, '''Some output still exists for this run. 
                 Please remove those output first. Do for example: 
                 remove %s all banner
                 ''' % run
-            elif len(to_suppress):
-                # remove banner
-                os.remove(to_suppress[0])
-                # remove the run from the html output
+            else:
+                shutil.rmtree(pjoin(self.me_dir, 'Events',run))
                 if run in self.results:
                     self.results.delete_run(run)
                     return
+        else:
+            logger.info('''The banner is not removed. In order to remove it run:
+    remove %s all banner %s''' % (run, tag and '--tag=%s ' % tag or '')) 
 
         # update database.
-        self.results.clean(args[1:])
+        self.results.clean(mode, run, tag)
         self.update_status('', level='all')
 
 
@@ -2227,7 +2504,8 @@
                 logger.info('No valid files for partonic plot') 
                 
         if any([arg in ['all','pythia'] for arg in args]):
-            filename = pjoin(self.me_dir, 'Events','%s_pythia_events.lhe' % self.run_name)
+            filename = pjoin(self.me_dir, 'Events' ,self.run_name,
+                                          '%s_pythia_events.lhe' % self.run_tag)
             if os.path.exists(filename+'.gz'):
                 os.system('gunzip -f %s' % (filename+'.gz') )
             if  os.path.exists(filename):
@@ -2239,19 +2517,19 @@
                 logger.info('No valid files for pythia plot')
                     
         if any([arg in ['all','pgs'] for arg in args]):
-            filename = pjoin(self.me_dir, 'Events','%s_pgs_events.lhco' % self.run_name)
+            filename = pjoin(self.me_dir, 'Events', self.run_name, 
+                                            '%s_pgs_events.lhco' % self.run_tag)
             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','pgs_events.lhco'))
                 self.create_plot('PGS')
-                #shutil.move(pjoin(self.me_dir, 'Events','pgs_events.lhco'), filename)
                 os.system('gzip -f %s' % filename)                
             else:
                 logger.info('No valid files for pgs plot')
                 
         if any([arg in ['all','delphes'] for arg in args]):
-            filename = pjoin(self.me_dir, 'Events','%s_delphes_events.lhco' % self.run_name)
+            filename = pjoin(self.me_dir, 'Events', self.run_name, 
+                                        '%s_delphes_events.lhco' % self.run_tag)
             if os.path.exists(filename+'.gz'):
                 os.system('gunzip -f %s' % (filename+'.gz') )
             if  os.path.exists(filename):
@@ -2279,14 +2557,14 @@
         
         tag = self.run_card['run_tag']
         if 'pythia' in self.to_store:
-            self.update_status('Storing Pythia files of Previous run', level='pythia')
+            self.update_status('Storing Pythia files of Previous run', level='pythia', error=True)
             os.system('mv -f %(path)s/pythia_events.hep %(path)s/%(name)s/%(tag)s_pythia_events.hep' % 
                   {'name': self.run_name, 'path' : pjoin(self.me_dir,'Events'),
                    'tag':tag})
             os.system('gzip -f %s/%s_pythia_events.hep' % ( 
                                 pjoin(self.me_dir,'Events',self.run_name), tag))
             self.to_store.remove('pythia')
-            self.update_status('Done', level='pythia')
+            self.update_status('Done', level='pythia',makehtml=False,error=True)
         
         self.to_store = []
             
@@ -2296,7 +2574,6 @@
         """launch pgs"""
         
         args = self.split_arg(line)
-        self.edit_one_card('pgs_card.dat', args)
         # Check argument's validity
         if '-f' in args:
             force = True
@@ -2308,9 +2585,31 @@
             args.remove('--no_default')
         else:
             no_default = False
-        self.update_status('prepare PGS run', level=None)
+
+        # Check all arguments
+        # This might launch a gunzip in another thread. After the question
+        # This thread need to be wait for completion. (This allow to have the 
+        # question right away and have the computer working in the same time)
         self.check_pgs(args) 
+
+        # Check that the pgs_card exists. If not copy the default 
+        if not os.path.exists(pjoin(self.me_dir, 'Cards', 'pgs_card.dat')):
+            if no_default:
+                logger.info('No pgs_card detected, so not run pgs')
+                return 
+            
+            files.cp(pjoin(self.me_dir, 'Cards', 'pgs_card_default.dat'),
+                     pjoin(self.me_dir, 'Cards', 'pgs_card.dat'))
+            logger.info('No pgs card found. Take the default one.')        
         
+        if not (no_default or force):
+            self.ask_edit_cards(['pgs'], args)
+            
+        self.update_status('prepare PGS run', level=None)  
+        # Wait that the gunzip of the files is finished (if any)
+        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']
@@ -2321,45 +2620,29 @@
             logger.info('No PGS executable -- running make')
             misc.compile(cwd=pgsdir)
         
-        # Check that the pgs_card exists. If not copy the default and
-        # ask for edition of the card.
-        if not os.path.exists(pjoin(self.me_dir, 'Cards', 'pgs_card.dat')):
-            if no_default:
-                logger.info('No pgs_card detected, so not run pgs')
-                return 
-            
-            files.cp(pjoin(self.me_dir, 'Cards', 'pgs_card_default.dat'),
-                     pjoin(self.me_dir, 'Cards', 'pgs_card.dat'))
-            logger.info('No pgs card found. Take the default one.')
-            
-            if not force:
-                answer = self.ask('Do you want to edit this card?','n', ['y','n'],
-                              timeout=20)
-            else:
-                answer = 'n'
-                
-            if answer == 'y':
-                misc.open_file(pjoin(self.me_dir, 'Cards', 'pgs_card.dat'))
-        
-        
+
+            
+
+            
         self.update_status('Running PGS', level='pgs')
-        tag = self.run_card['run_tag']
+        
+        tag = self.run_tag
+        # Update the banner with the pgs card        
+        self.banner.add(pjoin(self.me_dir, 'Cards','pgs_card.dat'))
+        banner_path = pjoin(self.me_dir, 'Events', self.run_name, '%s_%s_banner.txt' % (self.run_name, self.run_tag))
+        self.banner.write(banner_path)            
+
+        ########################################################################
         # now pass the event to a detector simulator and reconstruct objects
-        
-        # Update the banner with the pgs card
-        banner_path = pjoin(self.me_dir,'Events',self.run_name, '%s_%s_banner.txt' % (self.run_name,tag))  
-        print banner_path
-        print 
-        banner = open(banner_path, 'a')
-        banner.writelines('\n<MGPGSCard>')
-        banner.writelines(open(pjoin(self.me_dir, 'Cards','pgs_card.dat')).read())
-        banner.writelines('</MGPGSCard>\n')
-        banner.close()
+        ########################################################################
         
         # Prepare the output file with the banner
         ff = open(pjoin(self.me_dir, 'Events', 'pgs_events.lhco'), 'w')
         text = open(banner_path).read()
         text = '#%s' % text.replace('\n','\n#')
+        dico = self.results[self.run_name].get_current_info()
+        text +='\n##  Integrated weight (pb)  : %.4g' % dico['cross']
+        text +='\n##  Number of Event         : %s\n' % dico['nb_event']
         ff.writelines(text)
         ff.close()
 
@@ -2413,8 +2696,6 @@
         """ run delphes and make associate root file/plot """
  
         args = self.split_arg(line)
-        self.edit_one_card('delphes_card.dat', args)
-        self.edit_one_card('trigger_card.dat', args)
         # Check argument's validity
         if '-f' in args:
             force = True
@@ -2426,10 +2707,9 @@
             args.remove('--no_default')
         else:
             no_default = False
-            
+        self.check_delphes(args) 
         self.update_status('prepare delphes run', level=None)
-        self.check_pgs(args) 
-        
+                
         # Check that the delphes_card exists. If not copy the default and
         # ask for edition of the card.
         if not os.path.exists(pjoin(self.me_dir, 'Cards', 'delphes_card.dat')):
@@ -2440,41 +2720,35 @@
             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 force:
-                answer = self.ask('Do you want to edit this card?','n', ['y','n'],
-                             timeout=20)
-            else:
-                answer = 'n'
-                
-            if answer == 'y':
-                misc.open_file(pjoin(self.me_dir, 'Cards', 'delphes_card.dat')) 
+
+        if not (no_default or force):
+            self.ask_edit_cards(['delphes', 'trigger'], args)
+            
+        self.update_status('Running Delphes', level=None)  
+        # Wait that the gunzip of the files is finished (if any)
+        if hasattr(self, 'control_thread') and self.control_thread[0]:
+            self.monitor(mode=2,html=False)        
+
+
  
         delphes_dir = self.configuration['delphes_path']
-        tag = self.run_card['run_tag']
-        self.update_status('Running Delphes', level='delphes')
-        
-        # Update the banner with the pgs card
-        banner = open(pjoin(self.me_dir,'Events', self.run_name,  
-                                                    '%s_banner.txt' % tag), 'a')
-        banner.writelines('<MGDelphesCard>\n')
-        banner.writelines(open(pjoin(self.me_dir, 'Cards','delphes_card.dat')).read())
-        banner.writelines('</MGDelphesCard>\n')
-        banner.writelines('<MGDelphesTrigger>\n')
-        banner.writelines(open(pjoin(self.me_dir, 'Cards','delphes_trigger.dat')).read())
-        banner.writelines('</MGDelphesTrigger>')        
-        banner.close()
-        
-        
+        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'))
+        self.banner.write(pjoin(self.me_dir, 'Events', self.run_name, '%s_%s_banner.txt' % (self.run_name, tag)))
+        
+        cross = self.results[self.run_name].get_current_info()['cross']
+                    
         if self.cluster_mode == 1:
             delphes_log = pjoin(self.me_dir, 'Events', self.run_name, "%s_delphes.log" % tag)
             self.cluster.launch_and_wait('../bin/internal/run_delphes', 
-                        argument= [delphes_dir, self.run_name, tag],
+                        argument= [delphes_dir, self.run_name, tag, str(cross)],
                         stdout=delphes_log, stderr=subprocess.STDOUT,
                         cwd=pjoin(self.me_dir,'Events'))
         else:
             delphes_log = open(pjoin(self.me_dir, 'Events', self.run_name, "%s_delphes.log" % tag),'w')
             subprocess.call(['../bin/internal/run_delphes', delphes_dir, 
-                                self.run_name, tag],
+                                self.run_name, tag, str(cross)],
                                 stdout= delphes_log, stderr=subprocess.STDOUT,
                                 cwd=pjoin(self.me_dir,'Events'))
                 
@@ -2503,17 +2777,21 @@
         self.update_status('delphes done', level='delphes', makehtml=False)   
 
     def launch_job(self,exe, cwd=None, stdout=None, argument = [], remaining=0, 
-                    run_type='', **opt):
+                    run_type='', mode=None, **opt):
         """ """
         argument = [str(arg) for arg in argument]
+        if mode is None:
+            mode = self.cluster_mode
 
         def launch_in_thread(exe, argument, cwd, stdout, control_thread):
             """ way to launch for multicore"""
 
             start = time.time()
-            subprocess.call(['./'+exe] + argument, cwd=cwd, stdout=stdout,
+            if (cwd and os.path.exists(pjoin(cwd, exe))) or os.path.exists(exe):
+                exe = './' + exe
+            subprocess.call([exe] + argument, cwd=cwd, stdout=stdout,
                         stderr=subprocess.STDOUT, **opt)
-            logger.info('%s run in %f s' % (exe, time.time() -start))
+            #logger.info('%s run in %f s' % (exe, time.time() -start))
             
             # release the lock for allowing to launch the next job      
             while not control_thread[1].locked():
@@ -2528,7 +2806,7 @@
 
         
         
-        if self.cluster_mode == 0:
+        if mode == 0:
             self.update_status((remaining, 1, 
                                 self.total_jobs - remaining -1, run_type), level=None, force=False)
             start = time.time()
@@ -2540,10 +2818,10 @@
                 raise MadGraph5Error, '%s didn\'t stop properly. Stop all computation' % exe
 
 
-        elif self.cluster_mode == 1:
+        elif mode == 1:
             self.cluster.submit(exe, stdout=stdout, cwd=cwd)
 
-        elif self.cluster_mode == 2:
+        elif mode == 2:
             import thread
             if not hasattr(self, 'control_thread'):
                 self.control_thread = [0] # [used_thread]
@@ -2582,22 +2860,28 @@
             return 'v4'
     
     ############################################################################
-    def monitor(self, run_type='monitor'):
+    def monitor(self, run_type='monitor', mode=None, html=True):
         """ monitor the progress of running job """
         
-        if self.cluster_mode == 1:
-            def update_status(idle, run, finish):
-                self.update_status((idle, run, finish, run_type), level=None)
+        if mode is None:
+            mode = self.cluster_mode
+        
+        if mode == 1:
+            if html:
+                update_status = lambda idle, run, finish: \
+                    self.update_status((idle, run, finish, run_type), level=None)
+            else:
+                update_status = lambda idle, run, finish: None
             self.cluster.wait(self.me_dir, update_status)            
 
-        if self.cluster_mode == 2:
+        if mode == 2:
             # Wait that all thread finish
             if not self.control_thread[2]:
 #                time.sleep(1)
                 nb = self.control_thread[0]
                 while self.control_thread[0]:
                     time.sleep(5)
-                    if nb != self.control_thread[0]:
+                    if nb != self.control_thread[0] and html:
                         self.update_status((0, self.control_thread[0], 
                                            self.total_jobs - self.control_thread[0], run_type), 
                                            level=None, force=False)
@@ -2608,26 +2892,21 @@
                     pass
             else:    
                 for i in range(0,self.nb_core):
-                    self.update_status((0, self.control_thread[0], 
+                    if html:
+                        self.update_status((0, self.control_thread[0], 
                                            self.total_jobs - self.control_thread[0], run_type), 
                                            level=None, force=False)
                     self.control_thread[1].acquire()
                 self.control_thread[2] = False
                 self.control_thread[1].release()
-                del self.next_update
+                try:
+                    del self.next_update
+                except:
+                    pass
+        if not html:
+            return
 
-        #proc = subprocess.Popen([pjoin(self.dirbin, 'sumall')], 
-        #                                  cwd=pjoin(self.me_dir,'SubProcesses'),
-        #                                  stdout=subprocess.PIPE)
-        
-        #(stdout, stderr) = proc.communicate()
-        #for line in stdout.split('\n'): 
-        #    if line.startswith(' Results'):
-        #        data = line.split()
-        #        self.results.add_detail('cross', float(data[1]))
-        #        self.results.add_detail('error', float(data[2]))                
-        
-        # TEST##################################################################
+        #######################################################################
         cross, error = sum_html.make_all_html_results(self)
         self.results.add_detail('cross', cross)
         self.results.add_detail('error', error)   
@@ -2639,9 +2918,6 @@
     def find_available_run_name(me_dir):
         """ find a valid run_name for the current job """
         
-        
-        
-        
         name = 'run_%02d'
         data = [int(s[4:6]) for s in os.listdir(pjoin(me_dir,'Events')) if
                         s.startswith('run_') and len(s)>5 and s[4:6].isdigit()]
@@ -2664,12 +2940,12 @@
         else:
             self.configured = time.time()
         self.update_status('compile directory', level=None)
-        if self.open_crossx:
+        if self.configuration['automatic_html_opening']:
             misc.open_file(os.path.join(self.me_dir, 'crossx.html'))
-            self.open_crossx = False
+            self.configuration['automatic_html_opening'] = False
+            #open only once the web page
         # Change current working directory
         self.launching_dir = os.getcwd()
-        #os.chdir(self.me_dir)
         
         # Check if we need the MSSM special treatment
         model = self.find_model_name()
@@ -2720,7 +2996,7 @@
             line = line.split('=')
             if len(line) != 2:
                 continue
-            output[line[1].strip()] = line[0].strip()
+            output[line[1].strip()] = line[0].replace('\'','').strip()
         return output
 
     ############################################################################
@@ -2735,14 +3011,36 @@
             return default
         
     ############################################################################
-    def set_run_name(self, name, reload_card=False):
-        """define the run name and update the results object"""
-        
-        if name == self.run_name:
+    def set_run_name(self, name, tag=None, level='parton', reload_card=False):
+        """define the run name, the run_tag, the banner and the results."""
+        
+        # when are we force to change the tag new_run:previous run requiring changes
+        upgrade_tag = {'parton': ['parton','pythia','pgs','delphes'],
+                       'pythia': ['pythia','pgs','delphes'],
+                       'pgs': ['pgs'],
+                       'delphes':['delphes']}
+        
+        
+
+        if name == self.run_name:        
             if reload_card:
                 run_card = pjoin(self.me_dir, 'Cards','run_card.dat')
                 self.run_card = self.read_run_card(run_card)
-            return # Nothing to do
+
+            #check if we need to change the tag
+            if tag:
+                self.run_card['run_tag'] = tag
+                self.run_tag = tag
+                self.results.add_run(self.run_name, self.run_card)
+            else:
+                for tag in upgrade_tag[level]:
+                    if getattr(self.results[self.run_name][-1], tag):
+                        tag = self.get_available_tag()
+                        self.run_card['run_tag'] = tag
+                        self.run_tag = tag
+                        self.results.add_run(self.run_name, self.run_card)                        
+                        break
+            return # Nothing to do anymore
         
         # save/clean previous run
         if self.run_name:
@@ -2753,12 +3051,49 @@
         # Read run_card
         run_card = pjoin(self.me_dir, 'Cards','run_card.dat')
         self.run_card = self.read_run_card(run_card)
-        
-        if name in self.results:
+
+        new_tag = False
+        # First call for this run -> set the banner
+        self.banner = banner_mod.recover_banner(self.results, level)
+        if tag:
+            self.run_card['run_tag'] = tag
+            new_tag = True
+        elif not self.run_name in self.results and level =='parton':
+            pass # No results yet, so current tag is fine
+        else:
+            for tag in upgrade_tag[level]:
+                if getattr(self.results[self.run_name][-1], tag):
+                    # LEVEL is already define in the last tag -> need to switch tag
+                    tag = self.get_available_tag()
+                    self.run_card['run_tag'] = tag
+                    new_tag = True
+                    break
+            if not new_tag:
+                # We can add the results to the current run
+                tag = self.results[self.run_name][-1]['tag']
+                self.run_card['run_tag'] = tag # ensure that run_tag is correct                
+             
+                    
+        if name in self.results and not new_tag:
             self.results.def_current(self.run_name)
         else:
             self.results.add_run(self.run_name, self.run_card)
-        
+
+        self.run_tag = self.run_card['run_tag']
+
+        # Return the tag of the previous run having the required data for this
+        # tag/run to working wel.
+        if level == 'parton':
+            return
+        elif level == 'pythia':
+            return self.results[self.run_name][0]['tag']
+        else:
+            for i in range(-1,-len(self.results[self.run_name])-1,-1):
+                tagRun = self.results[self.run_name][i]
+                if tagRun.pythia:
+                    return tagRun['tag']
+            
+            
         
         
         
@@ -3125,110 +3460,160 @@
         name = {'0': 'auto', '1': 'pythia', '2':'pgs', '3':'delphes'}
         options = available_mode + [name[val] for val in available_mode]
         question = """Which programs do you want to run?
-  0 / auto    : running existing card
-  1 / pythia  : Pythia 
-  2 / pgs     : Pythia + PGS\n"""
+    0 / auto    : running existing card
+    1 / pythia  : Pythia 
+    2 / pgs     : Pythia + PGS\n"""
         if '3' in available_mode:
             question += """  3 / delphes  : Pythia + Delphes.\n"""
 
-            if not force:
-                if not mode:
-                    mode = self.ask(question, '0', options, timeout=self.timeout)
-            elif not mode:
-                mode = 'auto'
-                
-            if mode.isdigit():
-                mode = name[mode]
-                
-            if mode == 'auto':
-                if os.path.exists(pjoin(self.me_dir, 'Cards', 'pgs_card.dat')):
-                    mode = 'pgs'
-                elif os.path.exists(pjoin(self.me_dir, 'Cards', 'delphes_card.dat')):
-                    mode = 'delphes'
-                else: 
-                    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'))                                         
-            
-            # Now that we know in which mode we are check that all the card
-            #exists (copy default if needed)
-
-            cards = ['pythia_card.dat']
-            self.add_card_to_run('pythia')
-            if mode == 'pgs':
-                self.add_card_to_run('pgs')
-                cards.append('pgs_card.dat')
-            if mode == 'delphes':
-                self.add_card_to_run('delphes')
-                cards.append('delphes_card.dat')
-
-            if force:
-                return mode
-
-            # Ask the user if he wants to edit any of the files
-            #First create the asking text
-            question = """Do you want to edit one cards (press enter to bypass editing)?
-  1 / pythia   : pythia_card.dat\n""" 
-            possible_answer = ['0','done', '1', 'pythia']
-            card = {0:'done', 1:'pythia', 9:'plot'}
-            if mode == 'pgs':
-                question += '  2 / pgs     : pgs_card.dat\n'
-                possible_answer.append(2)
-                possible_answer.append('pgs') 
-                card[2] = 'pgs'           
-            if mode == 'delphes':
-                question += '  2 / delphes : delphes_card.dat\n'
-                question += '  3 / trigger : delphes_trigger.dat\n'
-                possible_answer.append(2)
-                possible_answer.append('delphes')
-                possible_answer.append(3)
-                possible_answer.append('trigger')
-                card[2] = 'delphes'
-                card[3] = 'trigger'
-            if self.configuration['madanalysis_path']:
-                question += '  9 / plot : plot_card.dat\n'
-                possible_answer.append(9)
-                possible_answer.append('plot')
-
-            # Add the path options
-            question += '  Path to a valid card.\n'
-       
-            # Loop as long as the user is not done.
-            answer = 'no'
-            while answer != 'done':
-                answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.timeout), path_msg='enter path')
-                if answer.isdigit():
-                    answer = card[int(answer)]
-                if answer == 'done':
-                    return
-                if os.path.exists(answer):
-                    # detect which card is provide
-                    card_name = self.detect_card_type(answer)
-                    if card_name == 'unknown':
-                        card_name = self.ask('Fail to determine the type of the file. Please specify the format',
-                     ['pythia_card.dat','pgs_card.dat',
-                      'delphes_card.dat', 'delphes_trigger.dat','plot_card.dat'])
-
-                    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)
-                self.exec_cmd('open %s' % path)                    
+        if not force:
+            if not mode:
+                mode = self.ask(question, '0', options, timeout=self.timeout)
+        elif not mode:
+            mode = 'auto'
+            
+        if mode.isdigit():
+            mode = name[mode]
+             
+        if mode == 'auto':
+            if os.path.exists(pjoin(self.me_dir, 'Cards', 'pgs_card.dat')):
+                mode = 'pgs'
+            elif os.path.exists(pjoin(self.me_dir, 'Cards', 'delphes_card.dat')):
+                mode = 'delphes'
+            else: 
+                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'))                                         
+         
+        # Now that we know in which mode we are check that all the card
+        #exists (copy default if needed)
+        
+        cards = ['pythia_card.dat']
+        self.add_card_to_run('pythia')
+        if mode == 'pgs':
+            self.add_card_to_run('pgs')
+            cards.append('pgs_card.dat')
+        if mode == 'delphes':
+            self.add_card_to_run('delphes')
+            cards.append('delphes_card.dat')
+        
+        if force:
+            return mode
+        
+        # Ask the user if he wants to edit any of the files
+        #First create the asking text
+        question = """Do you want to edit one cards (press enter to bypass editing)?\n"""
+        question += """  1 / pythia   : pythia_card.dat\n""" 
+        possible_answer = ['0','done', '1', 'pythia']
+        card = {0:'done', 1:'pythia', 9:'plot'}
+        if mode == 'pgs':
+             question += '  2 / pgs     : pgs_card.dat\n'
+             possible_answer.append(2)
+             possible_answer.append('pgs') 
+             card[2] = 'pgs'           
+        if mode == 'delphes':
+             question += '  2 / delphes : delphes_card.dat\n'
+             question += '  3 / trigger : delphes_trigger.dat\n'
+             possible_answer.append(2)
+             possible_answer.append('delphes')
+             possible_answer.append(3)
+             possible_answer.append('trigger')
+             card[2] = 'delphes'
+             card[3] = 'trigger'
+        if self.configuration['madanalysis_path']:
+             question += '  9 / plot : plot_card.dat\n'
+             possible_answer.append(9)
+             possible_answer.append('plot')
+        
+        # Add the path options
+        question += '  Path to a valid card.\n'
+        
+        # Loop as long as the user is not done.
+        answer = 'no'
+        while answer != 'done':
+             answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.timeout), path_msg='enter path')
+             if answer.isdigit():
+                 answer = card[int(answer)]
+             if answer == 'done':
+                 return
+             if os.path.exists(answer):
+                 # detect which card is provide
+                 card_name = self.detect_card_type(answer)
+                 if card_name == 'unknown':
+                     card_name = self.ask('Fail to determine the type of the file. Please specify the format',
+                  ['pythia_card.dat','pgs_card.dat',
+                   'delphes_card.dat', 'delphes_trigger.dat','plot_card.dat'])
+        
+                 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)
+             self.exec_cmd('open %s' % path)                    
                  
         return mode
 
-    def edit_one_card(self, card, fct_args):
-        """ """
+    def ask_edit_cards(self, cards, fct_args):
+        """Question for cards editions (used for pgs/delphes)"""
 
         if '-f' in fct_args or '--no_default' in fct_args:
             return
+        
+        card_name = {'pgs': 'pgs_card.dat',
+                     'delphes': 'delphes_card.dat',
+                     'trigger': 'delphes_trigger.dat'
+                     }
+
+        # Ask the user if he wants to edit any of the files
+        #First create the asking text
+        question = """Do you want to edit one cards (press enter to bypass editing)?\n""" 
+        possible_answer = ['0', 'done']
+        card = {0:'done'}
+        
+        for i, mode in enumerate(cards):
+            possible_answer.append(i+1)
+            possible_answer.append(mode)
+            question += '  %s / %-9s : %s\n' % (i+1, mode, card_name[mode])
+            card[i+1] = mode
+        
+        if self.configuration['madanalysis_path']:
+             question += '  9 / %-9s : plot_card.dat\n' % 'plot'
+             possible_answer.append(9)
+             possible_answer.append('plot')
+             card[9] = 'plot'
+
+        # Add the path options
+        question += '  Path to a valid card.\n'
+        
+        # Loop as long as the user is not done.
+        answer = 'no'
+        while answer != 'done':
+             answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.timeout), path_msg='enter path')
+             if answer.isdigit():
+                 answer = card[int(answer)]
+             if answer == 'done':
+                 return
+             if os.path.exists(answer):
+                 # detect which card is provide
+                 card_name = self.detect_card_type(answer)
+                 if card_name == 'unknown':
+                     card_name = self.ask('Fail to determine the type of the file. Please specify the format',
+                  ['pgs_card.dat', 'delphes_card.dat', 'delphes_trigger.dat'])
+        
+                 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)
+             self.exec_cmd('open %s' % path)                    
+                 
+        return mode
+
 
         question = """Do you want to edit the %s?""" % card
         answer = self.ask(question, 'n', ['y','n'], timeout=self.timeout,path_msg='enter path')
@@ -3297,49 +3682,196 @@
     """The command line processor of MadGraph"""  
 
 
-#===============================================================================
-# GridPack
-#===============================================================================     
+
+#===============================================================================
+# HELPING FUNCTION For Subprocesses
+#===============================================================================
+class SubProcesses(object):
+
+    name_to_pdg = {}
+
+    @classmethod
+    def clean(cls):
+        cls.name_to_pdg = {}
+    
+    @staticmethod
+    def get_subP(me_dir):
+        """return the list of Subprocesses"""
+        
+        out = []
+        for line in open(pjoin(me_dir,'SubProcesses', 'subproc.mg')):
+            if not line:
+                continue
+            name = line.strip()
+            if os.path.exists(pjoin(me_dir, 'SubProcesses', name)):
+                out.append(pjoin(me_dir, 'SubProcesses', name))
+        
+        return out
+        
+
+
+    @staticmethod
+    def get_subP_info(path):
+        """ return the list of processes with their name"""
+
+        nb_sub = 0
+        names = {}
+        old_main = ''
+
+        if not os.path.exists(os.path.join(path,'processes.dat')):
+            return make_info_html.get_subprocess_info_v4(path)
+
+        for line in open(os.path.join(path,'processes.dat')):
+            main = line[:8].strip()
+            if main == 'mirror':
+                main = old_main
+            if line[8:].strip() == 'none':
+                continue
+            else:
+                main = int(main)
+                old_main = main
+
+            sub_proccess = line[8:]
+            nb_sub += sub_proccess.count(',') + 1
+            if main in names:
+                names[main] += [sub_proccess.split(',')]
+            else:
+                names[main]= [sub_proccess.split(',')]
+
+        return names
+
+    @staticmethod
+    def get_subP_info_v4(path):
+        """ return the list of processes with their name in case without grouping """
+
+        nb_sub = 0
+        names = {'':[[]]}
+        path = os.path.join(path, 'auto_dsig.f')
+        found = 0
+        for line in open(path):
+            if line.startswith('C     Process:'):
+                found += 1
+                names[''][0].append(line[15:])
+            elif found >1:
+                break
+        return names
+
+
+    @staticmethod
+    def get_subP_ids(path):
+        """return the pdg codes of the particles present in the Subprocesses"""
+
+        all_ids = []
+        for line in open(pjoin(path, 'leshouche.inc')):
+            if not 'IDUP' in line:
+                continue
+            particles = re.search("/([\d,-]+)/", line)
+            all_ids.append([int(p) for p in particles.group(1).split(',')])
+        return all_ids
+    
+    
+#===============================================================================                                                                              
 class GridPackCmd(MadEventCmd):
     """The command for the gridpack --Those are not suppose to be use interactively--"""
-    
-    
+
     def __init__(self, me_dir = None, nb_event=0, seed=0, *completekey, **stdin):
         """Initialize the command and directly run"""
-        
-        # Initialize properly
+
+        # Initialize properly                                                                                                                                 
         MadEventCmd.__init__(self, me_dir, *completekey, **stdin)
-        
-        # Now it's time to run!
+        self.run_mode = 0
+        self.configuration['automatic_html_opening'] = False
+        # Now it's time to run!                                                                                                                               
         if me_dir and nb_event and seed:
             self.launch(nb_event, seed)
-    
+
+
     def launch(self, nb_event, seed):
         """ launch the generation for the grid """
-        
-        # 1) Restore the default data
+
+        # 1) Restore the default data                                                                                                                         
         logger.info('generate %s events' % nb_event)
         self.set_run_name('GridRun_%s' % seed)
         self.update_status('restoring default data', level=None)
-        subprocess.call([pjoin(self.me_dir,'bin','internal','restore_data'), 'default'],
-                        cwd=self.me_dir)
-        
-        # 2) Run the refine for the grid
-        self.update_status('Generating Events', level=None) 
-        ### TO EDIT ####
-        subprocess.call([pjoin(self.me_dir,'bin','internal','refine4grid'), 
-                         str(nb_event), '0', 'Madevent','1','GridRun_%s' % seed],
-                        cwd=self.me_dir)
-        
-        # 3) Combine the events/pythia/...
+        subprocess.call([pjoin(self.me_dir,'bin','internal','restore_data'), self.run_name],
+            cwd=self.me_dir)
+
+        # 2) Run the refine for the grid                                                                                                                      
+        self.update_status('Generating Events', level=None)
+        #subprocess.call([pjoin(self.me_dir,'bin','refine4grid'),
+        #                str(nb_event), '0', 'Madevent','1','GridRun_%s' % seed],
+        #                cwd=self.me_dir)
+        self.refine4grid(nb_event)
+        # 3) Combine the events/pythia/...                                                                                                                    
         self.exec_cmd('combine_events')
-        self.create_plot('parton')
-        self.exec_cmd('pythia --nodefault')
-        self.exec_cmd('pgs --nodefault')
-        
-        
-        
-        
-    
-    
+        self.exec_cmd('store_events')
+        self.exec_cmd('pythia --no_default -f')
+
+
+
+
+    def refine4grid(self, nb_event):
+        """Advanced commands: launch survey for the current process """
+        self.nb_refine += 1
+        
+        precision = nb_event
+
+        # initialize / remove lhapdf mode
+        self.configure_directory()
+        self.cluster_mode = 0 # force single machine
+        
+        self.update_status('Refine results to %s' % precision, level=None)
+        logger.info("Using random number seed offset = %s" % self.random)
+        
+        self.total_jobs = 0
+        subproc = [P for P in os.listdir(pjoin(self.me_dir,'SubProcesses')) if 
+                   P.startswith('P') and os.path.isdir(pjoin(self.me_dir,'SubProcesses', P))]
+        for nb_proc,subdir in enumerate(subproc):
+            subdir = subdir.strip()
+            Pdir = pjoin(self.me_dir, 'SubProcesses',subdir)
+            bindir = pjoin(os.path.relpath(self.dirbin, Pdir))
+                           
+            logger.info('    %s ' % subdir)
+            # clean previous run
+            for match in glob.glob(pjoin(Pdir, '*ajob*')):
+                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')],
+                                    stdin=subprocess.PIPE,
+                                    cwd=Pdir)
+            proc.communicate('%s 1 F\n' % (precision))
+
+            if os.path.exists(pjoin(Pdir, 'ajob1')):
+                misc.compile(['madevent'], cwd=Pdir)
+                #
+                os.system("chmod +x %s/ajob*" % Pdir)
+                alljobs = glob.glob(pjoin(Pdir,'ajob*'))
+                nb_tot = len(alljobs)            
+                self.total_jobs += nb_tot
+                for i, job in enumerate(alljobs):
+                    job = os.path.basename(job)
+                    self.launch_job('./%s' % job, cwd=Pdir, remaining=(nb_tot-i-1), 
+                             run_type='Refine number %s on %s (%s/%s)' % (self.nb_refine, subdir, nb_proc+1, len(subproc)))
+        self.monitor(run_type='All job submitted for refine number %s' % self.nb_refine,
+                     html=True)
+        
+        self.update_status("Combining runs", level='parton')
+        try:
+            os.remove(pjoin(Pdir, 'combine_runs.log'))
+        except:
+            pass
+        
+        bindir = pjoin(os.path.relpath(self.dirbin, pjoin(self.me_dir,'SubProcesses')))
+        subprocess.call([pjoin(bindir, 'combine_runs')], 
+                                          cwd=pjoin(self.me_dir,'SubProcesses'),
+                                          stdout=devnull)
+        
+        #subprocess.call([pjoin(self.dirbin, 'sumall')], 
+        #                                 cwd=pjoin(self.me_dir,'SubProcesses'),
+        #                                 stdout=devnull)
+        
+        self.update_status('finish refine', 'parton', makehtml=False)
+
     

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2011-12-09 16:10:49 +0000
+++ madgraph/iolibs/export_v4.py	2012-02-16 18:25:20 +0000
@@ -1181,15 +1181,16 @@
         cp(_file_path+'/__init__.py', self.dir_path+'/bin/internal/__init__.py')
         cp(_file_path+'/various/gen_crossxhtml.py', 
                                 self.dir_path+'/bin/internal/gen_crossxhtml.py')                
-        cp(_file_path+'/various/splitbanner.py', 
-                                   self.dir_path+'/bin/internal/splitbanner.py')
+        cp(_file_path+'/various/banner.py', 
+                                   self.dir_path+'/bin/internal/banner.py')
         cp(_file_path+'/various/cluster.py', 
                                        self.dir_path+'/bin/internal/cluster.py') 
         cp(_file_path+'/various/sum_html.py', 
                                        self.dir_path+'/bin/internal/sum_html.py') 
         cp(_file_path+'/interface/.mg5_logging.conf', 
                                  self.dir_path+'/bin/internal/me5_logging.conf') 
-
+        cp(_file_path+'/interface/coloring_logging.py', 
+                                 self.dir_path+'/bin/internal/coloring_logging.py') 
 
     #===========================================================================
     # export model files
@@ -1240,13 +1241,13 @@
         cwd = os.getcwd()
         path = os.path.join(self.dir_path, 'SubProcesses')
 
+
         if not self.model:
             self.model = matrix_element.get('processes')[0].get('model')
 
 
 
         os.chdir(path)
-
         # Create the directory PN_xx_xxxxx in the specified path
         subprocdir = "P%s" % matrix_element.get('processes')[0].shell_string()
         try:
@@ -1471,13 +1472,14 @@
 
         os.chdir(os.path.pardir)
 
-        gen_infohtml.make_info_html(self.dir_path)
-        #subprocess.call([os.path.join(old_pos, self.dir_path, 'bin', 'internal', 'gen_crossxhtml.py')],
-        #                stdout = devnull)
+        obj = gen_infohtml.make_info_html(self.dir_path)
         [mv(name, './HTML/') for name in os.listdir('.') if \
                             (name.endswith('.html') or name.endswith('.jpg')) and \
                             name != 'index.html']               
-
+        if online:
+            nb_channel = obj.rep_rule['nb_gen_diag']
+            open(pjoin('./Online'),'w').write(str(nb_channel))
+        
         # Write command history as proc_card_mg5
         if os.path.isdir('Cards'):
             output_file = os.path.join('Cards', 'proc_card_mg5.dat')
@@ -1817,7 +1819,7 @@
         if os.environ.has_key('HOME'):
             conf = os.path.join(os.environ['HOME'], '.mg5','mg5_configuration.txt')
             if os.path.exists(conf):
-                # just need to copy seed the path are absolute
+                # just need to copy since the path are absolute
                 path = writer.name
                 writer.close()
                 cp(conf, path)

=== modified file 'madgraph/iolibs/files.py'
--- madgraph/iolibs/files.py	2011-08-22 14:27:14 +0000
+++ madgraph/iolibs/files.py	2012-02-16 18:25:20 +0000
@@ -111,8 +111,11 @@
         return False
     
     for path in path_list:
-        if os.path.getmtime(path) > pickle_date:
-            return False
+        try:
+            if os.path.getmtime(path) > pickle_date:
+                return False
+        except Exception:
+            continue
     #all pass
     return True
 

=== modified file 'madgraph/iolibs/helas_call_writers.py'
--- madgraph/iolibs/helas_call_writers.py	2011-12-16 15:23:56 +0000
+++ madgraph/iolibs/helas_call_writers.py	2012-02-16 18:25:20 +0000
@@ -1152,18 +1152,16 @@
 
         # Check if we need to append a charge conjugation flag
         l = [str(l) for l in argument.get('lorentz')]
-        c_flag = '' 
-        l_flag = '' 
+        flag = [] 
         if argument.needs_hermitian_conjugate():
-            c_flag = "".join(['C%d' % i for i in \
-                              argument.get_conjugate_index()])
+            flag = ['C%d' % i for i in argument.get_conjugate_index()]
         if (isinstance(argument, helas_objects.HelasWavefunction) and \
            argument.get('is_loop') or (isinstance(argument, helas_objects.HelasAmplitude) and \
            argument.get('type')=='loop')):
-            l_flag = "L"
-        routine_name = aloha_writers.combine_name(
-                                    '%s%s%s' % (l[0], c_flag, l_flag),\
-                                     l[1:], outgoing)
+            flag.append("L")