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

[Olivier Mattelaer]

[Olivier Mattelaer (olivier-mattelaer)]

This is my auto-review of the code:

- The (fortran) function is not use anywhere => need to remove it

- The function print_results should be display results (more coherent with other syntax)

- Need to remove those lines. (@@ -1583,6 +1588,23 @@ madevent_interface)
471 + #return valid tag_name
472 + #return valid run_name

- Not sure about:
581 @@ -3589,11 +3681,9 @@
582 mode = self.cluster_mode
583
584 # ensure that exe is executable
585 - if os.path.exists(exe) and not os.access(exe, os.X_OK):
586 + if os.path.exists(exe) and ReadWrite:
587 os.system('chmod +x %s ' % exe)
588 -
589 - elif (cwd and os.path.exists(pjoin(cwd, exe))) and not \
590 - os.access(pjoin(cwd, exe), os.X_OK):
591 + elif (cwd and os.path.exists(pjoin(cwd, exe))) and ReadWrite:
592 os.system('chmod +x %s ' % pjoin(cwd, exe))

review: Needs Fixing

[lp:~maddevelopers/mg5amcnlo/1.5.12]

257. By Olivier Mattelaer on 2013-08-16

Fix the point revealed by the review

=== modified file 'Template/Source/dsample.f'
--- Template/Source/dsample.f	2012-10-12 13:42:23 +0000
+++ Template/Source/dsample.f	2013-08-16 20:45:36 +0000
@@ -151,6 +151,10 @@
 c
 c     All done
 c
+      tmean = 0d0
+      trmean = 0d0
+      tsigma = 0d0
+      tdem = 0d0
       open(unit=66,file='results.dat',status='unknown')
       i=1
       do while(xmean(i) .ne. 0 .and. i .lt. cur_it)

=== modified file 'Template/SubProcesses/genps.f'
--- Template/SubProcesses/genps.f	2012-11-08 04:48:28 +0000
+++ Template/SubProcesses/genps.f	2013-08-16 20:45:36 +0000
@@ -614,7 +614,6 @@
       if (nt_channel .eq. 0 .and. nincoming .eq. 2) then
          ns_channel=ns_channel-1
       endif
-c      write(*,*) 'Number of t_channels',nt_channel,ns_channel,nbranch
 
 c
 c     Determine masses for all intermediate states.  Starting
@@ -709,10 +708,11 @@
          totmass=totmass+m(itree(2,ibranch))
       enddo
       m(-ns_channel-1) = dsqrt(S(-nbranch))
-      do ibranch = -ns_channel-1,-nbranch+2,-1    !Choose invarient mass 
+      do ibranch = -ns_channel-1,-nbranch+2,-1    !Choose invarient mass
          totmass=totmass-m(itree(2,ibranch))      !for remaining particles
          smin = totmass**2                        !This affects t_min/max
          smax = (m(ibranch) - m(itree(2,ibranch)))**2
+
          if (smin .gt. smax) then
             jac=-3d0
             return
@@ -722,7 +722,6 @@
      &        smin/stot,smax/stot)
 
          m(ibranch-1)=dsqrt(max(stot*x(nbranch-1+(-ibranch)*2), 0d0))
