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

[Olivier Mattelaer]

I think that we can now start an official review on this branch

Thanks in advance Johan,

Olivier

[lp:~maddevelopers/mg5amcnlo/1.4.4]

223. By Olivier Mattelaer on 2012-03-20

forbid < > ; & in the output name

224. By Olivier Mattelaer on 2012-03-22

allow correct treatment of space in auto-completion
support ~ and ~users and $ARG (inside path only)

225. By Olivier Mattelaer on 2012-03-22

fix the space in the path for the call to self.history (when a crash occurs)

226. By Olivier Mattelaer on 2012-03-23

improve install MadAnalysis (three people had trouble at my tutorial)
forbids that MadAnalysis makes ME5 crashes.
check that UFO doesn't have a coupling '1' which means that a coupling is not linked to any order.
(That makes MG5 crashes)

227. By Olivier Mattelaer on 2012-03-23

allowing to move the output directory after a launch was done.

228. By Olivier Mattelaer on 2012-03-23

improve log messages for incoherent incoming/outcoming particles between different interactions.

229. By Olivier Mattelaer on 2012-03-23

change default width in nmssm (for Z and W)

230. By Johan Alwall on 2012-03-24

Added discussion about cluster and multicore run modes in Template/README. Fixed problem with gen_crossxhtml.py for certain user scenarios.

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

Any news about this merge?
I think this is really time to release all those small fixes.

Cheers,

Olivier

[Johan Alwall (johan-alwall)]

Sorry for the delay. I agree, it is time. If you're fine with my last little commit, please do the merge.

Thanks a lot,
Johan

review: Approve

[Johan Alwall (johan-alwall)]

Hello Olivier,

It seems that your recent modifs broke something:

======================================================================
ERROR: test that the model name is correctly set
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/alwall/MadGraph/mg5_1_4_4/tests/unit_tests/various/test_import_ufo.py", line 384, in test_model_name
    model = import_ufo.import_model('sm-full')
  File "/Users/alwall/MadGraph/mg5_1_4_4/models/import_ufo.py", line 76, in import_model
    model_path = find_ufo_path(model_name)
  File "/Users/alwall/MadGraph/mg5_1_4_4/models/import_ufo.py", line 67, in find_ufo_path
    raise InvalidModel("Path %s is not a valid pathname" % model_name)
InvalidModel: Path sm-full is not a valid pathname

======================================================================
ERROR: Check that we found all mass-width which are not external.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/alwall/MadGraph/mg5_1_4_4/tests/unit_tests/various/test_write_param.py", line 192, in setUp
    self.model = import_ufo.import_model('sm-full')
  File "/Users/alwall/MadGraph/mg5_1_4_4/models/import_ufo.py", line 76, in import_model
    model_path = find_ufo_path(model_name)
  File "/Users/alwall/MadGraph/mg5_1_4_4/models/import_ufo.py", line 67, in find_ufo_path
    raise InvalidModel("Path %s is not a valid pathname" % model_name)
InvalidModel: Path sm-full is not a valid pathname

======================================================================
ERROR: test that we can write a file
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/alwall/MadGraph/mg5_1_4_4/tests/unit_tests/various/test_write_param.py", line 192, in setUp
    self.model = import_ufo.import_model('sm-full')
  File "/Users/alwall/MadGraph/mg5_1_4_4/models/import_ufo.py", line 76, in import_model
    model_path = find_ufo_path(model_name)
  File "/Users/alwall/MadGraph/mg5_1_4_4/models/import_ufo.py", line 67, in find_ufo_path
    raise InvalidModel("Path %s is not a valid pathname" % model_name)
InvalidModel: Path sm-full is not a valid pathname

----------------------------------------------------------------------
Ran 505 tests in 69.934s

FAILED (errors=3)

Also several acceptance tests fail.

Cheers,
Johan

review: Needs Fixing

[Johan Alwall (johan-alwall)]

(this happened in rev. 226)

[lp:~maddevelopers/mg5amcnlo/1.4.4]

231. By Johan Alwall on 2012-03-28

Fixed maxconfigs.inc in presence of competing resonances

[Johan Alwall (johan-alwall)]

Since this branch isn't merged yet, I'll report one more thing that has been a bit disturbing for a while:

If I want to rerun Pythia with the same tag (to replace the pythia files and save some disk space), for a run done with ickkw=1, I do:

Johan-Alwalls-MacBook-Air:PROC_sm_1 alwall$ echo pythia run_01 --tag=tag_1 -f |bin/madevent
...
MGME5>Will run in mode pythia
compile directory
Running Pythia
Creating Pythia LHE File
...
Create matching plots for Pythia
gzip: events.tree: No such file or directory
Command "pythia run_01 --tag=tag_1 -f" interrupted with error:
IOError : [Errno 2] No such file or directory: '/Users/alwall/MadGraph/mg5_1_4_4/PROC_sm_1/Events/events.tree.gz'
Please report this bug on https://bugs.launchpad.net/madgraph5
More information is found in '/Users/alwall/MadGraph/mg5_1_4_4/PROC_sm_1/run_01_tag_1_debug.log'.
Please attach this file to your report.
MGME5>Storing Pythia files of Previous run
Done

Could you check what's happening?

Thanks,
Johan

review: Needs Fixing

[lp:~maddevelopers/mg5amcnlo/1.4.4]

232. By Olivier Mattelaer on 2012-03-28

fix auto-completion + default timeout

233. By Olivier Mattelaer on 2012-03-28

fix the import restricted file

[Johan Alwall (johan-alwall)]

Hello Olivier,

Thanks for fixing the test suite errors. We need this bug fix (for maxconfigs.inc) out a.s.a.p, so please merge the branch. My last suggestion can wait if you don't have time to fix it right away (and it's very quick to do).

Thanks,
Johan

review: Approve

=== modified file 'Template/Cards/run_card.dat'
--- Template/Cards/run_card.dat	2011-12-10 06:11:03 +0000
+++ Template/Cards/run_card.dat	2012-03-28 09:12:20 +0000
@@ -27,7 +27,8 @@
   .false.     = gridpack  !True = setting up the grid pack
 #*********************************************************************
 # Number of events and rnd seed                                      *
-# Warning: Do not generate more than 100K event in a single run      *
+# Warning: Do not generate more than 1M events in a single run       *
+# If you want to run Pythia, avoid more than 50k events in a run.    *
 #*********************************************************************
   10000 = nevents ! Number of unweighted events requested 
       0       = iseed   ! rnd seed (0=assigned automatically=default))

=== modified file 'Template/README'
--- Template/README	2011-07-06 23:13:41 +0000
+++ Template/README	2012-03-28 09:12:20 +0000
@@ -49,3 +49,20 @@
 If this is the case, Pythia and PGS will automatically be run by
 generate_events, or, for an existing run, use bin/run_pythia and
 bin/run_pgs.
+
+
+Running in cluster or multicore mode:
+-------------------------------------
+
+In order to automatically run in cluster or multicore mode, please set
+the flag run_mode in the Cards/me5_configuration.txt file (or in the
+input/mg5_configuration.txt file before you generate your process):
+
+# Default Running mode 
+# 0: single machine/ 1: cluster / 2: multicore
+run_mode = 0
+
+You can also specify the cluster type (for cluster mode) or your
+preferred number of CPUs (for multicore mode - note that by default,
+the maximum number of cores is used) by setting cluster_type and
+nb_core.
\ No newline at end of file

=== modified file 'Template/Source/PDF/pdfwrap.f'
--- Template/Source/PDF/pdfwrap.f	2010-10-30 03:26:37 +0000
+++ Template/Source/PDF/pdfwrap.f	2012-03-28 09:12:20 +0000
@@ -250,13 +250,13 @@
      .'cteq5f3,','cteq5f4,','cteq5m1,','ctq5hq1,','cteq5l1,',
      .'cteq6_m,','cteq6_d,','cteq6_l,','cteq6l1,'
 c
-c
-	   write(6,*) 'Setting it to default cteq6l1'
-       pdlabel='cteq6l1'
-       asmz=0.130d0
-       nloop=1
-       Call SetCtq6(4)
-
+c     make madgraph to stop evaluating
+      stop 1
+c	   write(6,*) 'Setting it to default cteq6l1'
+c       pdlabel='cteq6l1'
+c       asmz=0.130d0
+c       nloop=1
+c       Call SetCtq6(4)
       endif      
       return
       end

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

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

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2012-03-08 17:26:21 +0000
+++ UpdateNotes.txt	2012-03-28 09:12:20 +0000
@@ -1,5 +1,29 @@
 Update notes for MadGraph 5 (in reverse time order)
 
+1.4.4 (XX/XX/XX)  OM: Added a command: "output aloha" which allows to creates a 
+       		      subset (or all) of the aloha routines linked to the
+                      current model
+                  OM: allow to choose the duration of the timer for the questions.
+                      (via ./input/mg5_configuration.txt)
+                  OM: Allow UFO model where G is not defined.
+                  OM: allow to use ~,~user, ${var} in the path. Improve support
+                      for path containing spaces.
+                  JA: Fixed LHAPDF functionality which was broken in v. 1.4.0
+                  JA: Allow non-equal mixing angles in mssm restrict cards
+                      (as needed for cards from some spectrum generators)
+                  JA: Fixed script addmasses.py for complicated events such as
+                      p p > t t~ + jets with decays of t and t~.
+                  JA: Added GE cluster to the list in cluster.py.
+                  JA: Allow up to 1M events in a single run. Note that the 
+                      unweighting (combine events) step gets quite slow with
+                      so many events. Also note that if Pythia is run, still
+                      maximum 50k events is recommended in a single run. 
+                  OM: Fix problem linked to filesystem which makes new files
+                      non executables by default. (bug #958616)
+                  JA: Fixed buffer overflow in gen_ximprove when number of
+                      configs > number of diagrams due to competing resonances
+                      (introduced in v. 1.4.3).
+
 1.4.3 (08/03/12)  JA: Reintroduced the possibility to completely forbid
                       s-channel diagrams, using the $$ notation. Note that
                       this should be used with great care, since the result

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

=== modified file 'aloha/create_aloha.py'
--- aloha/create_aloha.py	2012-03-01 21:47:03 +0000
+++ aloha/create_aloha.py	2012-03-28 09:12:20 +0000
@@ -236,7 +236,7 @@
                         lorentz *= SpinorPropagator(id, 'I2', outgoing)
                     else:
                         #propagator incoming
-                        lorentz *= SpinorPropagator('I2', id, outgoing) 
+                        lorentz *= SpinorPropagator('I2', id, outgoing)
                 elif spin == 3 :
                     lorentz *= VectorPropagator(id, 'I2', id)
                 elif spin == 5 :

=== modified file 'input/mg5_configuration.txt'
--- input/mg5_configuration.txt	2012-02-03 23:38:43 +0000
+++ input/mg5_configuration.txt	2012-03-28 09:12:20 +0000
@@ -20,10 +20,9 @@
 #
 ################################################################################
 
-# Pythia8 Path.
-# Define the path to the pythia8 directory.
-# relative path start from mg5 directory
-pythia8_path = ./pythia8
+# Prefered Fortran Compiler
+# If None: try to find g77 or gfortran on the system
+fortran_compiler = None
 
 # Prefered Text Editor
 #  Default: use the shell default Editor
@@ -39,10 +38,14 @@
 # If None: try to find one available on the system
 eps_viewer = None
 
-# Prefered Fortran Compiler
-# If None: try to find g77 or gfortran on the system
-fortran_compiler = None
+# Time allowed to answer question (if no answer takes default value)
+# 0: No time limit
+timeout = 20
 
+# Pythia8 Path.
+# Define the path to the pythia8 directory.
+# relative path start from mg5 directory
+pythia8_path = ./pythia8
 
 ################################################################################
 #  INFO FOR MADEVENT 
@@ -59,7 +62,7 @@
 # 0: single machine/ 1: cluster / 2: multicore
 run_mode = 0
 
-# Cluster Type [pbs|sge|condor] Use for cluster run only
+# Cluster Type [pbs|sge|condor|lsf|ge] Use for cluster run only
 # And cluster queue
 cluster_type = condor
 cluster_queue = madgraph

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2012-03-08 17:26:21 +0000
+++ madgraph/VERSION	2012-03-28 09:12:20 +0000
@@ -1,3 +1,3 @@
-version = 1.4.3
+version = 1.4.4.beta
 date = 2012-03-08
 

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2012-02-24 06:55:34 +0000
+++ madgraph/core/base_objects.py	2012-03-28 09:12:20 +0000
@@ -1473,7 +1473,20 @@
         this diagram"""
 
         return [len(v.get('legs')) for v in self.get('vertices')]
+
+    def get_num_configs(self, model, ninitial):
+        """Return the maximum number of configs from this diagram,
+        given by 2^(number of non-zero width s-channel propagators)"""
+
+        s_channels = [v.get_s_channel_id(model,ninitial) for v in \
+                              self.get('vertices')[:-1]]
+        num_props = len([i for i in s_channels if i != 0 and \
+                         model.get_particle(i).get('width').lower() != 'zero'])
         
+        if num_props <= 1:
+            return 1
+        else:
+            return 2**num_props
 #===============================================================================
 # DiagramList
 #===============================================================================

=== modified file 'madgraph/core/helas_objects.py'
--- madgraph/core/helas_objects.py	2011-11-22 09:18:50 +0000
+++ madgraph/core/helas_objects.py	2012-03-28 09:12:20 +0000
@@ -3387,7 +3387,13 @@
         """Get number of diagrams, which is always more than number of
         configs"""
 
-        return len(self.get('diagrams'))    
+        model = self.get('processes')[0].\
+                get('model')
+        
+        next, nini = self.get_nexternal_ninitial()
+
+        return sum([d.get_num_configs(model, nini) for d in \
+                    self.get('base_amplitude').get('diagrams')])
 
     def get_number_of_wavefunctions(self):
         """Gives the total number of wavefunctions for this ME"""

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

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

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2012-03-05 14:54:21 +0000
+++ madgraph/interface/madevent_interface.py	2012-03-28 09:12:20 +0000
@@ -206,9 +206,9 @@
         arg = line.split()
         if  len(arg) == 0:
             return stop
-        if self.results.status.startswith('Error'):
+        if isinstance(self.results.status, str) and self.results.status.startswith('Error'):
             return stop
-        if self.results.status == 'Stop by the user':
+        if isinstance(self.results.status, str) and self.results.status == 'Stop by the user':
             self.update_status('%s Stop by the user' % arg[0], level=None, error=True)
             return stop        
         elif not self.results.status:
@@ -291,7 +291,9 @@
         logger.info("-- set options")
         logger.info("   stdout_level DEBUG|INFO|WARNING|ERROR|CRITICAL")
         logger.info("     change the default level for printed information")
-        
+        logger.info("   timeout VALUE")
+        logger.info("      (default 20) Seconds allowed to answer questions.")
+        logger.info("      Note that pressing tab always stops the timer.")        
 
     def run_options_help(self, data):
         if data:
@@ -349,9 +351,9 @@
         
     def help_combine_events(self):
         """ """
-        logger.info("syntax: combine_events [--run_options]")
+        logger.info("syntax: combine_events [run_name] [--tag=tag_name] [--run_options]")
         logger.info("-- Combine the last run in order to write the number of events")
-        logger.info("   require in the run_card.")
+        logger.info("   asked in the run_card.")
         self.run_options_help([])
 
     def help_store_events(self):
@@ -504,6 +506,11 @@
             if args[1] not in ['DEBUG','INFO','WARNING','ERROR','CRITICAL']:
                 raise self.InvalidCmd('output_level needs ' + \
                                       'a valid level')  
+                
+        if args[0] in ['timeout']:
+            if not args[1].isdigit():
+                raise self.InvalidCmd('timeout values should be a integer')   
+            
     def check_open(self, args):
         """ check the validity of the line """
         
@@ -699,16 +706,28 @@
     def check_combine_events(self, arg):
         """ Check the argument for the combine events command """
         
-        if len(arg):
+        tag = [a for a in arg if a.startswith('--tag=')]
+        if tag: 
+            args.remove(tag[0])
+            tag = tag[0][6:]
+        elif not self.run_tag:
+            tag = 'tag_1'
+        else:
+            tag = self.run_tag
+        self.run_tag = tag
+     
+        if len(arg) > 1:
             self.help_combine_events()
             raise self.InvalidCmd('Too many argument for combine_events command')
         
+        if len(arg) == 1:
+            self.set_run_name(arg[0], self.run_tag, 'parton', True)
+        
         if not self.run_name:
             if not self.results.lastrun:
                 raise self.InvalidCmd('No run_name currently define. Impossible to run combine')
             else:
                 self.set_run_name(self.results.lastrun)
-            self.set_run_name(arg[0])
         
         return True
     
@@ -732,14 +751,14 @@
         if tag: 
             args.remove(tag[0])
             tag = tag[0][6:]
-     
+        
         if len(args) == 0 and not self.run_name:
             if self.results.lastrun:
                 args.insert(0, self.results.lastrun)
             else:
                 raise self.InvalidCmd('No run name currently define. Please add this information.')             
         
-        if len(args) == 1:
+        if len(args) >= 1:
             if args[0] != self.run_name and\
              not os.path.exists(pjoin(self.me_dir,'Events',args[0], 'unweighted_events.lhe.gz')):
                 raise self.InvalidCmd('No events file corresponding to %s run. '% args[0])
@@ -748,7 +767,6 @@
             if tag:
                 self.run_card['run_tag'] = tag
             self.set_run_name(self.run_name, tag, 'pythia')
-            
 
         if  not os.path.exists(pjoin(self.me_dir,'Events',self.run_name,'unweighted_events.lhe.gz')):
             raise self.InvalidCmd('No events file corresponding to %s run. '% self.run_name)
@@ -1270,7 +1288,7 @@
     _run_options = ['--cluster','--multicore','--nb_core=','--nb_core=2', '-c', '-m']
     _generate_options = ['-f', '--laststep=parton', '--laststep=pythia', '--laststep=pgs', '--laststep=delphes']
     _calculate_decay_options = ['-f', '--accuracy=0.']
-    _set_options = ['stdout_level','fortran_compiler']
+    _set_options = ['stdout_level','fortran_compiler','timeout']
     _plot_mode = ['all', 'parton','pythia','pgs','delphes','channel', 'banner']
     _clean_mode = _plot_mode
     _display_opts = ['run_name', 'options', 'variable']
@@ -1332,7 +1350,7 @@
             raise MadEventAlreadyRunning, message
         else:
             os.system('touch %s' % pjoin(me_dir,'RunWeb'))
-            subprocess.Popen([pjoin(self.dirbin, 'gen_cardhtml-pl')], cwd=me_dir)
+            misc.Popen([pjoin(self.dirbin, 'gen_cardhtml-pl')], cwd=me_dir)
       
         self.to_store = []
         self.run_name = None
@@ -1351,7 +1369,6 @@
             
         # Load the configuration file
         self.set_configuration()
-        self.timeout = 20
         self.nb_refine=0
         if self.web:
             os.system('touch %s' % pjoin(self.me_dir,'Online'))
@@ -1360,13 +1377,13 @@
         # load the current status of the directory
         if os.path.exists(pjoin(self.me_dir,'HTML','results.pkl')):
             self.results = save_load_object.load_from_file(pjoin(self.me_dir,'HTML','results.pkl'))
+            self.results.path = self.me_dir # allowed to move the directory after some launch
             self.results.resetall()
         else:
             model = self.find_model_name()
             process = self.process # define in find_model_name
             self.results = gen_crossxhtml.AllResults(model, process, self.me_dir)
         self.results.def_web_mode(self.web)
-
         
         self.configured = 0 # time for reading the card
         self._options = {} # for compatibility with extended_cmd
@@ -1446,7 +1463,8 @@
                               'automatic_html_opening':True,
                               'run_mode':0,
                               'cluster_queue':'madgraph',
-                              'nb_core':None}
+                              'nb_core':None,
+                              'timeout':20}
         
         if os.environ.has_key('MADGRAPH_BASE'):
             config_file = open(os.path.join(os.environ['MADGRAPH_BASE'],'mg5_configuration.txt'))
@@ -1545,8 +1563,7 @@
         
         # Check if we want to modify the run
         if not force:
-            ans = self.ask('Do you want to modify the Cards?', 'n', ['y','n'], 
-                                                           timeout=self.timeout)
+            ans = self.ask('Do you want to modify the Cards?', 'n', ['y','n'])
             if ans == 'n':
                 force = True
         
@@ -1644,6 +1661,8 @@
                 raise self.InvalidCmd('nb_core should be a positive number') 
             self.nb_core = int(args[1])
             self.options['nb_core'] = self.nb_core
+        elif args[0] == 'timeout':
+            self.options[args[0]] = int(args[1]) 
         elif args[0] in self.options:
             if args[1] in ['None','True','False']:
                 self.options[args[0]] = eval(args[1])
@@ -1998,7 +2017,7 @@
                 raise MadEventError, 'Error make gensym not successful'
 
             # Launch gensym
-            p = subprocess.Popen(['./gensym'], stdin=subprocess.PIPE,
+            p = misc.Popen(['./gensym'], stdin=subprocess.PIPE,
                                  stdout=subprocess.PIPE, 
                                  stderr=subprocess.STDOUT, cwd=Pdir)
             sym_input = "%(points)d %(iterations)d %(accuracy)f %(gridpack)s\n" % self.opts
@@ -2061,7 +2080,7 @@
                 if os.path.basename(match)[:4] in ['ajob', 'wait', 'run.', 'done']:
                     os.remove(pjoin(Pdir, match))
             
-            proc = subprocess.Popen([pjoin(bindir, 'gen_ximprove')],
+            proc = misc.Popen([pjoin(bindir, 'gen_ximprove')],
                                     stdout=devnull,
                                     stdin=subprocess.PIPE,
                                     cwd=Pdir)
@@ -2087,7 +2106,7 @@
             pass
         
         bindir = pjoin(os.path.relpath(self.dirbin, pjoin(self.me_dir,'SubProcesses')))
-        subprocess.call([pjoin(bindir, 'combine_runs')], 
+        misc.call([pjoin(bindir, 'combine_runs')], 
                                           cwd=pjoin(self.me_dir,'SubProcesses'),
                                           stdout=devnull)
         
@@ -2111,7 +2130,7 @@
                                         cwd=pjoin(self.me_dir,'SubProcesses'),
                                         stdout=pjoin(self.me_dir,'SubProcesses', 'combine.log'))
         else:
-            out = subprocess.call(['../bin/internal/run_combine'],
+            out = misc.call(['../bin/internal/run_combine'],
                          cwd=pjoin(self.me_dir,'SubProcesses'), 
                          stdout=open(pjoin(self.me_dir,'SubProcesses','combine.log'),'w'))
             
@@ -2124,7 +2143,11 @@
         
         # Define The Banner
         tag = self.run_card['run_tag']
+        # Update the banner with the pythia card
+        if not self.banner:
+            self.banner = banner_mod.recover_banner(self.results, 'parton')
         self.banner.load_basic(self.me_dir)
+        if not hasattr(self, 'random'): self.random = 0
         self.banner.change_seed(self.random)
         if not os.path.exists(pjoin(self.me_dir, 'Events', self.run_name)):
             os.mkdir(pjoin(self.me_dir, 'Events', self.run_name))
@@ -2134,13 +2157,13 @@
         self.banner.add(pjoin(self.me_dir, 'Cards', 'run_card.dat'))
         
         
-        subprocess.call(['%s/put_banner' % self.dirbin, 'events.lhe'],
+        misc.call(['%s/put_banner' % self.dirbin, 'events.lhe'],
                             cwd=pjoin(self.me_dir, 'Events'))
-        subprocess.call(['%s/put_banner'% self.dirbin, 'unweighted_events.lhe'],
+        misc.call(['%s/put_banner'% self.dirbin, 'unweighted_events.lhe'],
                             cwd=pjoin(self.me_dir, 'Events'))
         
         #if os.path.exists(pjoin(self.me_dir, 'Events', 'unweighted_events.lhe')):
-        #    subprocess.call(['%s/extract_banner-pl' % self.dirbin, 
+        #    misc.call(['%s/extract_banner-pl' % self.dirbin, 
         #                     'unweighted_events.lhe', 'banner.txt'],
         #                    cwd=pjoin(self.me_dir, 'Events'))
         
@@ -2197,7 +2220,7 @@
                         input = pjoin(G_path, name)
                         output = pjoin(G_path, '%s_%s' % (run,name))
                         files.mv(input, output) 
-                        subprocess.call(['gzip', output], stdout=devnull, 
+                        misc.call(['gzip', output], stdout=devnull, 
                                         stderr=devnull, cwd=G_path)
         
         # 2) restore links in local this is require due to chrome over-security
@@ -2210,7 +2233,7 @@
             open(results, 'w').write(text)
             
         # 3) Update the index.html
-        subprocess.call(['%s/gen_cardhtml-pl' % self.dirbin],
+        misc.call(['%s/gen_cardhtml-pl' % self.dirbin],
                             cwd=pjoin(self.me_dir))
         
         # 4) Move the Files present in Events directory
@@ -2224,7 +2247,7 @@
                 input = pjoin(E_path, name)
                 output = pjoin(O_path, name)
                 files.mv(input, output) 
-                subprocess.call(['gzip', output], stdout=devnull, stderr=devnull, 
+                misc.call(['gzip', output], stdout=devnull, stderr=devnull, 
                                                                      cwd=O_path)
                 
         self.update_status('End Parton', level='parton', makehtml=False)
@@ -2236,14 +2259,15 @@
         self.update_status('Creating gridpack', level='parton')
         args = self.split_arg(line)
         self.check_combine_events(args)
+        if not self.run_tag: self.run_tag = 'tag_1'
         os.system("sed -i.bak \"s/ *.false.*=.*GridRun/  .true.  =  GridRun/g\" %s/Cards/grid_card.dat" \
                   % self.me_dir)
-        subprocess.call(['./bin/internal/restore_data', self.run_name],
+        misc.call(['./bin/internal/restore_data', self.run_name],
                         cwd=self.me_dir)
-        subprocess.call(['./bin/internal/store4grid',
+        misc.call(['./bin/internal/store4grid',
                          self.run_name, self.run_tag],
                         cwd=self.me_dir)
-        subprocess.call(['./bin/internal/clean'], cwd=self.me_dir)
+        misc.call(['./bin/internal/clean'], cwd=self.me_dir)
         misc.compile(['gridpack.tar.gz'], cwd=self.me_dir)
         files.mv(pjoin(self.me_dir, 'gridpack.tar.gz'), 
                 pjoin(self.me_dir, '%s_gridpack.tar.gz' % self.run_name))
@@ -2291,7 +2315,7 @@
         #            return
          
         #self.exec_cmd('remove %s pythia -f' % self.run_name)
-        
+
         pythia_src = pjoin(self.options['pythia-pgs_path'],'src')
         
         self.update_status('Running Pythia', 'pythia')
@@ -2311,7 +2335,7 @@
                         cwd=pjoin(self.me_dir,'Events'))
         else:
             pythia_log = open(pjoin(self.me_dir, 'Events',  self.run_name , '%s_pythia.log' % tag), 'w')
-            subprocess.call(['../bin/internal/run_pythia', pythia_src],
+            misc.call(['../bin/internal/run_pythia', pythia_src],
                            stdout=pythia_log,
                            stderr=subprocess.STDOUT,
                            cwd=pjoin(self.me_dir,'Events'))
@@ -2363,13 +2387,13 @@
                                          argument= [pydir],
                                         cwd=pjoin(self.me_dir,'Events'))
             else:
-                subprocess.call([self.dirbin+'/run_hep2lhe', pydir],
+                misc.call([self.dirbin+'/run_hep2lhe', pydir],
                              cwd=pjoin(self.me_dir,'Events'))
                 
             # Creating ROOT file
             if eradir and misc.is_executable(pjoin(eradir, 'ExRootLHEFConverter')):
                 self.update_status('Creating Pythia LHE Root File', level='pythia')
-                subprocess.call([eradir+'/ExRootLHEFConverter', 
+                misc.call([eradir+'/ExRootLHEFConverter', 
                              'pythia_events.lhe', 
                              pjoin(self.run_name, '%s_pythia_lhe_events.root' % tag)],
                             cwd=pjoin(self.me_dir,'Events')) 
@@ -2377,15 +2401,15 @@
 
         if int(self.run_card['ickkw']):
             self.update_status('Create matching plots for Pythia', level='pythia')
-            subprocess.call([self.dirbin+'/create_matching_plots.sh', self.run_name, tag],
+            misc.call([self.dirbin+'/create_matching_plots.sh', self.run_name, tag],
                             stdout = os.open(os.devnull, os.O_RDWR),
                             cwd=pjoin(self.me_dir,'Events'))
             #Clean output
-            subprocess.call(['gzip','-f','events.tree'], 
+            misc.call(['gzip','-f','events.tree'], 
                                                 cwd=pjoin(self.me_dir,'Events'))          
             files.mv(pjoin(self.me_dir,'Events','events.tree.gz'), 
                      pjoin(self.me_dir,'Events',self.run_name, tag + '_pythia_events.tree.gz'))
-            subprocess.call(['gzip','-f','beforeveto.tree'], 
+            misc.call(['gzip','-f','beforeveto.tree'], 
                                                 cwd=pjoin(self.me_dir,'Events'))
             files.mv(pjoin(self.me_dir,'Events','beforeveto.tree.gz'), 
                      pjoin(self.me_dir,'Events',self.run_name, tag+'_pythia_beforeveto.tree.gz'))
@@ -2489,7 +2513,7 @@
         if '-f' not in args and len(to_suppress):
             question = 'Do you want to suppress the following files?\n     %s' % \
                                '\n    '.join(to_suppress)
-            ans = self.ask(question, 'y', choices=['y','n'], timeout = self.timeout)
+            ans = self.ask(question, 'y', choices=['y','n'])
         else:
             ans = 'y'
         
@@ -2525,7 +2549,7 @@
                 else:
                     question = 'Do you want to suppress the following files?\n     %s' % \
                                '\n    '.join(to_suppress)
-                    ans = self.ask(question, 'y', choices=['y','n'], timeout = self.timeout)
+                    ans = self.ask(question, 'y', choices=['y','n'])
 
                 if ans == 'y':
                     for file2rm in to_suppress:
@@ -2743,7 +2767,7 @@
                             stdout=pgs_log, stderr=subprocess.STDOUT)
         else:
             pgs_log = open(pjoin(self.me_dir, 'Events', self.run_name,"%s_pgs.log" % tag),'w')
-            subprocess.call([self.dirbin+'/run_pgs', pgsdir], stdout= pgs_log,
+            misc.call([self.dirbin+'/run_pgs', pgsdir], stdout= pgs_log,
                                                stderr=subprocess.STDOUT,
                                                cwd=pjoin(self.me_dir, 'Events')) 
         
@@ -2754,14 +2778,14 @@
             os.remove(pjoin(self.me_dir, 'Events', 'pgs.done'))
             
         if os.path.getsize(banner_path) == os.path.getsize(pjoin(self.me_dir, 'Events','pgs_events.lhco')):
-            subprocess.call(['cat pgs_uncleaned_events.lhco >>  pgs_events.lhco'], 
+            misc.call(['cat pgs_uncleaned_events.lhco >>  pgs_events.lhco'], 
                             cwd=pjoin(self.me_dir, 'Events'))
             os.remove(pjoin(self.me_dir, 'Events', 'pgs_uncleaned_events.lhco '))
 
         # Creating Root file
         if eradir and misc.is_executable(pjoin(eradir, 'ExRootLHCOlympicsConverter')):
             self.update_status('Creating PGS Root File', level='pgs')
-            subprocess.call([eradir+'/ExRootLHCOlympicsConverter', 
+            misc.call([eradir+'/ExRootLHCOlympicsConverter', 
                              'pgs_events.lhco',pjoin('%s/%s_pgs_events.root' % (self.run_name, tag))],
                             cwd=pjoin(self.me_dir, 'Events')) 
         
@@ -2770,7 +2794,7 @@
             self.create_plot('PGS')
             files.mv(pjoin(self.me_dir, 'Events', 'pgs_events.lhco'), 
                     pjoin(self.me_dir, 'Events', self.run_name, '%s_pgs_events.lhco' % tag))
-            subprocess.call(['gzip','-f', pjoin(self.me_dir, 'Events', 
+            misc.call(['gzip','-f', pjoin(self.me_dir, 'Events', 
                                                 self.run_name, '%s_pgs_events.lhco' % tag)])
 
 
@@ -2835,7 +2859,7 @@
                         cwd=pjoin(self.me_dir,'Events'))
         else:
             delphes_log = open(pjoin(self.me_dir, 'Events', self.run_name, "%s_delphes.log" % tag),'w')
-            subprocess.call(['../bin/internal/run_delphes', delphes_dir, 
+            misc.call(['../bin/internal/run_delphes', delphes_dir, 
                                 self.run_name, tag, str(cross)],
                                 stdout= delphes_log, stderr=subprocess.STDOUT,
                                 cwd=pjoin(self.me_dir,'Events'))
@@ -2858,7 +2882,7 @@
         self.create_plot('Delphes')
 
         if os.path.exists(pjoin(self.me_dir, 'Events', self.run_name,  '%s_delphes_events.lhco' % tag)):
-            subprocess.call(['gzip','-f', pjoin(self.me_dir, 'Events', self.run_name, '%s_delphes_events.lhco' % tag)])
+            misc.call(['gzip','-f', pjoin(self.me_dir, 'Events', self.run_name, '%s_delphes_events.lhco' % tag)])
 
 
         
@@ -2877,7 +2901,7 @@
             start = time.time()
             if (cwd and os.path.exists(pjoin(cwd, exe))) or os.path.exists(exe):
                 exe = './' + exe
-            subprocess.call([exe] + argument, cwd=cwd, stdout=stdout,
+            misc.call([exe] + argument, cwd=cwd, stdout=stdout,
                         stderr=subprocess.STDOUT, **opt)
             #logger.info('%s run in %f s' % (exe, time.time() -start))
             
@@ -2899,7 +2923,7 @@
                                 self.total_jobs - remaining -1, run_type), level=None, force=False)
             start = time.time()
             #os.system('cd %s; ./%s' % (cwd,exe))
-            status = subprocess.call(['./'+exe] + argument, cwd=cwd, 
+            status = misc.call(['./'+exe] + argument, cwd=cwd, 
                                                            stdout=stdout, **opt)
             logger.info('%s run in %f s' % (exe, time.time() -start))
             if status:
@@ -3047,13 +3071,13 @@
         self.check_nb_events()
 
         # set environment variable for lhapdf.
-        if self.run_card['pdlabel'] == "'lhapdf'":
+        if self.run_card['pdlabel'] == "lhapdf":
             os.environ['lhapdf'] = 'True'
         elif 'lhapdf' in os.environ.keys():
             del os.environ['lhapdf']
         
         # Compile
-        out = subprocess.call([pjoin(self.dirbin, 'compile_Source')],
+        out = misc.call([pjoin(self.dirbin, 'compile_Source')],
                               cwd = self.me_dir)
         if out:
             raise MadEventError, 'Impossible to compile'
@@ -3228,13 +3252,13 @@
 
         
         nb_event = int(self.run_card['nevents'])
-        if nb_event > 100000:
-            logger.warning("Attempting to generate more than 100K events")
-            logger.warning("Limiting number to 100K. Use multi_run for larger statistics.")
+        if nb_event > 1000000:
+            logger.warning("Attempting to generate more than 1M events")
+            logger.warning("Limiting number to 1M. Use multi_run for larger statistics.")
             path = pjoin(self.me_dir, 'Cards', 'run_card.dat')
-            os.system(r"""perl -p -i.bak -e "s/\d+\s*=\s*nevents/100000 = nevents/" %s""" \
+            os.system(r"""perl -p -i.bak -e "s/\d+\s*=\s*nevents/1000000 = nevents/" %s""" \
                                                                          % path)
-            self.run_card['nevents'] = 100000
+            self.run_card['nevents'] = 1000000
 
         return
 
@@ -3270,7 +3294,7 @@
         except Exception, error:         
             pass
         try:
-            subprocess.call(['./bin/internal/gen_cardhtml-pl'], cwd=self.me_dir,
+            misc.call(['./bin/internal/gen_cardhtml-pl'], cwd=self.me_dir,
                         stdout=devnull, stderr=devnull)
         except:
             pass
@@ -3343,7 +3367,7 @@
         self.update_status('Creating root files', level='parton')
 
         eradir = self.options['exrootanalysis_path']
-        subprocess.call(['%s/ExRootLHEFConverter' % eradir, 
+        misc.call(['%s/ExRootLHEFConverter' % eradir, 
                              input, output],
                             cwd=pjoin(self.me_dir, 'Events'))
         
@@ -3390,28 +3414,31 @@
             os.makedirs(plot_dir) 
         
         files.ln(pjoin(self.me_dir, 'Cards','plot_card.dat'), plot_dir, 'ma_card.dat')
-        proc = subprocess.Popen([os.path.join(madir, 'plot_events')],
+        try:
+            proc = misc.Popen([os.path.join(madir, 'plot_events')],
                             stdout = open(pjoin(plot_dir, 'plot.log'),'w'),
                             stderr = subprocess.STDOUT,
                             stdin=subprocess.PIPE,
                             cwd=plot_dir)
-        proc.communicate('%s\n' % event_path)
-        del proc
-        #proc.wait()
-        subprocess.call(['%s/plot' % self.dirbin, madir, td],
+            proc.communicate('%s\n' % event_path)
+            del proc
+            #proc.wait()
+            misc.call(['%s/plot' % self.dirbin, madir, td],
                             stdout = open(pjoin(plot_dir, 'plot.log'),'a'),
                             stderr = subprocess.STDOUT,
                             cwd=plot_dir)
     
-        subprocess.call(['%s/plot_page-pl' % self.dirbin, 
+            misc.call(['%s/plot_page-pl' % self.dirbin, 
                                 os.path.basename(plot_dir),
                                 mode],
                             stdout = open(pjoin(plot_dir, 'plot.log'),'a'),
                             stderr = subprocess.STDOUT,
                             cwd=pjoin(self.me_dir, 'HTML', self.run_name))
-       
-        shutil.move(pjoin(self.me_dir, 'HTML',self.run_name ,'plots.html'),
+            shutil.move(pjoin(self.me_dir, 'HTML',self.run_name ,'plots.html'),
                                                                          output)
+
+        except OSError, error:
+            logger.error('fail to create plot: %s. Please check that MadAnalysis is correctly installed.' % error)
         
         self.update_status('End Plots for %s level' % mode, level = mode.lower(),
                                                                  makehtml=False)
@@ -3462,7 +3489,7 @@
 
             if not force:
                 if not mode:
-                    mode = self.ask(question, '0', options, timeout=self.timeout)
+                    mode = self.ask(question, '0', options)
             elif not mode:
                 mode = 'auto'
                 
@@ -3536,7 +3563,7 @@
         answer = 'no'
         while answer != 'done':
             question, possible_answer, card = get_question(mode)
-            answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.timeout), path_msg='enter path')
+            answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.options['timeout']), path_msg='enter path')
             if answer.isdigit():
                 answer = card[int(answer)]
             if answer == 'done':
@@ -3546,7 +3573,6 @@
                     path = pjoin(self.me_dir,'Cards','%s_card.dat' % answer)
                 else:
                     path = pjoin(self.me_dir,'Cards','delphes_trigger.dat')
-                    print path
                 self.exec_cmd('open %s' % path)                    
             else:
                 # detect which card is provide
@@ -3590,7 +3616,7 @@
 
         if not force:
             if not mode:
-                mode = self.ask(question, '0', options, timeout=self.timeout)
+                mode = self.ask(question, '0', options)
         elif not mode:
             mode = 'auto'
             
@@ -3655,7 +3681,7 @@
         # Loop as long as the user is not done.
         answer = 'no'
         while answer != 'done':
-             answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.timeout), path_msg='enter path')
+             answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.options['timeout']), path_msg='enter path')
              if answer.isdigit():
                  answer = card[int(answer)]
              if answer == 'done':
@@ -3714,7 +3740,7 @@
         # Loop as long as the user is not done.
         answer = 'no'
         while answer != 'done':
-             answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.timeout), path_msg='enter path')
+             answer = self.ask(question, '0', possible_answer, timeout=int(1.5*self.options['timeout']), path_msg='enter path')
              if answer.isdigit():
                  answer = card[int(answer)]
              if answer == 'done':
@@ -3739,7 +3765,7 @@
 
 
         question = """Do you want to edit the %s?""" % card
-        answer = self.ask(question, 'n', ['y','n'], timeout=self.timeout,path_msg='enter path')
+        answer = self.ask(question, 'n', ['y','n'],path_msg='enter path')
         if answer == 'y':
             path = pjoin(self.me_dir,'Cards', card)
             self.exec_cmd('open %s' % path)
@@ -3928,13 +3954,13 @@
         logger.info('generate %s events' % nb_event)
         self.set_run_name('GridRun_%s' % seed)
         self.update_status('restoring default data', level=None)
-        subprocess.call([pjoin(self.me_dir,'bin','internal','restore_data'),
+        misc.call([pjoin(self.me_dir,'bin','internal','restore_data'),
                          'default'],
             cwd=self.me_dir)
 
         # 2) Run the refine for the grid
         self.update_status('Generating Events', level=None)
-        #subprocess.call([pjoin(self.me_dir,'bin','refine4grid'),
+        #misc.call([pjoin(self.me_dir,'bin','refine4grid'),
         #                str(nb_event), '0', 'Madevent','1','GridRun_%s' % seed],
         #                cwd=self.me_dir)
         self.refine4grid(nb_event)
@@ -3942,7 +3968,6 @@
         # 3) Combine the events/pythia/...
         self.exec_cmd('combine_events')
         self.exec_cmd('store_events')
-        self.exec_cmd('pythia --no_default -f')
         self.print_results_in_shell(self.results.current)
 
     def refine4grid(self, nb_event):
@@ -3974,7 +3999,7 @@
             
             devnull = os.open(os.devnull, os.O_RDWR)
             logfile = pjoin(Pdir, 'gen_ximprove.log')
-            proc = subprocess.Popen([pjoin(bindir, 'gen_ximprove')],
+            proc = misc.Popen([pjoin(bindir, 'gen_ximprove')],
                                     stdin=subprocess.PIPE,
                                     stdout=open(logfile,'w'),
                                     cwd=Pdir)
@@ -3990,7 +4015,7 @@
                 for i, job in enumerate(alljobs):
                     job = os.path.basename(job)
                     self.launch_job('./%s' % job, cwd=Pdir, remaining=(nb_tot-i-1), 
-                             run_type='Refine number %s on %s (%s/%s)' % (self.nb_refine, subdir, nb_proc+1, len(subproc)))
+                                 run_type='Refine number %s on %s (%s/%s)' % (self.nb_refine, subdir, nb_proc+1, len(subproc)))
         self.monitor(run_type='All job submitted for refine number %s' % self.nb_refine,
                      html=True)
         
@@ -4001,11 +4026,11 @@
             pass
         
         bindir = pjoin(os.path.relpath(self.dirbin, pjoin(self.me_dir,'SubProcesses')))
-        subprocess.call([pjoin(bindir, 'combine_runs')], 
+        misc.call([pjoin(bindir, 'combine_runs')], 
                                           cwd=pjoin(self.me_dir,'SubProcesses'),
                                           stdout=devnull)
         
-        #subprocess.call([pjoin(self.dirbin, 'sumall')], 
+        #misc.call([pjoin(self.dirbin, 'sumall')], 
         #                                 cwd=pjoin(self.me_dir,'SubProcesses'),
         #                                 stdout=devnull)
         

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

=== modified file 'madgraph/interface/master_interface.py'
--- madgraph/interface/master_interface.py	2012-03-09 22:38:09 +0000
+++ madgraph/interface/master_interface.py	2012-03-28 09:12:20 +0000
@@ -376,9 +376,7 @@
             self.debug_link_to_command()      
         
 class MasterCmdWeb(Switcher, MGcmd.MadGraphCmdWeb):
- 
-    timeout = 1 # time authorize to answer question [0 is no time limit]
-    
+   
     def __init__(self, *arg, **opt):
     
         if os.environ.has_key('_CONDOR_SCRATCH_DIR'):
@@ -392,6 +390,8 @@
         #standard initialization
         Switcher.__init__(self, mgme_dir = '', *arg, **opt)
         
+        self.options['timeout'] = 1 # time authorize to answer question [0 is no time limit]
+        
     def change_principal_cmd(self, name):
         if name == 'MadGraph':
             self.cmd = MGcmd.MadGraphCmdWeb

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

=== modified file 'madgraph/iolibs/group_subprocs.py'
--- madgraph/iolibs/group_subprocs.py	2012-02-17 06:01:41 +0000
+++ madgraph/iolibs/group_subprocs.py	2012-03-28 09:12:20 +0000
@@ -258,7 +258,13 @@
     def get_num_configs(self):
         """Get number of configs for this group"""
 
-        return len(self.get('mapping_diagrams'))
+        model = self.get('matrix_elements')[0].get('processes')[0].\
+                get('model')
+        
+        next, nini = self.get_nexternal_ninitial()
+        
+        return sum([md.get_num_configs(model, nini) for md in 
+                    self.get('mapping_diagrams')])
 
     def find_mapping_diagrams(self):
         """Find all unique diagrams for all processes in this

=== modified file 'madgraph/iolibs/template_files/madevent_combine_events.f'
--- madgraph/iolibs/template_files/madevent_combine_events.f	2012-03-06 03:20:37 +0000
+++ madgraph/iolibs/template_files/madevent_combine_events.f	2012-03-28 09:12:20 +0000
@@ -10,7 +10,7 @@
       integer    maxsubprocesses
       parameter (maxsubprocesses=9999)
       integer    cmax_events
-      parameter (cmax_events=500000)
+      parameter (cmax_events=5000000)
       integer    sfnum
       parameter (sfnum=17)   !Unit number for scratch file
       include 'maxparticles.inc'

=== modified file 'madgraph/various/cluster.py'
--- madgraph/various/cluster.py	2012-03-06 20:10:09 +0000
+++ madgraph/various/cluster.py	2012-03-28 09:12:20 +0000
@@ -28,6 +28,8 @@
 class ClusterManagmentError(MadGraph5Error):
     pass
 
+class NotImplemented(MadGraph5Error):
+    pass
 
 def multiple_try(nb_try=5, sleep=1):
 
@@ -56,7 +58,6 @@
         return deco_f_interupt
     return deco_interupt
 
-
 class Cluster(object):
     """Basic Class for all cluster type submission"""
     name = 'mother class'
@@ -105,6 +106,7 @@
             if fail:
                 raise ClusterManagmentError('Some Jobs are in a Hold/... state. Please try to investigate or contact the IT team')
             if idle + run == 0:
+                time.sleep(20) #security to ensure that the file are really written on the disk
                 logger.info('All jobs finished')
                 break
             fct(idle, run, finish)
@@ -120,6 +122,7 @@
         while 1:        
             status = self.control_one_job(id)
             if not status in ['R','I']:
+                time.sleep(20) #security to ensure that the file are really written on the disk
                 break
             time.sleep(30)
             
@@ -322,7 +325,6 @@
                 elif status in self.running_tag:
                     run += 1
                 else:
-                    print line
                     fail += 1
 
         return idle, run, self.submitted - (idle+run+fail), fail
@@ -465,6 +467,7 @@
                     fail += 1
 
         return idle, run, self.submitted - (idle+run+fail), fail
+
     
     
     @multiple_try()
@@ -476,6 +479,7 @@
         cmd = "qdel %s" % ' '.join(self.submitted_ids)
         status = subprocess.Popen([cmd], shell=True, stdout=open(os.devnull,'w'))
 
+
 class LSFCluster(Cluster):
     """Basic class for dealing with cluster submission"""
     
@@ -595,8 +599,127 @@
         cmd = "bdel %s" % ' '.join(self.submitted_ids)
         status = subprocess.Popen([cmd], shell=True, stdout=open(os.devnull,'w'))
 
+class GECluster(Cluster):
+    """Class for dealing with cluster submission on a GE cluster"""
+    
+    name = 'ge'
+    idle_tag = ['qw']
+    running_tag = ['r']
+
+    @multiple_try()
+    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
+        """Submit the prog to the cluser"""
+        
+        text = ""
+        if cwd is None:
+            cwd = os.getcwd()
+        else: 
+            text = " cd %s; bash " % cwd
+        if stdout is None:
+            stdout = os.path.join(cwd, "log.%s" % prog.split('/')[-1])
+        if stderr is None:
+            stderr = os.path.join(cwd, "err.%s" % prog.split('/')[-1])
+        elif stderr == -2: # -2 is subprocess.STDOUT
+            stderr = stdout
+        if log is None:
+            log = '/dev/null'
+
+        text += prog
+        if argument:
+            text += ' ' + ' '.join(argument)
+        text += '\n'
+        tmp_submit = os.path.join(cwd, 'tmp_submit')
+        open(tmp_submit,'w').write(text)
+
+        a = subprocess.Popen(['qsub','-o', stdout,
+                                     '-e', stderr,
+                                     tmp_submit],
+                                     stdout=subprocess.PIPE, 
+                                     stderr=subprocess.STDOUT,
+                                     stdin=subprocess.PIPE, cwd=cwd)
+
+        output = a.communicate()[0]
+        #Your job 874511 ("test.sh") has been submitted
+        pat = re.compile("Your job (\d*) \(",re.MULTILINE)
+        try:
+            id = pat.search(output).groups()[0]
+        except:
+            raise ClusterManagmentError, 'fail to submit to the cluster: \n%s' \
+                                                                        % output 
+        self.submitted += 1
+        self.submitted_ids.append(id)
+        return id
+
+    @multiple_try()
+    def control_one_job(self, id):
+        """ control the status of a single job with it's cluster id """
+        cmd = 'qstat | grep '+str(id)
+        status = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE)
+        if not status:
+            return 'F'
+        #874516 0.00000 test.sh    alwall       qw    03/04/2012 22:30:35                                    1
+        pat = re.compile("^(\d+)\s+[\d\.]+\s+[\w\d\.]+\s+[\w\d\.]+\s+(\w+)\s")
+        stat = ''
+        for line in status.stdout.read().split('\n'):
+            if not line:
+                continue
+            line = line.strip()
+            try:
+                groups = pat.search(line).groups()
+            except:
+                raise ClusterManagmentError, 'bad syntax for stat: \n\"%s\"' % line
+            if groups[0] != id: continue
+            stat = groups[1]
+        if not stat:
+            return 'F'
+        if stat in self.idle_tag:
+            return 'I' 
+        if stat in self.running_tag:                
+            return 'R' 
+        
+    @multiple_try()
+    def control(self, me_dir=None):
+        """Check the status of job associated to directory me_dir. return (idle, run, finish, fail)"""
+        if not self.submitted_ids:
+            return 0, 0, 0, 0
+        idle, run, fail = 0, 0, 0
+        ongoing = []
+        for statusflag in ['p', 'r', 'sh']:
+            cmd = 'qstat -s %s' % statusflag
+            status = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE)
+            #874516 0.00000 test.sh    alwall       qw    03/04/2012 22:30:35                                    1
+            pat = re.compile("^(\d+)")
+            for line in status.stdout.read().split('\n'):
+                line = line.strip()
+                try:
+                    id = pat.search(line).groups()[0]
+                except:
+                    pass
+                else:
+                    if id not in self.submitted_ids:
+                        continue
+                    ongoing.append(id)
+                    if statusflag == 'p':
+                        idle += 1
+                    if statusflag == 'r':
+                        run += 1
+                    if statusflag == 'sh':
+                        fail += 1
+
+        self.submitted_ids = ongoing
+
+        return idle, run, self.submitted - idle - run - fail, fail
+
+    @multiple_try()
+    def remove(self, *args):
+        """Clean the jobs on the cluster"""
+        
+        if not self.submitted_ids:
+            return
+        cmd = "qdel %s" % ' '.join(self.submitted_ids)
+        status = subprocess.Popen([cmd], shell=True, stdout=open(os.devnull,'w'))
+
 from_name = {'condor':CondorCluster, 'pbs': PBSCluster, 'sge': SGECluster, 
-             'lsf': LSFCluster}
-
-
-    
+             'lsf': LSFCluster, 'ge':GECluster}
+
+