-
 c         write(*,*) 'Using s',nbranch-1+(-ibranch)*2
 
          if (m(ibranch-1)**2.lt.smin.or.m(ibranch-1)**2.gt.smax
@@ -962,7 +961,7 @@
          if (pp .gt. 0) then
             PP=SQRT(pp)*0.5d0
          else
-            write(*,*) 'Error creating momentum in gentcms',pp
+            write(*,*) 'Error gentcms',pp, M1,m2,MD2, ESUM
             jac=-1
             return
          endif

=== modified file 'Template/SubProcesses/myamp.f'
--- Template/SubProcesses/myamp.f	2013-02-17 07:44:42 +0000
+++ Template/SubProcesses/myamp.f	2013-08-16 20:45:36 +0000
@@ -301,7 +301,7 @@
       double precision x1,x2,xk(nexternal)
       double precision dr,mtot,etot,xqfact
       double precision spmass
-      integer i, iconfig, l1, l2, j, nt, nbw, iproc
+      integer i, iconfig, l1, l2, j, nt, nbw, iproc, k
       integer iden_part(-nexternal+1:nexternal)
 
       double precision prmass(-nexternal:0,lmaxconfigs)
@@ -354,6 +354,18 @@
 
       include 'coupl.inc'
       include 'cuts.inc'
+C
+C     SPECIAL CUTS
+C
+      LOGICAL  IS_A_J(NEXTERNAL),IS_A_L(NEXTERNAL)
+      LOGICAL  IS_A_B(NEXTERNAL),IS_A_A(NEXTERNAL),IS_A_ONIUM(NEXTERNAL)
+      LOGICAL  IS_A_NU(NEXTERNAL),IS_HEAVY(NEXTERNAL)
+      COMMON /TO_SPECISA/IS_A_J,IS_A_A,IS_A_L,IS_A_B,IS_A_NU,IS_HEAVY,
+     . IS_A_ONIUM
+      integer njet
+
+
+
 c
 c     External
 c
@@ -489,6 +501,21 @@
               a=prmass(i,iconfig)**2/stot
 c     JA 4/1/2011 always set grid
               xo = min(xm(i)**2/stot, 1-1d-8)
+
+c     OM 7/27/2013 use MMJJ in order to set the mass in a appropriate way
+              if (xo.eq.0d0.and.MMJJ.gt.0d0) then
+                 njet = 0
+                 do k =1,2
+                    if (iforest(k,i,iconfig).gt.0)then
+                      if (is_a_j(iforest(k,i,iconfig))) njet = njet + 1
+                    endif
+                 enddo
+                 if (njet.eq.1) then
+                    xo = (MMJJ/1d2)**2/stot
+                 else if (njet.eq.2) then
+                    xo = (MMJJ * 0.8)**2/stot
+                 endif
+              endif
               if (xo.eq.0d0) xo=1d0/stot
 c              if (prwidth(i, iconfig) .eq. 0d0.or.iden_part(i).gt.0) then 
               call setgrid(-i,xo,a,1)
@@ -572,6 +599,14 @@
          xo = max(xo, (3*ptl3min)**2/stot)
          xo = max(xo, (4*ptl4min)**2/stot)
          xo = max(xo, mmnl**2/stot)
+         if (mmjj.ne.0d0) then
+            njet = 0
+            do k=nincoming+1,nexternal
+               if (is_a_j(k)) njet = njet + 1
+            enddo
+            xo = max(xo, njet*(njet -1)/2d0*mmjj**2/stot)
+         endif
+
 c     Include mass scale from BWs
          xo = max(xo, spmass**2/stot)
          if (swidth(i).eq.0.and.xo.eq.1d0/stot) then

=== modified file 'Template/SubProcesses/unwgt.f'
--- Template/SubProcesses/unwgt.f	2012-11-11 08:52:35 +0000
+++ Template/SubProcesses/unwgt.f	2013-08-16 20:45:36 +0000
@@ -432,7 +432,7 @@
       include 'leshouche.inc'
       data iseed /0/
 
-      double precision pmass(nexternal)
+      double precision pmass(nexternal), tmp
       common/to_mass/  pmass
 
 c      integer ncols,ncolflow(maxamps),ncolalt(maxamps)
@@ -554,6 +554,10 @@
          ptcltmp(1)=ptclus(1)
          ptclus(1)=ptclus(2)
          ptclus(2)=ptcltmp(1)
+c        flip mass of the initial state
+         tmp = pb(4,1)
+         pb(4,1) = pb(4,2)
+         pb(4,2) = tmp
       endif
 
 c

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2013-06-21 15:33:06 +0000
+++ UpdateNotes.txt	2013-08-16 20:45:36 +0000
@@ -1,5 +1,19 @@
 Update notes for MadGraph 5 (in reverse time order)
 
+1.5.12 (XX/07/13) OM: Improve phase-space integration for processes with strong MMJJ cut. Cases where
+                      the cross-section were slightly (~4%) under-evaluated due to such strong cut.
+                  OM: Add a command print_results in the madevent interface. This command print the 
+                      cross-section/number of events/... 
+                  OM: change the way prompt color is handle (no systematic reset). Which provides better
+                      result when the log is printed to a file. (thanks Bae Taegil) 
+                  OM: Fix Bug #1199514: Wrong assignment of mass in the lhe events file if the initial 
+                      state has one massive and one massless particles. (Thanks Wojciech Kotlarski)
+                  OM: Fix a compilation problem for SLC6 for the installation of pythia-pgs
+                  OM: Fix a crash linked to bug #1209113.
+                  OM: Fix a crash if python is not a valid executation (Bug #1211777)
+		  OM: Fix a bug in the edition of the run_card if some parameters were missing in the cards
+                      (Bug #1183334)
+
 1.5.11 (21/06/13) OM: Fix CRITICAL bug (returning wrong cross-section) for processes with more than
                       one W decaying leptonically. For such processes the lepton cuts were also used
                       on the neutrino particle reducing the cross-section. This bug was present only

=== modified file 'aloha/aloha_object.py'
--- aloha/aloha_object.py	2013-06-06 13:29:17 +0000
+++ aloha/aloha_object.py	2013-08-16 20:45:36 +0000
@@ -935,25 +935,25 @@
 #===============================================================================            
 
 
-SpinorPropagatorout = lambda spin1, spin2, particle: complex(0,-1) * (Gamma('mu', spin1, spin2) * \
+SpinorPropagatorout = lambda spin1, spin2, particle: -1 * (Gamma('mu', spin1, spin2) * \
                     P('mu', particle) - Mass(particle) * Identity(spin1, spin2))
 
-SpinorPropagatorin = lambda spin1, spin2, particle: complex(0,+1) * (Gamma('mu', spin1, spin2) * \
+SpinorPropagatorin = lambda spin1, spin2, particle: (Gamma('mu', spin1, spin2) * \
                     P('mu', particle) + Mass(particle) * Identity(spin1, spin2))
 
-VectorPropagator = lambda l1, l2, part: complex(0,1) * (-1 * Metric(l1, l2) + OverMass2(part) * \
+VectorPropagator = lambda l1, l2, part: complex(0,1)*(-1 * Metric(l1, l2) + OverMass2(part) * \
                                     Metric(l1,'I3')* P('I3', part) * P(l2, part))
 
 VectorPropagatorMassless= lambda l1, l2, part: complex(0,-1) * Metric(l1, l2)
 
-Spin3halfPropagatorin =  lambda mu, nu, s1, s2, part:  complex(0,1) * (\
+Spin3halfPropagatorin =  lambda mu, nu, s1, s2, part: (\
     -1/3 * (Gamma(mu,s1,-2) + Identity(s1, -2) *  P(mu, part) * Mass(part) * OverMass2(part))* \
     (PSlash(-2,-3, part) - Identity(-2,-3) * Mass(part)) * \
     ( Gamma(nu, -3, s2)+ Mass(part) * OverMass2(part) * Identity(-3, s2) * P(nu, part) ) - \
     (PSlash(s1,s2, part) + Mass(part) * Identity(s1,s2)) * (Metric(mu, nu) - OverMass2(part) * P(mu, part) * P(nu,part)))
 
 
-Spin3halfPropagatorout =  lambda mu, nu, s1, s2, part: complex(0,1) * ( \
+Spin3halfPropagatorout =  lambda mu, nu, s1, s2, part: ( \
   -1/3 * (Gamma(mu,s1,-2) - Identity(s1, -2) *  P(mu, part) * Mass(part) * OverMass2(part))* \
     (-1*PSlash(-2,-3, part) - Identity(-2,-3) * Mass(part)) * \
     ( Gamma(nu, -3, s2)- Mass(part) * OverMass2(part) * Identity(-3, s2) * P(nu, part) ) - \
@@ -965,17 +965,17 @@
 Spin3halfPropagatorMasslessIn = lambda mu, nu, s1, s2, part: -1 * Gamma(mu, s1,-1) * PSlash(-1,-2, part) * Gamma(nu,-2, s2)
 
 
-Spin2masslessPropagator = lambda mu, nu, alpha, beta: complex(0,1/2)*( Metric(mu, alpha)* Metric(nu, beta) +\
+Spin2masslessPropagator = lambda mu, nu, alpha, beta: 1/2 *( Metric(mu, alpha)* Metric(nu, beta) +\
                      Metric(mu, beta) * Metric(nu, alpha) - Metric(mu, nu) * Metric(alpha, beta))
 
 
 
 Spin2Propagator =  lambda mu, nu, alpha, beta, part: Spin2masslessPropagator(mu, nu, alpha, beta) + \
-                -complex(0, 1/2) * OverMass2(part) * (Metric(mu,alpha)* P(nu, part) * P(beta, part) + \
+                - 1/2 * OverMass2(part) * (Metric(mu,alpha)* P(nu, part) * P(beta, part) + \
                                 Metric(nu, beta) * P(mu, part) * P(alpha, part) + \
                                 Metric(mu, beta) * P(nu, part) * P(alpha, part) + \
                                 Metric(nu, alpha) * P(mu, part) * P(beta , part) )+ \
-                complex(0, 1/6) * (Metric(mu,nu) + 2 * OverMass2(part) * P(mu, part) * P(nu, part)) * \
+                1/6 * (Metric(mu,nu) + 2 * OverMass2(part) * P(mu, part) * P(nu, part)) * \
                       (Metric(alpha,beta) + 2 * OverMass2(part) * P(alpha, part) * P(beta, part))
     
 

=== modified file 'aloha/aloha_writers.py'
--- aloha/aloha_writers.py	2013-03-20 08:46:54 +0000
+++ aloha/aloha_writers.py	2013-08-16 20:45:36 +0000
@@ -1121,25 +1121,25 @@
     else:
         tag=list(tag)
 
-
-        
-
     if name is None:
         prefix=''
         if 'MP' in tag:
             prefix = 'MP_'
             tag.remove('MP')
+        if any(t.startswith('P') for t in tag):
+            #put the propagator tag at the end
+            propa = [t for t in tag if t.startswith('P')][0]
+            tag.remove(propa)
+            tag.append(propa)
         name = prefix + abstract.name + ''.join(tag)
     
     if outgoing is None:
         outgoing = abstract.outgoing
-
     
     return '%s_%s' % (name, outgoing)
 
 def combine_name(name, other_names, outgoing, tag=None, unknown_propa=False):
     """ build the name for combined aloha function """
-    
 
     # Two possible scheme FFV1C1_2_X or FFV1__FFV2C1_X
     # If they are all in FFVX scheme then use the first

=== modified file 'aloha/create_aloha.py'
--- aloha/create_aloha.py	2013-06-02 22:21:03 +0000
+++ aloha/create_aloha.py	2013-08-16 20:45:36 +0000
@@ -271,7 +271,7 @@
                 elif propa == []:
                     massless = False
                 else:
-                    lorentz *= self.get_custom_propa(propa[0], spin, id)
+                    lorentz *= complex(0,1) * self.get_custom_propa(propa[0], spin, id)
                     continue
                 
                 
@@ -284,10 +284,10 @@
                         id += _conjugate_gap + id % 2 - (id +1) % 2
                     if (id % 2):
                         #propagator outcoming
-                        lorentz *= SpinorPropagatorout(id, 'I2', outgoing)
+                        lorentz *= complex(0,1) * SpinorPropagatorout(id, 'I2', outgoing)
                     else:
                     #    #propagator incoming
-                        lorentz *= SpinorPropagatorin('I2', id, outgoing)
+                        lorentz *= complex(0,1) * SpinorPropagatorin('I2', id, outgoing)
                 elif spin == 3 :
                     if massless or not aloha.unitary_gauge: 
                         lorentz *= VectorPropagatorMassless(id, 'I2', id)
@@ -301,21 +301,21 @@
                         spin_id = id
                     nb_spinor += 1
                     if not massless and (spin_id % 2):
-                        lorentz *= Spin3halfPropagatorout(id, 'I2', spin_id,'I3', outgoing)
+                        lorentz *= complex(0,1) * Spin3halfPropagatorout(id, 'I2', spin_id,'I3', outgoing)
                     elif not massless and not (spin_id % 2):
-                        lorentz *= Spin3halfPropagatorin('I2', id , 'I3', spin_id, outgoing)
+                        lorentz *= complex(0,1) * Spin3halfPropagatorin('I2', id , 'I3', spin_id, outgoing)
                     elif spin_id %2:
-                        lorentz *= Spin3halfPropagatorMasslessOut(id, 'I2', spin_id,'I3', outgoing)
+                        lorentz *= complex(0,1) * Spin3halfPropagatorMasslessOut(id, 'I2', spin_id,'I3', outgoing)
                     else :
-                        lorentz *= Spin3halfPropagatorMasslessIn('I2', id, 'I3', spin_id, outgoing)
+                        lorentz *= complex(0,1) * Spin3halfPropagatorMasslessIn('I2', id, 'I3', spin_id, outgoing)
           
                 elif spin == 5 :
                     #lorentz *= 1 # delayed evaluation (fastenize the code)
                     if massless:
-                        lorentz *= Spin2masslessPropagator(_spin2_mult + id, \
+                        lorentz *= complex(0,1) * Spin2masslessPropagator(_spin2_mult + id, \
                                              2 * _spin2_mult + id,'I2','I3')
                     else:
-                        lorentz *= Spin2Propagator(_spin2_mult + id, \
+                        lorentz *= complex(0,1) * Spin2Propagator(_spin2_mult + id, \
                                              2 * _spin2_mult + id,'I2','I3', id)
                 else:
                     raise self.AbstractALOHAError(

=== modified file 'madgraph/__init__.py'
--- madgraph/__init__.py	2011-04-21 22:02:22 +0000
+++ madgraph/__init__.py	2013-08-16 20:45:36 +0000
@@ -25,3 +25,9 @@
 MG5DIR = os.path.realpath(os.path.join(os.path.dirname(__file__),
                                                                 os.path.pardir))
 MG4DIR = MG5DIR
+ReadWrite = True
+try:
+    open(os.path.join(MG5DIR,'.test'),'w').write('test')
+    os.remove(os.path.join(MG5DIR,'.test'))
+except IOError:
+    ReadWrite = False
\ No newline at end of file

=== modified file 'madgraph/interface/coloring_logging.py'
--- madgraph/interface/coloring_logging.py	2012-02-17 06:01:41 +0000
+++ madgraph/interface/coloring_logging.py	2013-08-16 20:45:36 +0000
@@ -29,7 +29,7 @@
 
     def format(self, record):
         levelname = record.levelname
-        message   = logging.Formatter.format(self, record) + RESET_SEQ
+        message   = logging.Formatter.format(self, record) + '$RESET'
         for k,v in COLORS.items():
             message = message.replace("$" + k,    COLOR_SEQ % (v+30))\
                          .replace("$BG" + k,  COLOR_SEQ % (v+40))\

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2013-06-21 05:03:28 +0000
+++ madgraph/interface/madevent_interface.py	2013-08-16 20:45:36 +0000
@@ -65,7 +65,7 @@
     import madgraph.various.combine_runs as combine_runs
 
     import models.check_param_card as check_param_card    
-    from madgraph import InvalidCmd, MadGraph5Error, MG5DIR
+    from madgraph import InvalidCmd, MadGraph5Error, MG5DIR, ReadWrite
     MADEVENT = False
 except Exception, error:
     if __debug__:
@@ -74,7 +74,7 @@
     import internal.extended_cmd as cmd
     import internal.banner as banner_mod
     import internal.misc as misc    
-    from internal import InvalidCmd, MadGraph5Error
+    from internal import InvalidCmd, MadGraph5Error, ReadWrite
     import internal.files as files
     import internal.gen_crossxhtml as gen_crossxhtml
     import internal.save_load_object as save_load_object
@@ -499,7 +499,12 @@
         logger.info("-- run pythia on RUN (current one by default)")
         self.run_options_help([('-f','answer all question by default'),
                                ('--tag=', 'define the tag for the pythia run'),
-                               ('--no_default', 'not run if pythia_card not present')])        
+                               ('--no_default', 'not run if pythia_card not present')]) 
+        
+    def help_print_result(self):
+        logger.info("syntax: print_result [RUN] [TAG]")
+        logger.info("-- show in text format the status of the run (cross-section/nb-event/...)")
+               
                 
     def help_pgs(self):
         logger.info("syntax: pgs [RUN] [--run_options]")
@@ -1485,6 +1490,15 @@
         
         opts = self._run_options + self._calculate_decay_options
         return  self.list_completion(text, opts, line)
+    
+    def complete_display(self, text, line, begidx, endidx):
+        """ Complete the display command"""    
+        
+        args = self.split_arg(line[0:begidx], error=False)
+        if len(args) >= 2 and args[1] =='results':
+            start = line.find('results')
+            return self.complete_print_results(text, 'print_results '+line[start+7:], begidx+2+start, endidx+2+start)
+        return super(CompleteForCmd, self).complete_display(text, line, begidx, endidx)
 
     def complete_multi_run(self, text, line, begidx, endidx):
         """complete multi run command"""
@@ -1583,6 +1597,21 @@
 
     complete_delphes = complete_pgs        
 
+    def complete_print_results(self,text, line, begidx, endidx):
+        "Complete the print results command"
+        args = self.split_arg(line[0:begidx], error=False) 
+        if len(args) == 1:
+            #return valid run_name
+            data = glob.glob(pjoin(self.me_dir, 'Events', '*','unweighted_events.lhe.gz'))
+            data = [n.rsplit('/',2)[1] for n in data]
+            tmp1 =  self.list_completion(text, data)
+            return tmp1        
+        else:
+            data = glob.glob(pjoin(self.me_dir, 'Events', args[0], '*_pythia_events.hep.gz'))
+            data = [os.path.basename(p).rsplit('_',1)[0] for p in data]
+            tmp1 =  self.list_completion(text, data)
+            return tmp1
+            
 
 class MadEventAlreadyRunning(InvalidCmd):
     pass
@@ -1590,7 +1619,7 @@
 #===============================================================================
 # MadEventCmd
 #===============================================================================
-class MadEventCmd(CmdExtended, HelpToCmd, CompleteForCmd):
+class MadEventCmd(CompleteForCmd, CmdExtended, HelpToCmd):
     """The command line processor of MadGraph"""    
     
     # Truth values
@@ -1602,7 +1631,7 @@
     _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']
+    _display_opts = ['run_name', 'options', 'variable', 'results']
     # survey options, dict from name to type, default value, and help text
     _survey_options = {'points':('int', 1000,'Number of points for first iteration'),
                        'iterations':('int', 5, 'Number of iterations'),
@@ -2030,6 +2059,8 @@
                 else:
                     outstr += "  %25s \t:\t%s (user set)\n" % (key,value)
             output.write(outstr)
+        elif  args[0] == 'results':
+            self.do_print_results(' '.join(args[1:]))
         else:
             super(MadEventCmd, self).do_display(line, output)
  
@@ -2096,6 +2127,37 @@
         
         misc.open_file(file_path)
 
+    ############################################################################ 
+    def do_print_results(self, line):
+        """Not in help:Print the cross-section/ number of events for a given run"""
+        
+        args = self.split_arg(line)
+        if len(args) > 0:
+            run_name = args[0]
+        else:
+            if not self.results.current:
+                raise self.InvalidCmd('no run currently defined. Please specify one.')
+            else:
+                run_name = self.results.current['run_name']
+        if run_name not in self.results:
+            raise self.InvalidCmd('%s is not a valid run_name or it doesn\'t have any information' \
+                                  % run_name)
+        if len(args) == 2:
+            tag = args[1]
+            if tag.isdigit():
+                tag = int(tag) - 1
+                if len(self.results[run_name]) < tag:
+                    raise self.InvalidCmd('Only %s different tag available' % \
+                                                    len(self.results[run_name]))
+                data = self.results[run_name][tag]
+            else:
+                data = self.results[run_name].return_tag(tag)
+        else:
+            data = self.results[run_name].return_tag(None) # return the last
+        
+        self.print_results_in_shell(data)
+        
+
     ############################################################################
     def do_set(self, line, log=True):
         """Set an option, which will be default for coming generations/outputs
@@ -2531,7 +2593,7 @@
                 fsock.close()
                 return
             else:
-                subprocess.call(['python', 'write_param_card.py'], 
+                subprocess.call([sys.executable, 'write_param_card.py'], 
                              cwd=pjoin(self.me_dir,'bin','internal','ufomodel'))
                 default = pjoin(self.me_dir,'bin','internal','ufomodel','param_card.dat')
             param_card.write_inc_file(outfile, ident_card, default)
@@ -2567,6 +2629,11 @@
         subproc = [l.strip() for l in open(pjoin(self.me_dir,'SubProcesses', 
                                                                  'subproc.mg'))]
         
+        #check difficult PS case
+        if float(self.run_card['mmjj']) > 150:
+            self.pass_in_difficult_integration_mode()
+          
+        
         P_zero_result = [] # check the number of times where they are no phase-space
         for nb_proc,subdir in enumerate(subproc):
             subdir = subdir.strip()
@@ -2630,6 +2697,40 @@
         self.results.add_detail('error', error) 
         self.update_status('End survey', 'parton', makehtml=False)
 
+    ############################################################################
+    def pass_in_difficult_integration_mode(self):
+        """be more secure for the integration to not miss it due to strong cut"""
+        
+        # improve survey options if default
+        if self.opts['points'] == self._survey_options['points'][1]:
+            self.opts['points'] = 3 * self._survey_options['points'][1]
+        if self.opts['iterations'] == self._survey_options['iterations'][1]:
+            self.opts['iterations'] = 2 + self._survey_options['iterations'][1]
+        if self.opts['accuracy'] == self._survey_options['accuracy'][1]:
+            self.opts['accuracy'] = self._survey_options['accuracy'][1]/3  
+            
+        # Modify run_config.inc in order to improve the refine
+        conf_path = pjoin(self.me_dir, 'Source','run_config.inc')
+        files.cp(conf_path, conf_path + '.bk')
+
+        text = open(conf_path).read()
+        text = re.sub('''\(min_events = \d+\)''', '''(min_events = 10000 )''', text)
+        text = re.sub('''\(max_events = \d+\)''', '''(max_events = 25000 )''', text)
+        fsock = open(conf_path, 'w')
+        fsock.write(text)
+        fsock.close()
+        
+        # Compile
+        for name in ['../bin/internal/gen_ximprove', 'all', 
+                     '../bin/internal/combine_events']:
+            self.compile(arg=[name], cwd=os.path.join(self.me_dir, 'Source'))
+        
+        
+        
+        
+        
+        
+        
     ############################################################################      
     def do_refine(self, line):
         """Advanced commands: launch survey for the current process """
@@ -3591,7 +3692,6 @@
         # ensure that exe is executable
         if os.path.exists(exe) and not os.access(exe, os.X_OK):
             os.system('chmod +x %s ' % exe)
-
         elif (cwd and os.path.exists(pjoin(cwd, exe))) and not \
                                             os.access(pjoin(cwd, exe), os.X_OK):
             os.system('chmod +x %s ' % pjoin(cwd, exe))
@@ -4886,6 +4986,7 @@
         cmd.OneLinePathCompletion.__init__(self, *args, **opt)
         self.me_dir = self.mother_interface.me_dir
         self.run_card = banner_mod.RunCard(pjoin(self.me_dir,'Cards','run_card.dat'))
+        run_card_def = banner_mod.RunCard(pjoin(self.me_dir,'Cards','run_card_default.dat'))
         try:
             self.param_card = check_param_card.ParamCard(pjoin(self.me_dir,'Cards','param_card.dat'))   
         except check_param_card.InvalidParamCard:
@@ -4932,10 +5033,10 @@
                     else:
                         self.pname2block[var] = [(bname, lha_id)]
         
-                    
+        self.run_set = run_card_def.keys() + self.run_card.hidden_param
         # check for conflict with run_card
         for var in self.pname2block:                
-            if var in self.run_card:
+            if var in self.run_set:
                 self.conflict.append(var)        
                             
     
@@ -4983,7 +5084,7 @@
                           self.list_completion(text, ['run_card', 'param_card'])
         
         if 'run_card' in allowed.keys():
-            opts = self.run_card.keys()
+            opts = self.run_set
             if allowed['run_card'] == 'default':
                 opts.append('default')
             
@@ -5064,7 +5165,7 @@
                 return
 
         #### RUN CARD
-        if args[start] in self.run_card.keys() and card != 'param_card':
+        if (args[start] in self.run_set) and card != 'param_card':
             if args[start+1] in self.conflict and card == '':
                 text = 'ambiguous name (present in both param_card and run_card. Please specify'
                 logger.warning(text)
@@ -5075,6 +5176,7 @@
                 if args[start] in default.keys():
                     self.setR(args[start],default[args[start]]) 
                 else:
+                    logger.info('remove information %s from the run_card' % args[start])
                     del self.run_card[args[start]]
             elif  args[start+1] in ['t','.true.']:
                 self.setR(args[start], '.true.')

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2013-06-21 05:22:57 +0000
+++ madgraph/interface/madgraph_interface.py	2013-08-16 20:45:36 +0000
@@ -1820,7 +1820,7 @@
         """Initializing before starting the main loop"""
 
         self.prompt = 'mg5>'
-        if os.access(MG5DIR, os.W_OK): # prevent on read-only disk  
+        if madgraph.ReadWrite: # prevent on read-only disk  
             self.do_install('update --mode=mg5_start')
         
         # By default, load the UFO Standard Model
@@ -1868,7 +1868,7 @@
             os.remove(pjoin(self._done_export[0],'RunWeb'))
                 
         value = super(MadGraphCmd, self).do_quit(line)
-        if os.access(MG5DIR, os.W_OK): #prevent to run on Read Only disk
+        if madgraph.ReadWrite: #prevent to run on Read Only disk
             self.do_install('update --mode=mg5_end')
         print
 
@@ -3109,12 +3109,15 @@
         logger.info('compile %s. This might takes a while.' % name)
         
         # Modify Makefile for pythia-pgs on Mac 64 bit
-        if args[0] == "pythia-pgs" and sys.maxsize > 2**32:
-            path = os.path.join(MG5DIR, 'pythia-pgs', 'src', 'make_opts')
-            text = open(path).read()
-            text = text.replace('MBITS=32','MBITS=64')
-            open(path, 'w').writelines(text)
-            
+        if args[0] == "pythia-pgs":
+            if sys.maxsize > 2**32:
+                path = os.path.join(MG5DIR, 'pythia-pgs', 'src', 'make_opts')
+                text = open(path).read()
+                text = text.replace('MBITS=32','MBITS=64')
+                open(path, 'w').writelines(text)
+            if not os.path.exists(pjoin(MG5DIR, 'pythia-pgs', 'libraries','pylib','lib')):
+                os.mkdir(pjoin(MG5DIR, 'pythia-pgs', 'libraries','pylib','lib'))
+                
         # Compile the file
         # Check for F77 compiler
         if 'FC' not in os.environ or not os.environ['FC']:
@@ -3140,9 +3143,15 @@
         if logger.level <= logging.INFO:
             devnull = open(os.devnull,'w') 
             misc.call(['make', 'clean'], stdout=devnull, stderr=-2)
+            if name == 'pythia-pgs':
+                #SLC6 needs to have this first (don't ask why)
+                status = misc.call(['make'], cwd = pjoin(MG5DIR, name, 'libraries', 'pylib'))
             status = misc.call(['make'], cwd = os.path.join(MG5DIR, name))
         else:
             self.compile(['clean'], mode='', cwd = os.path.join(MG5DIR, name))
+            if name == 'pythia-pgs':
+                #SLC6 needs to have this first (don't ask why)
+                status = self.compile(mode='', cwd = pjoin(MG5DIR, name, 'libraries', 'pylib'))
             status = self.compile(mode='', cwd = os.path.join(MG5DIR, name))
         if not status:
             logger.info('compilation succeeded')

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2013-06-21 05:03:28 +0000
+++ madgraph/iolibs/export_v4.py	2013-08-16 20:45:36 +0000
@@ -50,7 +50,7 @@
 import models.write_param_card as param_writer
 import models.check_param_card as check_param_card
 
-from madgraph import MadGraph5Error, MG5DIR
+from madgraph import MadGraph5Error, MG5DIR, ReadWrite
 from madgraph.iolibs.files import cp, ln, mv
 
 pjoin = os.path.join
@@ -780,7 +780,7 @@
         logger.info('Use Fortran compiler ' + compiler)
         self.replace_make_opt_compiler(compiler)
         # Replace also for Template but not for cluster
-        if not os.environ.has_key('MADGRAPH_DATA') and os.access(MG5DIR, os.W_OK):
+        if not os.environ.has_key('MADGRAPH_DATA') and ReadWrite:
             self.replace_make_opt_compiler(compiler, pjoin(MG5DIR, 'Template'))
 
     def replace_make_opt_compiler(self, compiler, root_dir = ""):

=== modified file 'madgraph/iolibs/template_files/madevent_makefile_source'
--- madgraph/iolibs/template_files/madevent_makefile_source	2013-03-14 06:18:43 +0000
+++ madgraph/iolibs/template_files/madevent_makefile_source	2013-08-16 20:45:36 +0000
@@ -63,7 +63,7 @@
 select_events.o: select_events.f run_config.inc
 setrun.o: setrun.f nexternal.inc leshouche.inc run_card.inc
 
-run_card.inc:
+run_card.inc: ../Cards/run_card.dat
 	../bin/madevent treatcards run
 
 clean_lhapdf:

=== modified file 'madgraph/iolibs/template_files/madevent_symmetry.f'
--- madgraph/iolibs/template_files/madevent_symmetry.f	2013-05-29 06:45:00 +0000
+++ madgraph/iolibs/template_files/madevent_symmetry.f	2013-08-16 20:45:36 +0000
@@ -667,8 +667,6 @@
       write(lun,20) 'cp $k log.txt'
       write(lun,20) 'cd ../'
       write(lun,15) 'done'
-      write(lun,15) 'rm -f run.$script'
-      write(lun,15) 'touch done.$script'
  15   format(a)
  20   format(5x,a)
  25   format(10x,a)

=== modified file 'madgraph/various/banner.py'
--- madgraph/various/banner.py	2013-03-27 22:47:55 +0000
+++ madgraph/various/banner.py	2013-08-16 20:45:36 +0000
@@ -257,6 +257,9 @@
 class RunCard(dict):
     """A class object for the run_card"""
 
+    #list of paramater which are allowed BUT not present in the _default file.
+    hidden_param = ['lhaid', 'gridrun', 'fixed_couplings']
+
     def __init__(self, run_card):
         """ """
 
@@ -315,16 +318,23 @@
            (a path to a valid run_card)"""
         
         text = ""
-        for line in file(template,'r'):
+        for line in file(template,'r'):                  
             nline = line.split('#')[0]
             nline = nline.split('!')[0]
             comment = line[len(nline):]
             nline = nline.split('=')
             if len(nline) != 2:
                 text += line
-            else:
+            elif nline[1].strip() in self:
                 text += '  %s\t= %s %s' % (self[nline[1].strip()],nline[1], comment)        
+            else:
+                logger.info('Adding missing parameter %s to current run_card (with default value)' % nline[1].strip())
+                text += line 
         
+        for param in self.hidden_param:
+            if param in self:
+                text += '  %s\t= %s \n' % (self[param],param) 
+
         fsock = open(output_file,'w')
         fsock.write(text)
         fsock.close()

=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2013-06-21 05:03:28 +0000
+++ madgraph/various/misc.py	2013-08-16 20:45:36 +0000
@@ -175,8 +175,12 @@
 def compile(arg=[], cwd=None, mode='fortran', nb_core=1, **opt):
     """compile a given directory"""
 
+    cmd = ['make']
     try:
-        p = subprocess.Popen(['make','-j%s' % nb_core] + arg, stdout=subprocess.PIPE, 
+        if nb_core > 1:
+            cmd.append('-j%s' % nb_core)
+        cmd += arg
+        p = subprocess.Popen(cmd, stdout=subprocess.PIPE, 
                              stderr=subprocess.STDOUT, cwd=cwd, **opt)
         (out, err) = p.communicate()
     except OSError, error:

=== modified file 'models/check_param_card.py'
--- models/check_param_card.py	2013-02-28 23:52:38 +0000
+++ models/check_param_card.py	2013-08-16 20:45:36 +0000
@@ -332,8 +332,13 @@
                     value = self[block].get(tuple(lhaid)).value
                 except KeyError:
                     value =defaultcard[block].get(tuple(lhaid)).value
+                    logger.warning('information about \"%s %s" is missing using default value: %s.' %\
+                                   (block, lhaid, value))
+
             else:
                 value =defaultcard[block].get(tuple(lhaid)).value
+                logger.warning('information about \"%s %s" is missing (full block missing) using default value: %s.' %\
+                                   (block, lhaid, value))
             value = str(value).lower()
             fout.writelines(' %s = %s' % (variable, str(value).replace('e','d')))
             

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2013-06-21 05:03:28 +0000
+++ models/import_ufo.py	2013-08-16 20:45:36 +0000
@@ -21,7 +21,8 @@
 import re
 import sys
 
-from madgraph import MadGraph5Error, MG5DIR
+
+from madgraph import MadGraph5Error, MG5DIR, ReadWrite
 import madgraph.core.base_objects as base_objects
 import madgraph.core.color_algebra as color
 import madgraph.iolibs.files as files
@@ -191,8 +192,9 @@
             # might be None for ghost
             
     # save in a pickle files to fasten future usage
-    save_load_object.save_to_file(os.path.join(model_path, pickle_name), model,
-                                  log=False) 
+    if ReadWrite:
+        save_load_object.save_to_file(os.path.join(model_path, pickle_name),
+                                   model, log=False) 
  
     #if default and os.path.exists(os.path.join(model_path, 'restrict_default.dat')):
     #    restrict_file = os.path.join(model_path, 'restrict_default.dat') 
@@ -342,7 +344,8 @@
                         particle.set(key, str(value[1]))
                 else:
                     particle.set(key, value)
-            elif key.lower() not in ('ghostnumber','selfconjugate','goldstoneboson','partial_widths'):
+            elif key.lower() not in ('ghostnumber','selfconjugate','goldstone',
+                                             'goldstoneboson','partial_widths'):
                 # add charge -we will check later if those are conserve 
                 self.conservecharge.add(key)
                 particle.set(key,value, force=True)

=== modified file 'tests/acceptance_tests/test_cmd_madevent.py'
--- tests/acceptance_tests/test_cmd_madevent.py	2013-03-27 22:47:55 +0000
+++ tests/acceptance_tests/test_cmd_madevent.py	2013-08-16 20:45:36 +0000
@@ -223,7 +223,8 @@
         err1 = self.cmd_line.results.current['error']
         
         target = 3864.0
-        self.assertTrue(abs(val1 - target) / err1 < 1.)
+        self.assertTrue(abs(val1 - target) / err1 < 1., 'large diference between %s and %s +- %s'%
+                        (target, val1, err1))
         
     def test_e_e_collision(self):
         """check that e+ e- > t t~ gives the correct result"""

=== removed file 'tests/input_files/sm_with_custom_propa/propagator.py'
--- tests/input_files/sm_with_custom_propa/propagator.py	2013-03-18 23:03:14 +0000
+++ tests/input_files/sm_with_custom_propa/propagator.py	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-# This file was automatically created by FeynRules 1.7.69
-# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Mon 1 Oct 2012 14:58:26
-
-from object_library import all_propagator, Propagator
-
-# define only once the denominator since this is always the same
-denominator = "P('mu', id) * P('mu', id) - Mass(id) * Mass(id) + complex(0,1) * Mass(id) * Width(id)"
-
-# propagator for the scalar
-S = Propagator(name = "S",
-               spin = 1,
-               numerator = "complex(0,1)",
-               denominator = denominator
-               )
-
-# propagator for the incoming fermion # the one for the outcomming is computed on the flight
-F = Propagator(name = "F",
-                spin = 2,
-                numerator = "complex(0,1) * (Gamma('mu', s1, s2) * P('mu', id) + Mass(id) * Identity(s1, s2))",
-                denominator = denominator
-               )
-
-# massive vector in the unitary gauge, can't be use for massless particles
-V1 = Propagator(name = "V1",
-                spin = 3,
-                numerator = "complex(0,1) * (-1 * Metric(l1, l2) + Metric(l1,'mu')* P('mu', id) * P(l2, id) / Mass(id)**2 ",
-                denominator = denominator
-               )
-
-# massless vector and massive vector in unitary gauge
-V2 = Propagator(name = "V2",
-                spin = 3,
-                expression = "complex(0,-1) * Metric(l1, l2)",
-                denominator = denominator
-               )
-
-

=== modified file 'tests/input_files/sm_with_custom_propa/propagators.py'
--- tests/input_files/sm_with_custom_propa/propagators.py	2013-03-18 23:03:14 +0000
+++ tests/input_files/sm_with_custom_propa/propagators.py	2013-08-16 20:45:36 +0000
@@ -10,25 +10,25 @@
 
 # propagator for the scalar
 S = Propagator(name = "S",
-               numerator = "complex(0,1)",
+               numerator = "1",
                denominator = denominator
                )
 
 # propagator for the incoming fermion # the one for the outcomming is computed on the flight
 F = Propagator(name = "F",
-                numerator = "complex(0,1) * (Gamma('mu', s1, s2) * P('mu', id) + Mass(id) * Identity(s1, s2))",
+                numerator = "(Gamma('mu', s1, s2) * P('mu', id) + Mass(id) * Identity(s1, s2))",
                 denominator = denominator
                )
 
 # massive vector in the unitary gauge, can't be use for massless particles
 V1 = Propagator(name = "V1",
-                numerator = "complex(0,1) * (-1 * Metric(l1, l2) + Metric(l1,'mu')* P('mu', id) * P(l2, id) / Mass(id)**2 ",
+                numerator = "(-1 * Metric(l1, l2) + Metric(l1,'mu')* P('mu', id) * P(l2, id) / Mass(id)**2 ",
                 denominator = denominator
                )
 
 # massless vector and massive vector in unitary gauge
 V2 = Propagator(name = "V2",
-                numerator = "complex(0,-1) * Metric(l1, l2)",
+                numerator = "-1 * Metric(l1, l2)",
                 denominator =  "P('mu', id) * P('mu', id)"
                )
 

=== modified file 'tests/unit_tests/various/test_aloha.py'
--- tests/unit_tests/various/test_aloha.py	2013-06-06 13:29:17 +0000
+++ tests/unit_tests/various/test_aloha.py	2013-08-16 20:45:36 +0000
@@ -1253,7 +1253,7 @@
                 (obj.Metric(rho,sigma) - obj.OverMass2(t) * obj.P(rho,t) *obj.P(sigma,t) )
         
         prop = aloha_obj.Spin2Propagator(mu,nu,rho,sigma, t)
-        zero = 1j * propa - 2 * prop
+        zero = propa - 2 * prop
         
         
         zero = zero.expand().simplify() 
@@ -1291,7 +1291,7 @@
         propa = propa + 2/6 * OM(t) * Metric(alpha, beta) *  P(mu,t) * P(nu,t)     
         
              
-        zero = 1j*propa - aloha_obj.Spin2Propagator(mu,nu,alpha,beta, t)
+        zero = propa - aloha_obj.Spin2Propagator(mu,nu,alpha,beta, t)
         
         zero = zero.expand().simplify() 
         
@@ -1339,7 +1339,7 @@
         t = 1
         mu, nu, alpha, beta = 1,2,3,4
         
-        aloha = Metric(mu,nu) * aloha_obj.Spin2Propagator(mu,nu,alpha,beta, t)
+        aloha = complex(0,1)*Metric(mu,nu) * aloha_obj.Spin2Propagator(mu,nu,alpha,beta, t)
         analytical = complex(0, 1/3) * (OM(t) * P(-1, t)* P(-1,t) - 1) * (Metric(alpha, beta) + 2 * OM(t) * P(alpha,t)*P(beta,t))
         
         
@@ -4337,7 +4337,21 @@
 """
         self.assertEqual(text.split('\n'), target.split('\n'))
             
- 
+    @set_global(loop=False, unitary=True, mp=True, cms=False)
+    def test_aloha_get_name(self):
+
+        FFV_M = UFOLorentz(name = 'FFVM',
+                 spins = [ 2, 2, 3 ],
+                 structure = 'Gamma(3,1,\'s1\')*ProjM(\'s1\',2)')  
+        abstract = create_aloha.AbstractRoutineBuilder(FFV_M).compute_routine(3)
+        
+        name = aloha_writers.get_routine_name(abstract=abstract, tag=['P0','C1'])
+        
+        self.assertEqual(name, 'FFVMC1P0_3')
+
+        name = aloha_writers.get_routine_name(abstract=abstract, tag=['C1','P0'])
+        
+        self.assertEqual(name, 'FFVMC1P0_3')
     
     @set_global(loop=True, unitary=True, mp=True, cms=False)
     def test_aloha_MP_mode(self):