=== modified file 'madgraph/various/gen_crossxhtml.py'
--- madgraph/various/gen_crossxhtml.py	2012-03-06 03:20:37 +0000
+++ madgraph/various/gen_crossxhtml.py	2012-03-28 09:12:20 +0000
@@ -279,6 +279,10 @@
     def add_detail(self, name, value, run=None, tag=None):
         """ add information to current run (cross/error/event)"""
         assert name in ['cross', 'error', 'nb_event', 'cross_pythia']
+
+        if not run and not self.current:
+            return
+
         if not run:
             run = self.current
         else:
@@ -770,7 +774,7 @@
                 pass
                 
         elif (self.pgs or self.delphes) and not self['nb_event']:
-            if runresults[-2]['cross_pythia']:
+            if runresults[-2]['cross_pythia'] and runresults[-2]['cross']:
                 self['cross'] = runresults[-2]['cross_pythia']
                 self['nb_event'] = int(0.5+(runresults[-2]['nb_event'] * self['cross'] /runresults[-2]['cross']))                           
                 self['error'] = self.get_pythia_error(runresults[-2]['cross'], 

=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2012-03-02 17:16:45 +0000
+++ madgraph/various/misc.py	2012-03-28 09:12:20 +0000
@@ -37,7 +37,7 @@
     import internal.files as files
     
 logger = logging.getLogger('cmdprint.ext_program')
-
+pjoin = os.path.join
    
 #===============================================================================
 # parse_info_str
@@ -194,6 +194,50 @@
         raise MadGraph5Error, error_text
     return p.returncode
 
+# Control
+def check_system_error(value=1):
+    def deco_check(f):
+        def deco_f(arg, *args, **opt):
+            try:
+                return f(arg, *args, **opt)
+            except OSError, error:
+                if isinstance(arg, list):
+                    prog =  arg[0]
+                else:
+                    prog = arg[0]
+                
+                # Permission denied
+                if error.errno == 13:     
+                    if os.path.exists(prog):
+                        os.system('chmod +x %s' % prog)
+                    elif 'cwd' in opt and opt['cwd'] and \
+                                       os.path.isfile(pjoin(opt['cwd'],arg[0])):
+                        os.system('chmod +x %s' % pjoin(opt['cwd'],arg[0]))
+                    return f(arg, *args, **opt)
+                # NO such file or directory
+                elif error.errno == 2:
+                    # raise a more meaningfull error message
+                    raise Exception, '%s fails with no such file or directory' \
+                                                                           % arg            
+                else:
+                    raise
+        return deco_f
+    return deco_check
+
+
+@check_system_error()
+def call(arg, *args, **opt):
+    """nice way to call an external program with nice error treatment"""
+    return subprocess.call(arg, *args, **opt)
+
+@check_system_error()
+def Popen(arg, *args, **opt):
+    """nice way to call an external program with nice error treatment"""
+    return subprocess.Popen(arg, *args, **opt)
+
+                
+
+
 
 ################################################################################
 # TAIL FUNCTION

=== modified file 'models/check_param_card.py'
--- models/check_param_card.py	2012-02-23 00:20:17 +0000
+++ models/check_param_card.py	2012-03-28 09:12:20 +0000
@@ -312,9 +312,10 @@
         
     def remove_param(self, block, lhacode):
         """ remove a parameter """
-        self[block].remove(lhacode)
-        if len(self[block]) == 0:
-            self.remove_block(block)
+        if self.has_param(block, lhacode):
+            self[block].remove(lhacode)
+            if len(self[block]) == 0:
+                self.remove_block(block)
     
     def has_param(self, block, lhacode):
         """check if param exists"""
@@ -875,7 +876,7 @@
     # Decay: Nothing to do. 
     
     # MODSEL
-    card.check_and_remove('modsel',[1], value=1)
+    card.remove_param('modsel',[1])
     
     
     # USQMIX

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2012-03-08 00:24:17 +0000
+++ models/import_ufo.py	2012-03-28 09:12:20 +0000
@@ -36,7 +36,7 @@
 
 import models as ufomodels
 import models.model_reader as model_reader
-logger = logging.getLogger('models.import_ufo')
+logger = logging.getLogger('madgraph.model')
 logger_mod = logging.getLogger('madgraph.model')
 
 root_path = os.path.dirname(os.path.realpath( __file__ ))
@@ -206,7 +206,7 @@
         for param in self.ufomodel.all_parameters:
             if param.nature == "external":
                 if len(param.lhablock.split())>1:
-                    raise UFOImportError, '''LHABlock should be single word which is not the case for
+                    raise InvalidModel, '''LHABlock should be single word which is not the case for
     \'%s\' parameter with lhablock \'%s\'''' % (param.name, param.lhablock)
             
 
@@ -385,11 +385,13 @@
             # check if the interaction meet requirements:
             pdg = [p.pdg_code for p in interaction_info.particles if p.spin in [2,4]]
             if len(pdg) % 2:
-                raise UFOImportError, 'Odd number of fermion in vertex: %s' % [p.pdg_code for p in interaction_info.particles]
+                raise InvalidModel, 'Odd number of fermion in vertex: %s' % [p.pdg_code for p in interaction_info.particles]
             for i in range(0, len(pdg),2):
                 if pdg[i] == - pdg[i+1]:
                     if pdg[i] in self.outcoming:
-                        raise UFOImportError, 'Input output not coherent'
+                        raise InvalidModel, '%s has not coherent incoming/outcoming status between interactions' %\
+                            [p for p in interaction_info.particles if p.spin in [2,4]][i].name
+                            
                     elif not pdg[i] in self.incoming:
                         self.incoming.append(pdg[i])
                         self.outcoming.append(pdg[i+1])
@@ -437,6 +439,10 @@
                 couplings = [couplings]
             for coupling in couplings:
                 order = tuple(coupling.order.items())
+                if '1' in order:
+                    raise InvalidModel, '''Some couplings have \'1\' order. 
+                    This is not allowed in MG. 
+                    Please defines an additional coupling to your model''' 
                 if order in order_to_int:
                     order_to_int[order].get('couplings')[key] = coupling.name
                 else:
@@ -624,13 +630,12 @@
         
         if coupling.name in self.all_expr.keys():
             return
-        
         self.all_expr[coupling.value] = coupling
         try:
             self.coupling[coupling.depend].append(coupling)
         except:
             self.coupling[coupling.depend] = [coupling]            
-                
+        
                 
 
     def analyze_couplings(self):

=== modified file 'models/mssm/restrict_default.dat'
--- models/mssm/restrict_default.dat	2011-12-14 00:04:26 +0000
+++ models/mssm/restrict_default.dat	2012-03-28 09:12:20 +0000
@@ -8,8 +8,8 @@
 Block USQMIX 
     1   1 1.000000e+00 # RRu11 
     2   2 1.000000e+00 # RRu22 
-    3   3 5.536450e-01 # RRu33 
-    3   6 8.327528e-01 # RRu36 
+    3   3 5.5364501e-01 # RRu33 
+    3   6 8.3275281e-01 # RRu36 
     4   4 1.000000e+00 # RRu44 
     5   5 1.000000e+00 # RRu55 
     6   3 8.327528e-01 # RRu63 
@@ -89,8 +89,8 @@
 Block DSQMIX 
     1   1 1.000000e+00 # RRd11 
     2   2 1.000000e+00 # RRd22 
-    3   3 9.387379e-01 # RRd33 
-    3   6 3.446319e-01 # RRd36 
+    3   3 9.3873791e-01 # RRd33 
+    3   6 3.4463191e-01 # RRd36 
     4   4 1.000000e+00 # RRd44 
     5   5 1.000000e+00 # RRd55 
     6   3 -3.446319e-01 # RRd63 
@@ -165,8 +165,8 @@
 Block SELMIX 
     1   1 1.000000e+00 # RRl11 
     2   2 1.000000e+00 # RRl22 
-    3   3 2.824872e-01 # RRl33 
-    3   6 9.592711e-01 # RRl36 
+    3   3 2.8248721e-01 # RRl33 
+    3   6 9.5927111e-01 # RRl36 
     4   4 1.000000e+00 # RRl44 
     5   5 1.000000e+00 # RRl55 
     6   3 9.592711e-01 # RRl63 
@@ -255,8 +255,8 @@
 ## INFORMATION FOR UMIX
 ###################################
 Block UMIX 
-    1   1 9.168349e-01 # RUU11 
-    1   2 -3.992666e-01 # RUU12 
+    1   1 9.1683491e-01 # RUU11 
+    1   2 -3.9926661e-01 # RUU12 
     2   1 3.992666e-01 # RUU21 
     2   2 9.168349e-01 # RUU22 
 
@@ -295,8 +295,8 @@
 ## INFORMATION FOR VMIX
 ###################################
 Block VMIX 
-    1   1 9.725578e-01 # RVV11 
-    1   2 -2.326612e-01 # RVV12 
+    1   1 9.7255781e-01 # RVV11 
+    1   2 -2.3266121e-01 # RVV12 
     2   1 2.326612e-01 # RVV21 
     2   2 9.725578e-01 # RVV22 
 

=== modified file 'models/mssm/restrict_no_b_mass.dat'
--- models/mssm/restrict_no_b_mass.dat	2011-04-19 18:31:12 +0000
+++ models/mssm/restrict_no_b_mass.dat	2012-03-28 09:12:20 +0000
@@ -8,8 +8,8 @@
 Block USQMIX 
     1   1 1.000000e+00 # RRu11 
     2   2 1.000000e+00 # RRu22 
-    3   3 5.536450e-01 # RRu33 
-    3   6 8.327528e-01 # RRu36 
+    3   3 5.5364501e-01 # RRu33 
+    3   6 8.3275281e-01 # RRu36 
     4   4 1.000000e+00 # RRu44 
     5   5 1.000000e+00 # RRu55 
     6   3 8.327528e-01 # RRu63 
@@ -89,8 +89,8 @@
 Block DSQMIX 
     1   1 1.000000e+00 # RRd11 
     2   2 1.000000e+00 # RRd22 
-    3   3 9.387379e-01 # RRd33 
-    3   6 3.446319e-01 # RRd36 
+    3   3 9.3873791e-01 # RRd33 
+    3   6 3.4463191e-01 # RRd36 
     4   4 1.000000e+00 # RRd44 
     5   5 1.000000e+00 # RRd55 
     6   3 -3.446319e-01 # RRd63 
@@ -165,8 +165,8 @@
 Block SELMIX 
     1   1 1.000000e+00 # RRl11 
     2   2 1.000000e+00 # RRl22 
-    3   3 2.824872e-01 # RRl33 
-    3   6 9.592711e-01 # RRl36 
+    3   3 2.8248721e-01 # RRl33 
+    3   6 9.5927111e-01 # RRl36 
     4   4 1.000000e+00 # RRl44 
     5   5 1.000000e+00 # RRl55 
     6   3 9.592711e-01 # RRl63 
@@ -255,8 +255,8 @@
 ## INFORMATION FOR UMIX
 ###################################
 Block UMIX 
-    1   1 9.168349e-01 # RUU11 
-    1   2 -3.992666e-01 # RUU12 
+    1   1 9.1683491e-01 # RUU11 
+    1   2 -3.9926661e-01 # RUU12 
     2   1 3.992666e-01 # RUU21 
     2   2 9.168349e-01 # RUU22 
 
@@ -295,8 +295,8 @@
 ## INFORMATION FOR VMIX
 ###################################
 Block VMIX 
-    1   1 9.725578e-01 # RVV11 
-    1   2 -2.326612e-01 # RVV12 
+    1   1 9.7255781e-01 # RVV11 
+    1   2 -2.3266121e-01 # RVV12 
     2   1 2.326612e-01 # RVV21 
     2   2 9.725578e-01 # RVV22 
 
@@ -313,7 +313,6 @@
 ###################################
 Block FRALPHA 
     1 -1.138252e-01 # alp 
-
 ###################################
 ## INFORMATION FOR UPMNS
 ###################################

=== modified file 'models/mssm/restrict_no_masses.dat'
--- models/mssm/restrict_no_masses.dat	2011-04-19 18:31:12 +0000
+++ models/mssm/restrict_no_masses.dat	2012-03-28 09:12:20 +0000
@@ -8,8 +8,8 @@
 Block USQMIX 
     1   1 1.000000e+00 # RRu11 
     2   2 1.000000e+00 # RRu22 
-    3   3 5.536450e-01 # RRu33 
-    3   6 8.327528e-01 # RRu36 
+    3   3 5.5364501e-01 # RRu33 
+    3   6 8.3275281e-01 # RRu36 
     4   4 1.000000e+00 # RRu44 
     5   5 1.000000e+00 # RRu55 
     6   3 8.327528e-01 # RRu63 
@@ -89,8 +89,8 @@
 Block DSQMIX 
     1   1 1.000000e+00 # RRd11 
     2   2 1.000000e+00 # RRd22 
-    3   3 9.387379e-01 # RRd33 
-    3   6 3.446319e-01 # RRd36 
+    3   3 9.3873791e-01 # RRd33 
+    3   6 3.4463191e-01 # RRd36 
     4   4 1.000000e+00 # RRd44 
     5   5 1.000000e+00 # RRd55 
     6   3 -3.446319e-01 # RRd63 
@@ -165,8 +165,8 @@
 Block SELMIX 
     1   1 1.000000e+00 # RRl11 
     2   2 1.000000e+00 # RRl22 
-    3   3 2.824872e-01 # RRl33 
-    3   6 9.592711e-01 # RRl36 
+    3   3 2.8248721e-01 # RRl33 
+    3   6 9.5927111e-01 # RRl36 
     4   4 1.000000e+00 # RRl44 
     5   5 1.000000e+00 # RRl55 
     6   3 9.592711e-01 # RRl63 
@@ -255,8 +255,8 @@
 ## INFORMATION FOR UMIX
 ###################################
 Block UMIX 
-    1   1 9.168349e-01 # RUU11 
-    1   2 -3.992666e-01 # RUU12 
+    1   1 9.1683491e-01 # RUU11 
+    1   2 -3.9926661e-01 # RUU12 
     2   1 3.992666e-01 # RUU21 
     2   2 9.168349e-01 # RUU22 
 
@@ -295,8 +295,8 @@
 ## INFORMATION FOR VMIX
 ###################################
 Block VMIX 
-    1   1 9.725578e-01 # RVV11 
-    1   2 -2.326612e-01 # RVV12 
+    1   1 9.7255781e-01 # RVV11 
+    1   2 -2.3266121e-01 # RVV12 
     2   1 2.326612e-01 # RVV21 
     2   2 9.725578e-01 # RVV22 
 
@@ -313,7 +313,6 @@
 ###################################
 Block FRALPHA 
     1 -1.138252e-01 # alp 
-
 ###################################
 ## INFORMATION FOR UPMNS
 ###################################

=== modified file 'models/mssm/restrict_no_tau_mass.dat'
--- models/mssm/restrict_no_tau_mass.dat	2011-04-19 18:31:12 +0000
+++ models/mssm/restrict_no_tau_mass.dat	2012-03-28 09:12:20 +0000
@@ -8,8 +8,8 @@
 Block USQMIX 
     1   1 1.000000e+00 # RRu11 
     2   2 1.000000e+00 # RRu22 
-    3   3 5.536450e-01 # RRu33 
-    3   6 8.327528e-01 # RRu36 
+    3   3 5.5364501e-01 # RRu33 
+    3   6 8.3275281e-01 # RRu36 
     4   4 1.000000e+00 # RRu44 
     5   5 1.000000e+00 # RRu55 
     6   3 8.327528e-01 # RRu63 
@@ -89,8 +89,8 @@
 Block DSQMIX 
     1   1 1.000000e+00 # RRd11 
     2   2 1.000000e+00 # RRd22 
-    3   3 9.387379e-01 # RRd33 
-    3   6 3.446319e-01 # RRd36 
+    3   3 9.3873791e-01 # RRd33 
+    3   6 3.4463191e-01 # RRd36 
     4   4 1.000000e+00 # RRd44 
     5   5 1.000000e+00 # RRd55 
     6   3 -3.446319e-01 # RRd63 
@@ -165,8 +165,8 @@
 Block SELMIX 
     1   1 1.000000e+00 # RRl11 
     2   2 1.000000e+00 # RRl22 
-    3   3 2.824872e-01 # RRl33 
-    3   6 9.592711e-01 # RRl36 
+    3   3 2.8248721e-01 # RRl33 
+    3   6 9.5927111e-01 # RRl36 
     4   4 1.000000e+00 # RRl44 
     5   5 1.000000e+00 # RRl55 
     6   3 9.592711e-01 # RRl63 
@@ -255,8 +255,8 @@
 ## INFORMATION FOR UMIX
 ###################################
 Block UMIX 
-    1   1 9.168349e-01 # RUU11 
-    1   2 -3.992666e-01 # RUU12 
+    1   1 9.1683491e-01 # RUU11 
+    1   2 -3.9926661e-01 # RUU12 
     2   1 3.992666e-01 # RUU21 
     2   2 9.168349e-01 # RUU22 
 
@@ -295,8 +295,8 @@
 ## INFORMATION FOR VMIX
 ###################################
 Block VMIX 
-    1   1 9.725578e-01 # RVV11 
-    1   2 -2.326612e-01 # RVV12 
+    1   1 9.7255781e-01 # RVV11 
+    1   2 -2.3266121e-01 # RVV12 
     2   1 2.326612e-01 # RVV21 
     2   2 9.725578e-01 # RVV22 
 
@@ -313,7 +313,6 @@
 ###################################
 Block FRALPHA 
     1 -1.138252e-01 # alp 
-
 ###################################
 ## INFORMATION FOR UPMNS
 ###################################

=== modified file 'models/nmssm/parameters.py'
--- models/nmssm/parameters.py	2011-04-12 16:11:45 +0000
+++ models/nmssm/parameters.py	2012-03-28 09:12:20 +0000
@@ -1348,7 +1348,7 @@
 WZ = Parameter(name = 'WZ',
                nature = 'external',
                type = 'real',
-               value = 0.,
+               value = 2.41143316e+00,
                texname = '\\text{WZ}',
                lhablock = 'DECAY',
                lhacode = [ 23 ])
@@ -1356,7 +1356,7 @@
 WW = Parameter(name = 'WW',
                nature = 'external',
                type = 'real',
-               value = 0.,
+               value = 2.00282196e+00 ,
                texname = '\\text{WW}',
                lhablock = 'DECAY',
                lhacode = [ 24 ])

=== modified file 'models/nmssm/restrict_default.dat'
--- models/nmssm/restrict_default.dat	2011-04-12 16:11:45 +0000
+++ models/nmssm/restrict_default.dat	2012-03-28 09:12:20 +0000
@@ -75,8 +75,8 @@
 ## INFORMATION FOR DECAY
 ###################################
 DECAY   6 1.334825e+00 
-DECAY  23 0.000000e+00 
-DECAY  24 0.000000e+00 
+DECAY  23  2.41143316e+00  # WZ
+DECAY  24  2.00282196e+00  # WW
 DECAY  25 3.037863e-02 
 DECAY  35 4.956578e+00 
 DECAY  36 2.495587e-04 

=== modified file 'tests/acceptance_tests/test_cmd.py'
--- tests/acceptance_tests/test_cmd.py	2012-03-06 03:20:37 +0000
+++ tests/acceptance_tests/test_cmd.py	2012-03-28 09:12:20 +0000
@@ -125,6 +125,7 @@
                     'automatic_html_opening': 'True', 
                     'pythia8_path': './pythia8',
                     'group_subprocesses': 'Auto',
+                    'timeout': '20',
                     'ignore_six_quark_processes': False
                     }
 

=== modified file 'tests/acceptance_tests/test_cmd_madevent.py'
--- tests/acceptance_tests/test_cmd_madevent.py	2012-02-29 23:15:40 +0000
+++ tests/acceptance_tests/test_cmd_madevent.py	2012-03-28 09:12:20 +0000
@@ -293,10 +293,12 @@
         ff.write('set automatic_html_opening False\n')
         ff.write('generate_events -f \n') 
         ff.close()
-        devnull =open(os.devnull,'w')
-        id = subprocess.call(['./bin/madevent','cmd.cmd'],stdout=devnull,stderr=devnull)
+        if logger.getEffectiveLevel() > 20:
+            output = open(os.devnull,'w')
+        else:
+            output = None
+        id = subprocess.call(['./bin/madevent','cmd.cmd'], stdout=output, stderr=output)
         self.assertEqual(id, 0)
-        
         self.check_parton_output(cross=944.4, error=1e-2)
         os.chdir(cmd)
         

=== modified file 'tests/acceptance_tests/test_model_equivalence.py'
--- tests/acceptance_tests/test_model_equivalence.py	2011-07-22 13:21:35 +0000
+++ tests/acceptance_tests/test_model_equivalence.py	2012-03-28 09:12:20 +0000
@@ -326,7 +326,7 @@
                 #    else:
                 #        solutions[variable].append(singlevalue)
         
-        self.assertEqual(nb_value, 72)
+        self.assertEqual(nb_value, 71)
         
         
 
@@ -337,7 +337,7 @@
         alreadydefine = []
         for line in self.ReturnFile('intparam_definition.inc'):
             if 'ENDIF' in line:
-                self.assertEqual(len(alreadydefine), 30)
+                self.assertEqual(len(alreadydefine), 29)
             if '=' not in line:
                 continue
             new_def = line.split('=')[0].lstrip()
@@ -346,7 +346,7 @@
             alreadydefine.append(new_def)
         alreadydefine = [name.lower() for name in alreadydefine]
         alreadydefine.sort()
-        solution = ['aew ', 'ckm22 ', 'complexi ', 'cw ', 'cw__exp__2 ', 'ee ', 'ee__exp__2 ', 'g ', 'g1 ', 'g__exp__2 ', 'gal(1) ', 'gal(2) ', 'gw ', 'gw__exp__2 ', 'lam ', 'mh__exp__2 ', 'muh ', 'mw ', 'mw__exp__2 ', 'mz__exp__2 ', 'mz__exp__4 ', 'sqrt__2 ', 'sqrt__aew ', 'sqrt__as ', 'sqrt__sw2 ', 'sw ', 'sw2 ', 'sw__exp__2 ', 'v ', 'v__exp__2 ', 'yb ', 'yt ', 'ytau ']
+        solution = ['aew ', 'as ', 'ckm22 ', 'complexi ', 'cw ', 'cw__exp__2 ', 'ee ', 'ee__exp__2 ','g ', 'g1 ', 'g__exp__2 ', 'gal(1) ', 'gal(2) ', 'gw ', 'gw__exp__2 ', 'lam ', 'mh__exp__2 ', 'muh ', 'mw ', 'mw__exp__2 ', 'mz__exp__2 ', 'mz__exp__4 ', 'sqrt__2 ', 'sqrt__aew ', 'sqrt__as ', 'sqrt__sw2 ', 'sw ', 'sw2 ', 'sw__exp__2 ', 'v ', 'v__exp__2 ', 'yb ', 'yt ', 'ytau ']
         self.assertEqual(alreadydefine, solution)
         
 

=== modified file 'tests/unit_tests/iolibs/test_export_v4.py'
--- tests/unit_tests/iolibs/test_export_v4.py	2012-02-25 10:46:05 +0000
+++ tests/unit_tests/iolibs/test_export_v4.py	2012-03-28 09:12:20 +0000
@@ -1908,6 +1908,15 @@
       DATA MAPCONFIG(0)/8/
 """)
 
+        # Test maxconfigs.inc
+        writer = writers.FortranWriter(self.give_pos('test'))
+        exporter.write_maxconfigs_file(writer, subproc_groups)
+        writer.close()
+        self.assertFileContains('test',
+                                """      INTEGER LMAXCONFIGS
+      PARAMETER(LMAXCONFIGS=32)
+""")
+
         # Test config_subproc_map.inc
 
         exporter.write_config_subproc_map_file(\
@@ -7205,6 +7214,15 @@
                                 "MAXPROC, MAXSPROC\n" + \
                                 "      PARAMETER (MAXAMPS=8, MAXFLOW=1)\n" + \
                                 "      PARAMETER (MAXPROC=1, MAXSPROC=1)\n")
+        # Test maxconfigs.inc
+        writer = writers.FortranWriter(self.give_pos('test'))
+        exporter.write_maxconfigs_file(writer, matrix_elements)
+        writer.close()
+        self.assertFileContains('test',
+                                """      INTEGER LMAXCONFIGS
+      PARAMETER(LMAXCONFIGS=72)
+""")
+
         # Test mg.sym
         writer = writers.FortranWriter(self.give_pos('test'))
         exporter.write_mg_sym_file(writer, me)
@@ -8533,6 +8551,15 @@
       DATA MAPCONFIG(0)/10/
 """)
         
+        # Test maxconfigs.inc
+        writer = writers.FortranWriter(self.give_pos('test'))
+        exporter.write_maxconfigs_file(writer, [me])
+        writer.close()
+        self.assertFileContains('test',
+                                """      INTEGER LMAXCONFIGS
+      PARAMETER(LMAXCONFIGS=10)
+""")
+
     def test_configs_4f_decay(self):
         """Test configs.inc for 4f decay process that failed in v. 1.3.27
         """
@@ -9285,8 +9312,8 @@
         self.assertEqual(expected, solution)
         
         #  internal params
-        self.assertEqual(len(mg4_model.params_dep), 1)
-        self.assertEqual(len(mg4_model.params_indep), 31)
+        self.assertEqual(len(mg4_model.params_dep), 2)
+        self.assertEqual(len(mg4_model.params_indep), 29)
         
         # couplings
         self.assertEqual(len(mg4_model.coups_dep), 3)
@@ -9296,11 +9323,12 @@
 
         
         # MG4 use G and not aS as it basic object for alphas related computation
-        #Pass G in the  independant list
-        self.assertTrue('G' not in [p.name for p in mg4_model.params_dep])
-        self.assertTrue('G' in [p.name for p in mg4_model.params_indep])
-        self.assertTrue('sqrt__aS' not in [p.name for p in mg4_model.params_dep])
-        self.assertTrue('sqrt__aS' in [p.name for p in mg4_model.params_indep])
+        # G is out of any list!
+        self.assertFalse('G' in [p.name for p in mg4_model.params_dep])
+        self.assertFalse('G' in [p.name for p in mg4_model.params_indep])
+        # check that sqrt__aS is correctly set
+        self.assertTrue('sqrt__aS' in [p.name for p in mg4_model.params_dep])
+        self.assertTrue('sqrt__aS' not in [p.name for p in mg4_model.params_indep])
         
         
     def test_case_sensitive(self):