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

[Olivier Mattelaer]

[Johan Alwall (johan-alwall)]

Hello Olivier,

Nice job (as usual!). Just a tiny remark:

> @@ -701,6 +705,10 @@
> text = open(path).read()
> if 'Begin PROCESS' in text:
> return 'proc_v4'
> + elif '<MGVERSION>' in text:
> + return 'banner'
> + elif '<MGVersion>' in text:
> + return 'banner'
> else:
> return 'command'

I would recommend to make all these case independent (i.e., use
text.lower()), since HTML tags are case independent.

> + if 'MG5ProcCard' in ban:

Same thing here.

As I wrote in an email, it would be nice if a banner is automatically
detected as command line argument, so you can run
bin/mg5 banner.txt
(which also nicely simplifies the syntax in the web interface :-)).

And of course (did you implement this already?), automatic splitting of
the banner and use of the relevant cards if a banner path is given in
the cards question. That way the banner functionality will be complete.

Cheers,
Johan

[Johan Alwall (johan-alwall)]

Oh no... I found another problem (or question?):
I canceled the automatic banner run (by pressing Ctrl-C), and now on the crossx.html page there is an ERROR under "Banner". However, the associated debug file is not there, and in the main directory the ME5_debug file points to this non-existant file:
ME5_debug -> /Users/alwall/MadGraph/mg5_1_4_2/PROC_sm_0/run_01_fermi_debug.log

There is also a link to the banner ("fermi"), but the corresponding file doesn't exist.

It's not something urgent, but just a bit strange behavior...

Johan

[lp:~maddevelopers/mg5amcnlo/mg5_1_4_2]

222. By Olivier Mattelaer on 2012-02-15

allow
./bin/mg5 BANNER_PATH
./bin/mg5 PROC_CARD_V4_PATH
this implementation is fine if the cmd files is the same as one model name

[Olivier Mattelaer (olivier-mattelaer)]

ok for the lower case.
I was reluctant to do it since the file might be quite large. I will maybe use a regular expression instead (much nicer in fact since this allow to scan only one the content of the file).

>As I wrote in an email, it would be nice if a banner is automatically
>detected as command line argument, so you can run
>bin/mg5 banner.txt
>(which also nicely simplifies the syntax in the web interface :-)).

Done

>And of course (did you implement this already?), automatic splitting of
>the banner and use of the relevant cards if a banner path is given in
>the cards question. That way the banner functionality will be complete.

>Oh no... I found another problem (or question?):
>I canceled the automatic banner run (by pressing Ctrl-C), and now on the crossx.html page >there is an ERROR under "Banner". However, the associated debug file is not there, and in >the main directory the ME5_debug file points to this non-existant file:
>ME5_debug -> /Users/alwall/MadGraph/mg5_1_4_2/PROC_sm_0/run_01_fermi_debug.log
>There is also a link to the banner ("fermi"), but the corresponding file doesn't exist.

In fact I fact that before. But don't know what to do in this case.
I like to have the error in the html output since the job didn't finish correctly.
(which explains why the banner didn't exists, you stop the job before it's creation)
But the ME5_debug is pointless since this is a stop by the user.

yeah done for this.

[lp:~maddevelopers/mg5amcnlo/mg5_1_4_2]

223. By Olivier Mattelaer on 2012-02-15

pass banner tag to case insensitive
detection of import/card pass to regular expression (and case insensitive)

[Johan Alwall (johan-alwall)]

Excellent. How about the automatic splitting of a banner during card import? This should be very quick to implement (if you agree that it's a good thing).

Johan

[Olivier Mattelaer (olivier-mattelaer)]

All the case problem should be (in principle) resolve.
The banner detection is now case insensitive and all the tag associate to the banner are now lower case.

[Olivier Mattelaer (olivier-mattelaer)]

Otherwise,

One remark concerning the length of string variable in fortran:
./Source/banner.f: character*35 infile,outfile
./Source/banner.f: character*30 process,QED,QCD

is this enough?

Cheers,

Olivier

[Johan Alwall (johan-alwall)]

> ./Source/banner.f: character*35 infile,outfile
> ./Source/banner.f: character*30 process,QED,QCD

This file is not used (and has never been in recent history), so you can simply remove it.

However, there is another problem: I used a banner (I'll send it to you by email) for banner_run, running only parton level, and the tag is used appropriately to name the banner, but is not properly used in the crossx.html page (so the link to the banner doesn't work).

Cheers,
Johan

[Olivier Mattelaer (olivier-mattelaer)]

> Excellent. How about the automatic splitting of a banner during card import?
> This should be very quick to implement (if you agree that it's a good thing).

This is done (Do you trouble with that?), and I have the automatic launch of the process as well.
so this is exactly the same as
./bin/mg5
import banner PATH
(which makes a lot of sense)

[Olivier Mattelaer (olivier-mattelaer)]

Did you send me the correct banner?(p p > e+ e-) It's working perfectly on my computer.
(or I did not understand your problem).

I have remove the banner.f (pointless to keep it -> remove)
Then your change seems perfect.

review: Approve

[Johan Alwall (johan-alwall)]

> > Excellent. How about the automatic splitting of a banner during card import?
> > This should be very quick to implement (if you agree that it's a good
> thing).
>
> This is done (Do you trouble with that?), and I have the automatic launch of
> the process as well.
> so this is exactly the same as
> ./bin/mg5
> import banner PATH
> (which makes a lot of sense)

I am referring to the following:
bin/madevent
MGME5> generate_events
0
/Users/alwall/Downloads/run_01_fermi_banner.txt
copy //Users/alwall/Downloads/run_01_fermi_banner.txt as banner

Now if I check the cards, they are not replaced by the ones in the banner. In fact, I don't understand what "copy ... as banner" means, since the banner is then not used. To me it's clear that the user wants to use the cards in the banner if he does this.

Cheers,
Johan

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

> I am referring to the following:
> bin/madevent
> MGME5> generate_events
> 0
> /Users/alwall/Downloads/run_01_fermi_banner.txt
> copy //Users/alwall/Downloads/run_01_fermi_banner.txt as banner

Aaah ok now I understand.

> Now if I check the cards, they are not replaced by the ones in the
> banner. In fact, I don't understand what "copy ... as banner" means,
> since the banner is then not used.
> To me it's clear that the user wants to use the cards in the banner
> if he does this.

That's clear, just never think about that possibility before you speak
about that.
So this is quite easy to do.
Note that this super-seeds the previous question (so the mode of
running is redefine automatically to the banner level).

Cheers,

Olivier

>
> Cheers,
> Johan
>
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/mg5_1_4_2/+merge/
> 93146
> You proposed lp:~maddevelopers/madgraph5/mg5_1_4_2 for merging.

[Johan Alwall (johan-alwall)]

> That's clear, just never think about that possibility before you speak
> about that.
> So this is quite easy to do.

Oh, I'm sorry I thought I had mentioned it in a previous comment (that's why I didn't specify well before).

> Note that this super-seeds the previous question (so the mode of
> running is redefine automatically to the banner level).

I don't agree - since you anyway seem to keep the cards even if I choose a shorter running, I would suggest to override only if it is "auto", but keep the user's choice if it's something else. This would be the most natural behavior.

Anyway, once this also works, I'll be perfectly happy. If you do it within a couple of hours, I'll approve so you can finally do the merge.

Thanks,
Johan

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

> I don't agree - since you anyway seem to keep the cards even if I
> choose a shorter running, I would suggest to override only if it is
> "auto", but keep the user's choice if it's something else. This
> would be the most natural behavior.

In fact generate_events ALWAYS launch pythia.
this one stops directly if pyhia-pgs is not installed
if they are no pythia-card.

So in fact the way to forbid the running is to remove the card. Is
this fine for you?

Cheers,

Olivier

On 16-févr.-12, at 05:11, Johan Alwall wrote:

>> That's clear, just never think about that possibility before you
>> speak
>> about that.
>> So this is quite easy to do.
>
> Oh, I'm sorry I thought I had mentioned it in a previous comment
> (that's why I didn't specify well before).
>
>> Note that this super-seeds the previous question (so the mode of
>> running is redefine automatically to the banner level).
>
> I don't agree - since you anyway seem to keep the cards even if I
> choose a shorter running, I would suggest to override only if it is
> "auto", but keep the user's choice if it's something else. This
> would be the most natural behavior.
>
> Anyway, once this also works, I'll be perfectly happy. If you do it
> within a couple of hours, I'll approve so you can finally do the
> merge.
>
> Thanks,
> Johan
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/mg5_1_4_2/+merge/
> 93146
> You proposed lp:~maddevelopers/madgraph5/mg5_1_4_2 for merging.

[lp:~maddevelopers/mg5amcnlo/mg5_1_4_2]

224. By Olivier Mattelaer on 2012-02-16

treat correctly the case when the user enter a banner in the questions of madevent.

225. By Olivier Mattelaer on 2012-02-16

changing the mode of run when a banner is provided only if the mode is in auto

[Olivier Mattelaer (olivier-mattelaer)]

I implement it in that way (remove the additional card)
so you can see.

[Johan Alwall (johan-alwall)]

Perfect! Thanks a lot for this awesome version!

Johan

review: Approve

[lp:~maddevelopers/mg5amcnlo/mg5_1_4_2]

226. By Olivier Mattelaer on 2012-02-16

modify the date of the release

227. By Olivier Mattelaer on 2012-02-16

change the path for td binary from cp3wks05 to madgraph.phys

=== modified file 'Template/Source/combine_runs.f'
--- Template/Source/combine_runs.f	2011-05-05 21:56:41 +0000
+++ Template/Source/combine_runs.f	2012-02-16 19:14:18 +0000
@@ -275,7 +275,7 @@
       double precision P(0:4,maxexternal),xwgt
       integer n,ic(7,maxexternal),ievent
       double precision scale,aqcd,aqed
-      character*140 buff
+      character*300 buff
       logical done
 c-----
 c  Begin Code

=== modified file 'Template/Source/rw_events.f'
--- Template/Source/rw_events.f	2010-10-30 03:26:37 +0000
+++ Template/Source/rw_events.f	2012-02-16 19:14:18 +0000
@@ -21,12 +21,12 @@
       logical done
       double precision P(0:4,*),wgt,aqcd,aqed,scale
       integer ievent
-      character*140 buff2
+      character*300 buff2
 c
 c     Local
 c
       integer i,j,k
-      character*(256) buff
+      character*(300) buff
       double precision xdum1,xdum2
 c
 c     Global
@@ -46,10 +46,10 @@
          open (unit=lun_ban, status='scratch')
          banner_open=.true.
       endif
- 11   read(lun,'(a256)',end=99,err=99) buff
+ 11   read(lun,'(a300)',end=99,err=99) buff
       do while(index(buff,"<event") .eq. 0)
          write(lun_ban,'(a)') buff
-         read(lun,'(a256)',end=99,err=99) buff
+         read(lun,'(a300)',end=99,err=99) buff
       enddo
       read(lun,*,err=11, end=11) nexternal,ievent,wgt,scale,aqed,aqcd
       do i=1,nexternal
@@ -58,8 +58,8 @@
          ic(7,i)=xdum2
       enddo
       do while(index(buff,"</event") .eq. 0)
-         read(lun,'(a256)',end=99,err=99) buff
-         if(buff(1:1).eq.'#') buff2=buff(1:140)
+         read(lun,'(a300)',end=99,err=99) buff
+         if(buff(1:1).eq.'#') buff2=buff(1:300)
       enddo
 c      gal(1) = sqrt(4d0*pi*aqed)
 c      g      = sqrt(4d0*pi*aqcd)
@@ -93,7 +93,7 @@
       integer nexternal, ic(7,*)
       double precision P(0:4,*),wgt
       double precision aqcd, aqed, scale
-      character*140 buff
+      character*300 buff
 c
 c     Local
 c
@@ -133,7 +133,7 @@
 c
 c     Local
 c
-      character*(80) buff
+      character*(200) buff
 c
 c     Global
 c
@@ -148,8 +148,8 @@
       if (banner_open) then
          rewind(lun_ban)
          do while (.true.) 
-            read(lun_ban,'(a79)',end=99,err=99) buff
-            write(lun,'(a79)') buff
+            read(lun_ban,'(a)',end=99,err=99) buff
+            write(lun,'(a)') buff
 c            write(*,*) buff
          enddo
  99      close(lun_ban)

=== modified file 'Template/SubProcesses/addmothers.f'
--- Template/SubProcesses/addmothers.f	2012-01-25 03:54:07 +0000
+++ Template/SubProcesses/addmothers.f	2012-02-16 19:14:18 +0000
@@ -14,7 +14,8 @@
       integer jpart(7,-nexternal+3:2*nexternal-3),npart,ip,numproc
       double precision pb(0:4,-nexternal+3:2*nexternal-3)
       double precision rscale,aqcd,aqed,targetamp(maxflow)
-      character*140 buff
+      character*300 buff
+      character*20 cform
 
       integer isym(nexternal,99), jsym
       integer i,j,k,ida(2),ns,nres,ires,icl,ito2,idenpart,nc,ic
@@ -323,8 +324,10 @@
           enddo
         enddo
 
-        if(ickkw.gt.0)
-     $       write(buff,'(a1,9e15.7)') '#',(ptclus(i),i=3,min(nexternal,11))
+        if(ickkw.gt.0) then
+           write(cform,'(a4,i2,a6)') '(a1,',max(nexternal,10),'e15.7)'
+           write(buff,cform) '#',(ptclus(i),i=3,nexternal)
+         endif
         npart = nexternal+nres
 
       return

=== modified file 'Template/SubProcesses/unwgt.f'
--- Template/SubProcesses/unwgt.f	2012-01-30 03:26:48 +0000
+++ Template/SubProcesses/unwgt.f	2012-02-16 19:14:18 +0000
@@ -240,7 +240,7 @@
       integer iseed, nover, nstore
       double precision scale,aqcd,aqed
       integer ievent
-      character*140 buff
+      character*300 buff
 C     
 C     GLOBAL
 C
@@ -397,7 +397,7 @@
       real ran1
       external ran1
 
-      character*140 buff
+      character*300 buff
 
 C     
 C     GLOBAL

=== modified file 'Template/bin/madevent'
--- Template/bin/madevent	2012-02-03 21:44:27 +0000
+++ Template/bin/madevent	2012-02-16 19:14:18 +0000
@@ -159,6 +159,10 @@
     if cmd_line.history[-1] not in ['EOF','quit','exit']:
         cmd_line.results.store_result()
     # Remove lock file
+except:
+    pass
+
+try:
     os.remove(os.path.join(root_path,os.pardir, 'RunWeb'))
 except:
     pass

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2012-02-06 19:57:04 +0000
+++ UpdateNotes.txt	2012-02-16 19:14:18 +0000
@@ -1,9 +1,22 @@
 Update notes for MadGraph 5 (in reverse time order)
 
-1.4.1 (06/02/12)  OM: Fix the fermion flow check which was wrongly failing on some model
-                      (Thanks to Benjamin)
-                  OM: Improve run organization efficiency (which fastenize the code on cluster)
- 		      (Thanks to Johan)
+1.4.2 (16/02/12)  JA: Ensure that matching works properly with > 9 final state
+                      particles (by increasing a buffer size in event output)
+		  OM: add a command "import banner" in order to run a full run
+		      from a given banner.
+                  OM: Fix the Bug #921487, fixing a problem with home made model
+                      In the definition of Particle/Anti-Particle. (Thanks Ben)
+		  OM: Fix a formatting problem in me5_configuration.txt 
+                      (Bug #930101) Thanks to Arian
+		  OM: allow to run ./bin/mg5 BANNER_PATH and
+                      ./bin/mg5 PROC_CARD_V4_PATH
+		  OM: Various small fixes concerning the stability of the html 
+		      output.
+
+1.4.1 (06/02/12)  OM: Fix the fermion flow check which was wrongly failing on 
+                      some model  (Thanks to Benjamin)
+                  OM: Improve run organization efficiency (which speeds up the 
+		      code on cluster) (Thanks to Johan)
                   OM: More secure html output (Thanks to Simon)
 
 1.4.0 (04/02/12): OM: New user interface for the madevent run. Type:

=== modified file 'bin/mg5'
--- bin/mg5	2011-12-14 21:52:20 +0000
+++ bin/mg5	2012-02-16 19:14:18 +0000
@@ -119,18 +119,18 @@
     if options.file or args:
         # They are an input file 
         if args:
-            input_file = args[0]
+            input_file = os.path.realpath(args[0])
         else:
-            input_file = options.file
+            input_file = os.path.realpath(options.file)
         if options.web:
             cmd_line = cmd_interface.MadGraphCmdWeb()
             cmd_line.debug_output = os.path.join(os.path.dirname(input_file),'generation.log')
             cmd_line.use_rawinput = False
-            cmd_line.run_cmd('import command ' + input_file)
+            cmd_line.run_cmd('import ' + input_file)
         else:
             cmd_line = cmd_interface.MadGraphCmdShell(mgme_dir = options.mgme_dir)
             cmd_line.use_rawinput = False
-            cmd_line.run_cmd('import command ' + input_file)
+            cmd_line.run_cmd('import ' + input_file)
 
     else:
         # Interactive mode

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2012-02-06 19:57:04 +0000
+++ madgraph/VERSION	2012-02-16 19:14:18 +0000
@@ -1,3 +1,3 @@
-version = 1.4.1
-date = 2012-06-02
+version = 1.4.2
+date = 2012-02-16
 

=== modified file 'madgraph/interface/cmd_interface.py'
--- madgraph/interface/cmd_interface.py	2012-02-03 22:14:20 +0000
+++ madgraph/interface/cmd_interface.py	2012-02-16 19:14:18 +0000
@@ -63,6 +63,7 @@
 import madgraph.interface.madevent_interface as madevent_interface
 
 import madgraph.various.process_checks as process_checks
+import madgraph.various.banner as banner_module
 
 import models as ufomodels
 import models.import_ufo as import_ufo
@@ -258,6 +259,9 @@
         logger.info("")
         logger.info("   import command PATH :")
         logger.info("      Execute the list of command in the file at PATH")
+        logger.info("")
+        logger.info("   import banner PATH  [--no_launch]:")
+        logger.info("      Rerun the exact same run define in the valid banner.")
  
     def help_install(self):
         logger.info("syntax: install " + "|".join(self._install_opts))
@@ -417,7 +421,7 @@
     
         if len(args) < 2:
             self.help_add()
-            raise self.InvalidCmd('\"add\" requires two arguments')
+            raise self.InvalidCmd('\"add\" requires at least two arguments')
         
         if args[0] != 'process':
             raise self.InvalidCmd('\"add\" requires the argument \"process\"')
@@ -699,10 +703,16 @@
         # Not valid directory so maybe a file
         if os.path.isfile(path):
             text = open(path).read()
-            if 'Begin PROCESS' in text:
+            pat = re.compile('(Begin process|<MGVERSION>)', re.I)
+            matches = pat.findall(text)
+            if not matches:
+                return 'command'
+            elif len(matches) > 1:
+                return 'banner'
+            elif matches[0].lower() == 'begin process':
                 return 'proc_v4'
             else:
-                return 'command'
+                return 'banner'
         else:
             return 'proc_v4'
         
@@ -1489,6 +1499,8 @@
                 return ['--modelname']
             elif not (os.path.sep in args[-1] and line[-1] != ' '):
                 completion_categories['options'] = self.list_completion(text, ['--modelname','-modelname'])
+        if len(args) >= 3 and mode.startswith('banner') and not '--no_launch' in line:
+            completion_categories['options'] = self.list_completion(text, ['--no_launch'])
         return self.deal_multiple_categories(completion_categories) 
         
         
@@ -1549,7 +1561,7 @@
     _save_opts = ['model', 'processes', 'options']
     _tutorial_opts = ['start', 'stop']
     _check_opts = ['full', 'permutation', 'gauge', 'lorentz_invariance']
-    _import_formats = ['model_v4', 'model', 'proc_v4', 'command']
+    _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']
@@ -2465,8 +2477,31 @@
                 # Execute the card
                 self.use_rawinput = False
                 self.import_command_file(args[1])
-                self.use_rawinput = True    
-        
+                self.use_rawinput = True
+                
+        elif args[0] == 'banner':
+            type = madevent_interface.MadEventCmd.detect_card_type(args[1])    
+            if type != 'banner':
+                raise self.InvalidCmd, 'The File should be a valid banner'
+            ban = banner_module.Banner(args[1])
+            # Check that this is MG5 banner
+            if 'mg5proccard' in ban:
+                for line in ban['mg5proccard'].split('\n'):
+                    if line.startswith('#') or line.startswith('<'):
+                        continue
+                    self.exec_cmd(line)
+            else:
+                raise self.InvalidCmd, 'Only MG5 banner are supported'
+            
+            if not self._done_export:
+                self.exec_cmd('output . -f')
+
+            ban.split(self._done_export[0])
+            logger.info('All Cards from the banner have been place in directory %s' % pjoin(self._done_export[0], 'Cards'))
+            if '--no_launch' not in args:
+                self.exec_cmd('launch')
+            
+            
         elif args[0] == 'proc_v4':
             
             # Remove previous imports, generations and outputs from history
@@ -2697,7 +2732,7 @@
                 files.mv(MG5DIR + '/td/td_mac_intel',MG5DIR+'/td/td')
             else:
                 logger.info('Downloading TD for Linux 32 bit')
-                target = 'http://cp3wks05.fynu.ucl.ac.be/twiki/pub/Software/TopDrawer/td'
+                target = 'http://madgraph.phys.ucl.ac.be/Downloads/td'
                 subprocess.call(['wget', target], cwd=pjoin(MG5DIR,'td'))      
                 os.chmod(pjoin(MG5DIR,'td','td'), 0775)
                 if sys.maxsize > 2**32:
@@ -2930,12 +2965,13 @@
             else:
                 raise self.RWError('Could not load processes from file %s' % args[1])
     
-    def do_save(self, line):
+    def do_save(self, line, check=True):
         """Not in help: Save information to file"""
 
         args = self.split_arg(line)
         # Check argument validity
-        self.check_save(args)
+        if check:
+            self.check_save(args)
 
         if args[0] == 'model':
             if self._curr_model:
@@ -2985,12 +3021,12 @@
                 to_write.remove(key)
             except:
                 pass
-            if '_path' in key:        
+            if '_path' in key:       
                 # special case need to update path
                 # check if absolute path
                 if value.startswith('./'):
-                    realpath = os.path.realpath(os.path.join(MG5DIR, value))
-            writer.writelines('%s = %s # %s' % (key, value, comment))
+                    value = os.path.realpath(os.path.join(MG5DIR, value))
+            writer.writelines('%s = %s # %s \n' % (key, value, comment))
         for key in to_write:
             if key in self._options:
                 writer.writelines('%s = %s \n' % (key,self._options[key]))
@@ -3405,7 +3441,7 @@
         if self._export_format == 'madevent':          
             # Create configuration file [path to executable] for madevent
             filename = os.path.join(self._export_dir, 'Cards', 'me5_configuration.txt')
-            self.do_save('options %s' % filename)
+            self.do_save('options %s' % filename, check=False)
             
             logger.info('Type \"launch\" to generate events from this process, or see')
             logger.info(self._export_dir + '/README')

=== modified file 'madgraph/interface/launch_ext_program.py'
--- madgraph/interface/launch_ext_program.py	2011-12-21 14:44:13 +0000
+++ madgraph/interface/launch_ext_program.py	2012-02-16 19:14:18 +0000
@@ -257,10 +257,6 @@
         line = fsock.readline()
         cross, error = line.split()[0:2]
         
-        if self.unit != 'GeV':
-            logger.info('The total cross-section is %s +- %s %s' % (cross, error, self.unit))
-        else:
-            logger.info('The width is %s +- %s GeV' % (cross, error))
         logger.info('more information in %s' 
                                  % os.path.join(self.running_dir, 'index.html'))
                 

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2012-02-06 21:23:06 +0000
+++ madgraph/interface/madevent_interface.py	2012-02-16 19:14:18 +0000
@@ -396,21 +396,21 @@
         logger.info("syntax: pythia [RUN] [--run_options]")
         logger.info("-- run pythia on RUN (current one by default)")
         self.run_options_help([('-f','answer all question by default'),
-                               ('-tag=', 'define the tag for the pythia run'),
+                               ('--tag=', 'define the tag for the pythia run'),
                                ('--no_default', 'not run if pythia_card not present')])        
                 
     def help_pgs(self):
         logger.info("syntax: pgs [RUN] [--run_options]")
         logger.info("-- run pgs on RUN (current one by default)")
         self.run_options_help([('-f','answer all question by default'),
-                               ('-tag=', 'define the tag for the pgs run'),
+                               ('--tag=', 'define the tag for the pgs run'),
                                ('--no_default', 'not run if pgs_card not present')]) 
 
     def help_delphes(self):
         logger.info("syntax: delphes [RUN] [--run_options]")
         logger.info("-- run delphes on RUN (current one by default)")
         self.run_options_help([('-f','answer all question by default'),
-                               ('-tag=', 'define the tag for the delphes run'),
+                               ('--tag=', 'define the tag for the delphes run'),
                                ('--no_default', 'not run if delphes_card not present')]) 
        
 #===============================================================================
@@ -792,7 +792,7 @@
                 args.append('-f')
 
         if len(tmp_args) == 0:
-            self.help_clean()
+            self.help_remove()
             raise self.InvalidCmd('clean command require the name of the run to clean')
         elif len(tmp_args) == 1:
             return tmp_args[0], tag, ['all']
@@ -1216,8 +1216,8 @@
         
     def complete_pythia(self,text, line, begidx, endidx):
         "Complete the pythia command"
-        
         args = self.split_arg(line[0:begidx], error=False)
+
         if len(args) == 1:
             #return valid run_name
             data = glob.glob(pjoin(self.me_dir, 'Events', '*','unweighted_events.lhe.gz'))
@@ -1229,7 +1229,7 @@
                 tmp2 = self.list_completion(text, self._run_options + ['-f', 
                                                 '--no_default', '--tag='], line)
                 return tmp1 + tmp2
-        else:
+        elif line[-1] != '=':
             return self.list_completion(text, self._run_options + ['-f', 
                                                  '--no_default','--tag='], line)
 
@@ -1728,6 +1728,34 @@
             self.exec_cmd('pythia --no_default', postcmd=False, printcmd=False)
             # pythia launches pgs/delphes if needed
             self.store_result()
+            self.print_results_in_shell(self.results.current)
+            
+            
+    def print_results_in_shell(self, data):
+        """Have a nice results prints in the shell,
+        data should be of type: gen_crossxhtml.OneTagResults"""
+
+        logger.info("  === Results Summary for run: %s tag: %s ===\n" % (data['run_name'],data['tag']))
+        if self.ninitial == 1:
+            logger.info("     Width :   %.4g +- %.4g GeV" % (data['cross'], data['error']))
+        else:
+            logger.info("     Cross-section :   %.4g +- %.4g pb" % (data['cross'], data['error']))
+        logger.info("     Nb of events :  %s" % data['nb_event'] )
+        if data['cross_pythia']:
+            error = data.get_pythia_error(data['cross'], data['error'], 
+                                        data['cross_pythia'], data['nb_event'])
+            nb_event = 0
+            if data['cross']:
+                nb_event = int(0.5+(data['nb_event'] * data['cross_pythia'] /data['cross']))
+            
+            if self.ninitial == 1:
+                logger.info("     Matched Width :   %.4g +- %.4g GeV" % (data['cross_pythia'], error))
+            else:
+                logger.info("     Matched Cross-section :   %.4g +- %.4g pb" % (data['cross'], error))            
+            logger.info("     Nb of events after Matching :  %s" % nb_event)
+        logger.info(" " )
+        
+            
     
     ############################################################################      
     def do_calculate_decay_widths(self, line):
@@ -1921,6 +1949,7 @@
                                   (pjoin(self.me_dir, 'Events'), self.run_name))
 
         self.update_status('', level='parton')
+        self.print_results_in_shell(self.results.current)   
         self.results.def_current(None)
             
     ############################################################################      
@@ -2413,10 +2442,19 @@
         if tag:
             to_suppress = [f for f in to_suppress if tag in f]
             if 'parton' in mode or 'all' in mode:
-                if os.path.exists(pjoin(self.me_dir, 'Events', run, 'events.lhe.gz')):
-                    to_suppress.append('events.lhe.gz')
-                if os.path.exists(pjoin(self.me_dir, 'Events', run, 'unweighted_events.lhe.gz')):
-                    to_suppress.append('unweighted_events.lhe.gz')
+                try:
+                    if self.results[run][0]['tag'] != tag:
+                        raise Exception, 'dummy'
+                except:
+                    pass
+                else:
+                    nb_rm = len(to_suppress)
+                    if os.path.exists(pjoin(self.me_dir, 'Events', run, 'events.lhe.gz')):
+                        to_suppress.append('events.lhe.gz')
+                    if os.path.exists(pjoin(self.me_dir, 'Events', run, 'unweighted_events.lhe.gz')):
+                        to_suppress.append('unweighted_events.lhe.gz')
+                    if nb_rm != len(to_suppress):
+                        logger.warning('Be carefull that partonic information are on the point to be removed.')
         if 'all' in mode:
             pass # suppress everything
         else:
@@ -2454,21 +2492,27 @@
 
         # Remove file in SubProcess directory
         if 'all' in mode or 'channel' in mode:
-            to_suppress = glob.glob(pjoin(self.me_dir, 'SubProcesses', '%s*' % run))
-            to_suppress += glob.glob(pjoin(self.me_dir, 'SubProcesses', '*','%s*' % run))
-            to_suppress += glob.glob(pjoin(self.me_dir, 'SubProcesses', '*','*','%s*' % run))
-
-            if '-f' in args or len(to_suppress) == 0:
-                ans = 'y'
+            try:
+                if self.results[run][0]['tag'] != tag:
+                    raise Exception, 'dummy'
+            except:
+                pass
             else:
-                question = 'Do you want to suppress the following files?\n     %s' % \
+                to_suppress = glob.glob(pjoin(self.me_dir, 'SubProcesses', '%s*' % run))
+                to_suppress += glob.glob(pjoin(self.me_dir, 'SubProcesses', '*','%s*' % run))
+                to_suppress += glob.glob(pjoin(self.me_dir, 'SubProcesses', '*','*','%s*' % run))
+
+                if '-f' in args or len(to_suppress) == 0:
+                    ans = 'y'
+                else:
+                    question = 'Do you want to suppress the following files?\n     %s' % \
                                '\n    '.join(to_suppress)
-                ans = self.ask(question, 'y', choices=['y','n'], timeout = self.timeout)
-
-            if ans == 'y':
-                for file2rm in to_suppress:
-                    os.remove(file2rm)
-
+                    ans = self.ask(question, 'y', choices=['y','n'], timeout = self.timeout)
+
+                if ans == 'y':
+                    for file2rm in to_suppress:
+                        os.remove(file2rm)
+                        
         if 'banner' in mode:
             to_suppress = glob.glob(pjoin(self.me_dir, 'Events', run, '*'))
             if tag:
@@ -3084,8 +3128,14 @@
             new_tag = True
         elif not self.run_name in self.results and level =='parton':
             pass # No results yet, so current tag is fine
+        elif not self.run_name in self.results:
+            #This is only for case when you want to trick the interface
+            logger.warning('Trying to run data on unknown run.')
+            self.results.add_run(name, self.run_card)
+            self.results.update('add run %s' % name, 'all', makehtml=False)
         else:
             for tag in upgrade_tag[level]:
+                
                 if getattr(self.results[self.run_name][-1], tag):
                     # LEVEL is already define in the last tag -> need to switch tag
                     tag = self.get_available_tag()
@@ -3380,8 +3430,9 @@
                 
             if mode.isdigit():
                 mode = name[mode]
-                
+            auto = False
             if mode == 'auto':
+                auto = True
                 if not os.path.exists(pjoin(self.me_dir, 'Cards', 'pythia_card.dat')):
                     mode = 'parton'
                 elif os.path.exists(pjoin(self.me_dir, 'Cards', 'pgs_card.dat')):
@@ -3391,22 +3442,24 @@
                 else: 
                     mode = 'pythia'
         logger.info('Will run in mode %s' % mode)
-            
-        # Clean the pointless card
-        if mode == 'parton':
-            if os.path.exists(pjoin(self.me_dir,'Cards','pythia_card.dat')):
-                os.remove(pjoin(self.me_dir,'Cards','pythia_card.dat'))
-            if os.path.exists(pjoin(self.me_dir,'Cards','pgs_card.dat')):
-                os.remove(pjoin(self.me_dir,'Cards','pgs_card.dat'))
-            if os.path.exists(pjoin(self.me_dir,'Cards','delphes_card.dat')):
-                os.remove(pjoin(self.me_dir,'Cards','delphes_card.dat'))
-        elif mode == 'pgs':
-            if os.path.exists(pjoin(self.me_dir,'Cards','delphes_card.dat')):
-                os.remove(pjoin(self.me_dir,'Cards','delphes_card.dat'))
-        elif mode == 'delphes':
-            if os.path.exists(pjoin(self.me_dir,'Cards','pgs_card.dat')):
-                os.remove(pjoin(self.me_dir,'Cards','pgs_card.dat'))                                         
-          
+        
+        def clean_pointless_card(mode):
+            """ Clean the pointless card """
+            if mode == 'parton':
+                if os.path.exists(pjoin(self.me_dir,'Cards','pythia_card.dat')):
+                    os.remove(pjoin(self.me_dir,'Cards','pythia_card.dat'))
+                if os.path.exists(pjoin(self.me_dir,'Cards','pgs_card.dat')):
+                    os.remove(pjoin(self.me_dir,'Cards','pgs_card.dat'))
+                if os.path.exists(pjoin(self.me_dir,'Cards','delphes_card.dat')):
+                    os.remove(pjoin(self.me_dir,'Cards','delphes_card.dat'))
+            elif mode == 'pgs':
+                if os.path.exists(pjoin(self.me_dir,'Cards','delphes_card.dat')):
+                    os.remove(pjoin(self.me_dir,'Cards','delphes_card.dat'))
+            elif mode == 'delphes':
+                if os.path.exists(pjoin(self.me_dir,'Cards','pgs_card.dat')):
+                    os.remove(pjoin(self.me_dir,'Cards','pgs_card.dat'))
+                                                             
+        clean_pointless_card(mode)
         # Now that we know in which mode we are check that all the card
         #exists (copy default if needed)
 
@@ -3424,39 +3477,42 @@
         if force:
             return
 
-        # Ask the user if he wants to edit any of the files
-        #First create the asking text
-        question = """Do you want to edit one cards (press enter to bypass editing)?
+        def get_question(mode):
+            # Ask the user if he wants to edit any of the files
+            #First create the asking text
+            question = """Do you want to edit one cards (press enter to bypass editing)?
   1 / param   : param_card.dat (be carefull about parameter consistency, especially widths)
   2 / run     : run_card.dat\n"""
-        possible_answer = ['0','done', 1, 'param', 2, 'run']
-        if mode in ['pythia', 'pgs', 'delphes']:
-            question += '  3 / pythia  : pythia_card.dat\n'
-            possible_answer.append(3)
-            possible_answer.append('pythia')
-        if mode == 'pgs':
-            question += '  4 / pgs     : pgs_card.dat\n'
-            possible_answer.append(4)
-            possible_answer.append('pgs')            
-        elif mode == 'delphes':
-            question += '  5 / delphes : delphes_card.dat\n'
-            question += '  6 / trigger : delphes_trigger.dat\n'
-            possible_answer.append(5)
-            possible_answer.append('delphes')
-            possible_answer.append(6)
-            possible_answer.append('trigger')
-        if self.configuration['madanalysis_path']:
-            question += '  9 / plot    : plot_card.dat\n'
-            possible_answer.append(9)
-            possible_answer.append('plot')
-        card = {0:'done', 1:'param', 2:'run', 3:'pythia', 
-                  4: 'pgs', 5: 'delphes', 6:'trigger',9:'plot'}
-        # Add the path options
-        question += '  Path to a valid card.\n'
-     
+            possible_answer = ['0','done', 1, 'param', 2, 'run']
+            if mode in ['pythia', 'pgs', 'delphes']:
+                question += '  3 / pythia  : pythia_card.dat\n'
+                possible_answer.append(3)
+                possible_answer.append('pythia')
+            if mode == 'pgs':
+                question += '  4 / pgs     : pgs_card.dat\n'
+                possible_answer.append(4)
+                possible_answer.append('pgs')            
+            elif mode == 'delphes':
+                question += '  5 / delphes : delphes_card.dat\n'
+                question += '  6 / trigger : delphes_trigger.dat\n'
+                possible_answer.append(5)
+                possible_answer.append('delphes')
+                possible_answer.append(6)
+                possible_answer.append('trigger')
+            if self.configuration['madanalysis_path']:
+                question += '  9 / plot    : plot_card.dat\n'
+                possible_answer.append(9)
+                possible_answer.append('plot')
+            card = {0:'done', 1:'param', 2:'run', 3:'pythia', 
+                      4: 'pgs', 5: 'delphes', 6:'trigger',9:'plot'}
+            # Add the path options
+            question += '  Path to a valid card.\n'
+            return question, possible_answer, card
+        
         # Loop as long as the user is not done.
         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')
             if answer.isdigit():
                 answer = card[int(answer)]
@@ -3472,10 +3528,23 @@
                     card_name = self.ask('Fail to determine the type of the file. Please specify the format',
                    ['param_card.dat', 'run_card.dat','pythia_card.dat','pgs_card.dat',
                     'delphes_card.dat', 'delphes_trigger.dat','plot_card.dat'])
-
-                logger.info('copy %s as %s' % (answer, card_name))
-                files.cp(answer, pjoin(self.me_dir, 'Cards', card_name))
-
+                elif card_name != 'banner':
+                    logger.info('copy %s as %s' % (answer, card_name))
+                    files.cp(answer, pjoin(self.me_dir, 'Cards', card_name))
+                elif card_name == 'banner':
+                    banner_mod.split_banner(answer, self.me_dir, proc_card=False)
+                    logger.info('Splitting the banner in it\'s component')
+                    if auto:
+                        # Re-compute the current mode
+                        mode = 'parton'
+                        for level in ['delphes','pgs','pythia']:
+                            if os.path.exists(pjoin(self.me_dir,'Cards','%s_card.dat' % level)):
+                                mode = level
+                                break
+                    else:
+                        clean_pointless_card(mode)
+                    
+                    
     ############################################################################
     def ask_pythia_run_configuration(self, mode=None, force=False):
         """Ask the question when launching pythia"""
@@ -3677,25 +3746,27 @@
         """
         
         text = open(path).read()
-        if '<MGVersion>' in text:
+        text = re.findall('(<MGVersion>|CEN_max_tracker|#TRIGGER CARD|parameter set name|muon eta coverage|MSTP|MSTU|Begin Minpts|gridpack|ebeam1|BLOCK|DECAY)', text, re.I)
+        text = [t.lower() for t in text]
+        if '<mgversion>' in text:
             return 'banner'
-        if 'CEN_max_tracker' in text:
+        elif 'cen_max_tracker' in text:
             return 'delphes_card.dat'
-        elif '#TRIGGER CARD' in text:
+        elif '#trigger card' in text:
             return 'delphes_trigger.dat'
         elif 'parameter set name' in text:
             return 'pgs_card.dat'
         elif 'muon eta coverage' in text:
             return 'pgs_card.dat'
-        elif 'MSTP' in text:
+        elif 'mstp' in text:
             return 'pythia_card.dat'
-        elif 'MSTU' in text:
+        elif 'mstu' in text:
             return 'pythia_param_card.dat'
-        elif 'Begin Minpts' in text:
+        elif 'begin minpts' in text:
             return 'plot_card.dat'
         elif 'gridpack' in text and 'ebeam1' in text:
             return 'run_card.dat'
-        elif 'BLOCK' in text.upper() and 'DECAY' in text.upper(): 
+        elif 'block' in text and 'decay' in text: 
             return 'param_card.dat'
         else:
             return 'unknown'

=== modified file 'madgraph/iolibs/template_files/madevent_combine_events.f'
--- madgraph/iolibs/template_files/madevent_combine_events.f	2011-10-14 05:15:02 +0000
+++ madgraph/iolibs/template_files/madevent_combine_events.f	2012-02-16 19:14:18 +0000
@@ -48,7 +48,7 @@
       character*30 param_card_name
       common/to_param_card_name/param_card_name
 
-      character*140 buff
+      character*300 buff
 
       data iseed/-1/
 c-----
@@ -100,7 +100,7 @@
       I4 = 4
       R8 = 8
       record_length = 4*I4+maxexternal*I4*7+maxexternal*5*R8+3*R8+
-     &   140
+     &   300
 C $B$ scratch_name $B$ !this is tag for automatic modification by MW
       filename='scratch'
 C $E$ scratch_name $E$ !this is tag for automatic modification by MW
@@ -541,7 +541,7 @@
       double precision scale,aqcd,aqed,tmpsum
       integer ievent,iseed
       logical done,found
-      character*140 buff
+      character*300 buff
       character*300 fullname
 c
 c     Les Houches init block (for the <init> info)

=== modified file 'madgraph/various/banner.py'
--- madgraph/various/banner.py	2012-01-05 20:56:14 +0000
+++ madgraph/various/banner.py	2012-02-16 19:14:18 +0000
@@ -41,10 +41,10 @@
         
         #Look at the version
         if MADEVENT:
-            self['MGVERSION'] = '#%s\n' % open(pjoin(MEDIR, 'MGMEVersion.txt')).read()
+            self['mgversion'] = '#%s\n' % open(pjoin(MEDIR, 'MGMEVersion.txt')).read()
         else:
             info = misc.get_pkg_info()
-            self['MGVERSION'] = info['version']+'\n'
+            self['mgversion'] = info['version']+'\n'
             
         if banner_path:
             self.read_banner(banner_path)
@@ -56,13 +56,13 @@
     pat_end=re.compile('</(?P<name>\w*)>')
 
     tag_to_file={'slha':'param_card.dat',
-      'MGRunCard':'run_card.dat',
-      'MGPythiaCard':'pythia_card.dat',
-      'MGPGSCard' : 'pgs_card.dat',
-      'MGDelphesCard':'delphes_card.dat',      
-      'MGDelphesTrigger':'delphes_trigger.dat',
-      'MG5ProcCard':'proc_card_mg5.dat',
-      'MGProcCard': 'proc_card.dat',
+      'mgruncard':'run_card.dat',
+      'mgpythiacard':'pythia_card.dat',
+      'mgpgscard' : 'pgs_card.dat',
+      'mgdelphescard':'delphes_card.dat',      
+      'mgdelphestrigger':'delphes_trigger.dat',
+      'mg5proccard':'proc_card_mg5.dat',
+      'mgproccard': 'proc_card.dat',
       }
     
     def read_banner(self, input_path):
@@ -74,12 +74,12 @@
             if store:
                 text += line
             if self.pat_begin.search(line):
-                tag = self.pat_begin.search(line).group('name')
+                tag = self.pat_begin.search(line).group('name').lower()
                 if tag in self.tag_to_file:
                     store = True
                     continue
             if store and self.pat_end.search(line):
-                if tag == self.pat_end.search(line).group('name'):
+                if tag == self.pat_end.search(line).group('name').lower():
                     self[tag] = text
                     text = ''
                     store = False
@@ -105,9 +105,9 @@
         information"""
 
         for tag, text in self.items():
-            if tag == 'MGVERSION':
+            if tag == 'mgversion':
                 continue
-            if not proc_card and tag in ['MG5ProcCard','MGProcCard']:
+            if not proc_card and tag in ['mg5proccard','mgproccard']:
                 continue
             ff = open(pjoin(me_dir, 'Cards', self.tag_to_file[tag]), 'w')
             ff.write(text)
@@ -158,7 +158,7 @@
             else:
                 raise Exception, 'Impossible to know the type of the card'
 
-            self[tag] = open(path).read()
+            self[tag.lower()] = open(path).read()
 
 
 
@@ -191,10 +191,10 @@
     
     
     if level == 'pythia':
-        if 'MGPythiaCard' in banner:
-            del banner['MGPythiaCard']
+        if 'mgpythiacard' in banner:
+            del banner['mgpythiacard']
     if level in ['pythia','pgs','delphes']:
-        for tag in ['MGPGSCard', 'MGDelphesCard', 'MGDelphesTrigger']:
+        for tag in ['mgpgscard', 'mgdelphescard', 'mgdelphestrigger']:
             if tag in banner:
                 del banner[tag]
     return banner

=== modified file 'madgraph/various/gen_crossxhtml.py'
--- madgraph/various/gen_crossxhtml.py	2012-02-07 00:09:26 +0000
+++ madgraph/various/gen_crossxhtml.py	2012-02-16 19:14:18 +0000
@@ -236,6 +236,7 @@
                     self.current.update_status()
                 else:
                     self.current.update_status(nolevel='parton')
+        self.output()
                     
     def clean(self, levels = ['all'], run=None, tag=None):
         """clean the run for the levels"""
@@ -446,11 +447,11 @@
         output = {}
         current = self[-1]
         # Check that cross/nb_event/error are define
-        if current.pythia and not current['nb_event']:
+        if current.pythia and not current['nb_event'] and len(self) > 1:
             output['nb_event'] = self[-2]['nb_event']
             output['cross'] = self[-2]['cross']
             output['error'] = self[-2]['error']
-        elif (current.pgs or current.delphes) and not current['nb_event']:
+        elif (current.pgs or current.delphes) and not current['nb_event'] and len(self) > 1:
             if self[-2]['cross_pythia']:
                 output['cross'] = self[-2]['cross_pythia']
                 output['nb_event'] = int(0.5+(self[-2]['nb_event'] * current['cross'] /self[-2]['cross']))                           
@@ -617,7 +618,7 @@
         
         id = '%s_%s_%s_%s' % (self['run_name'],self['tag'], level, name)
         
-        return " <a  id='%(id)s' href='%(link)s' onClick=\"check_link('%(link)s.gz','%(link)s','%(id)s')\">%(name)s</a>" \
+        return " <a  id='%(id)s' href='%(link)s.gz' onClick=\"check_link('%(link)s.gz','%(link)s','%(id)s')\">%(name)s</a>" \
               % {'link': link, 'id': id, 'name':name}
     
     def double_link(self, link1, link2, name, id):

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2012-02-06 19:57:04 +0000
+++ models/import_ufo.py	2012-02-16 19:14:18 +0000
@@ -218,6 +218,9 @@
                    [p.antiname.lower() for p in self.ufomodel.all_particles])):
             self.use_lower_part_names = True
 
+        # check which of the fermion/anti-fermion should be set as incoming
+        self.detect_incoming_fermion()
+
         for particle_info in self.ufomodel.all_particles:            
             self.add_particle(particle_info)
 
@@ -268,9 +271,10 @@
         
         # MG5 have only one entry for particle and anti particles.
         #UFO has two. use the color to avoid duplictions
-        if particle_info.pdg_code < 0:
+        pdg = particle_info.pdg_code
+        if pdg in self.incoming or (pdg not in self.outcoming and pdg <0):
             return
-        
+                        
         # MG5 doesn't use ghost (use unitary gauges)
         if particle_info.spin < 0:
             return 
@@ -369,7 +373,24 @@
                 output[anticolor.pdg_code] = -3
         
         return output
-
+    
+    def detect_incoming_fermion(self):
+        """define which fermion should be incoming
+           for that we look at F F~ X interactions
+        """
+        self.incoming = [] 
+        self.outcoming = []       
+        for interaction_info in self.ufomodel.all_vertices:
+            # check if the interation meet requirements:
+            pdg = [p.pdg_code for p in interaction_info.particles if p.spin==2]
+            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'
+                    elif not pdg[i] in self.incoming:
+                        self.incoming.append(pdg[i])
+                        self.outcoming.append(pdg[i+1])
+                     
             
     def add_interaction(self, interaction_info, color_info):
         """add an interaction in the MG5 model. interaction_info is the 

=== modified file 'tests/acceptance_tests/test_cmd.py'
--- tests/acceptance_tests/test_cmd.py	2012-02-04 19:53:54 +0000
+++ tests/acceptance_tests/test_cmd.py	2012-02-16 19:14:18 +0000
@@ -20,7 +20,7 @@
 import sys
 import logging
 
-
+pjoin = os.path.join
 
 logger = logging.getLogger('test_cmd')
 
@@ -1083,3 +1083,16 @@
         self.assertTrue(me_groups)
         self.assertAlmostEqual(float(me_groups.group('value')), 1.953735e-2)
         
+    def test_import_banner_command(self):
+        """check that the import banner command works"""
+        self.do('import banner %s --no_launch' % pjoin(MG5DIR, 'tests', 'input_files', 'tt_banner.txt'))
+        
+        # check that the output exists:
+        self.assertTrue(os.path.exists(self.out_dir))
+        
+        # check that the Cards have been modified
+        run_card = open(pjoin(self.out_dir,'Cards','run_card.dat')).read()
+        self.assertTrue("'tt'     = run_tag" in run_card)
+        self.assertTrue("200       = nevents" in run_card)
+        
+        

=== added file 'tests/input_files/tt_banner.txt'
--- tests/input_files/tt_banner.txt	1970-01-01 00:00:00 +0000
+++ tests/input_files/tt_banner.txt	2012-02-16 19:14:18 +0000
@@ -0,0 +1,390 @@
+<LesHouchesEvents version="1.0">
+<header>
+<!--
+#*********************************************************************
+#                                                                    *
+#                            MadGraph 5                              *
+#                                                                    *
+#                           Going Beyond                             *
+#                                                                    *
+#                   http://madgraph.hep.uiuc.edu                     *
+#                   http://madgraph.phys.ucl.ac.be                   *
+#                   http://madgraph.roma2.infn.it                    *
+#                                                                    *
+#                         The MadGraph team                          *
+#                                                                    *
+#....................................................................*
+#                                                                    *
+# This file contains all the information necessary to reproduce      *
+# the events generated:                                              *
+#                                                                    *
+# 1. software version                                                *
+# 2. proc_card          : code generation info including model       *
+# 3. param_card         : model primary parameters in the LH format  *
+# 4. run_card           : running parameters (collider and cuts)     *
+# 5. pythia_card        : present only if pythia has been run        *
+# 6. pgs_card           : present only if pgs has been run           *
+# 7. delphes_cards      : present only if delphes has been run       *
+#                                                                    *
+#                                                                    *
+#*********************************************************************
+-->
+<slha>
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY MG5 FOLLOWING UFO MODEL   ####
+######################################################################
+
+###################################
+## INFORMATION FOR MASS
+###################################
+Block mass 
+    5 4.700000e+00 # MB 
+    6 1.730000e+02 # MT 
+   15 1.777000e+00 # MTA 
+   23 9.118800e+01 # MZ 
+   25 1.200000e+02 # MH 
+##  Not dependent paramater.
+## Those values should be edited following the 
+## analytical expression. MG5 ignore those values 
+## but they are important for interfacing the output of MG5
+## to external program such as Pythia.
+  12 0.000000 # ve : 0.0 
+  14 0.000000 # vm : 0.0 
+  16 0.000000 # vt : 0.0 
+  2 0.000000 # u : 0.0 
+  4 0.000000 # c : 0.0 
+  1 0.000000 # d : 0.0 
+  3 0.000000 # s : 0.0 
+  22 0.000000 # a : 0.0 
+  24 80.419002 # w+ : cmath.sqrt(MZ__exp__2/2. + cmath.sqrt(MZ__exp__4/4. - (aEW*cmath.pi*MZ__exp__2)/(Gf*sqrt__2))) 
+  21 0.000000 # g : 0.0 
+  11 0.000000 # e- : 0.0 
+  13 0.000000 # mu- : 0.0 
+
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block sminputs 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
+## INFORMATION FOR YUKAWA
+###################################
+Block yukawa 
+    5 4.200000e+00 # ymb 
+    6 1.645000e+02 # ymt 
+   15 1.777000e+00 # ymtau 
+
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY   6 1.491500e+00 # WT 
+DECAY  23 2.441404e+00 # WZ 
+DECAY  24 2.047600e+00 # WW 
+DECAY  25 5.753088e-03 # WH 
+##  Not dependent paramater.
+## Those values should be edited following the 
+## analytical expression. MG5 ignore those values 
+## but they are important for interfacing the output of MG5
+## to external program such as Pythia.
+DECAY  12 0.000000 # ve : 0.0 
+DECAY  14 0.000000 # vm : 0.0 
+DECAY  16 0.000000 # vt : 0.0 
+DECAY  2 0.000000 # u : 0.0 
+DECAY  4 0.000000 # c : 0.0 
+DECAY  1 0.000000 # d : 0.0 
+DECAY  3 0.000000 # s : 0.0 
+DECAY  5 0.000000 # b : 0.0 
+DECAY  22 0.000000 # a : 0.0 
+DECAY  21 0.000000 # g : 0.0 
+DECAY  11 0.000000 # e- : 0.0 
+DECAY  13 0.000000 # mu- : 0.0 
+DECAY  15 0.000000 # ta- : 0.0 
+
+</slha>
+<MGProcCard>
+#*********************************************************************
+#                        MadGraph/MadEvent                           *
+#                   http://madgraph.hep.uiuc.edu                     *
+#                                                                    *
+#                          proc_card.dat                             *
+#*********************************************************************
+#                                                                    *
+#            This Files is generated by MADGRAPH 5                   *
+#                                                                    *
+# WARNING: This Files is generated for MADEVENT (compatibility issue)*
+#          This files is NOT a valid MG4 proc_card.dat               *
+#          Running this in MG4 will NEVER reproduce the result of MG5*
+#                                                                    *
+#*********************************************************************
+#*********************************************************************
+# Process(es) requested : mg2 input                                  *
+#*********************************************************************
+# Begin PROCESS # This is TAG. Do not modify this line
+p p > t t~ @1           #Process
+# Be carefull the coupling are here in MG5 convention
+          
+end_coup           # End the couplings input
+
+done               # this tells MG there are no more procs
+# End PROCESS  # This is TAG. Do not modify this line
+#*********************************************************************
+# Model information                                                  *
+#*********************************************************************
+# Begin MODEL  # This is TAG. Do not modify this line
+sm
+# End   MODEL  # This is TAG. Do not modify this line
+#*********************************************************************
+# Start multiparticle definitions                                    *
+#*********************************************************************
+# Begin MULTIPARTICLES # This is TAG. Do not modify this line
+
+# End  MULTIPARTICLES # This is TAG. Do not modify this line
+
+</MGProcCard>
+<MGRunCard>
+#*********************************************************************
+#                       MadGraph/MadEvent                            *
+#                  http://madgraph.hep.uiuc.edu                      *
+#                                                                    *
+#                        run_card.dat                                *
+#                                                                    *
+#  This file is used to set the parameters of the run.               *
+#                                                                    *
+#  Some notation/conventions:                                        *
+#                                                                    *
+#   Lines starting with a '# ' are info or comments                  *
+#                                                                    *
+#   mind the format:   value    = variable     ! comment             *
+#*********************************************************************
+#
+#*******************                                                 
+# Running parameters
+#*******************                                                 
+#                                                                    
+#*********************************************************************
+# Tag name for the run (one word)                                    *
+#*********************************************************************
+  'tt'     = run_tag ! name of the run 
+#*********************************************************************
+# Run to generate the grid pack                                      *
+#*********************************************************************
+  .false.     = gridpack  !True = setting up the grid pack
+#*********************************************************************
+# Number of events and rnd seed                                      *
+#*********************************************************************
+    200       = nevents ! Number of unweighted events requested 
+      0       = iseed   ! rnd seed (0=assigned automatically=default))
+#*********************************************************************
+# Collider type and energy                                           *
+#*********************************************************************
+        1     = lpp1  ! beam 1 type (0=NO PDF)
+        1     = lpp2  ! beam 2 type (0=NO PDF)
+     3500     = ebeam1  ! beam 1 energy in GeV
+     3500     = ebeam2  ! beam 2 energy in GeV
+#*********************************************************************
+# Beam polarization from -100 (left-handed) to 100 (right-handed)    *
+#*********************************************************************
+        0     = polbeam1 ! beam polarization for beam 1
+        0     = polbeam2 ! beam polarization for beam 2
+#*********************************************************************
+# PDF CHOICE: this automatically fixes also alpha_s and its evol.    *
+#*********************************************************************
+ 'cteq6l1'    = pdlabel     ! PDF set                                     
+#*********************************************************************
+# Renormalization and factorization scales                           *
+#*********************************************************************
+ F        = fixed_ren_scale  ! if .true. use fixed ren scale
+ F        = fixed_fac_scale  ! if .true. use fixed fac scale
+ 91.1880  = scale            ! fixed ren scale
+ 91.1880  = dsqrt_q2fact1    ! fixed fact scale for pdf1
+ 91.1880  = dsqrt_q2fact2    ! fixed fact scale for pdf2
+ 1        = scalefact        ! scale factor for event-by-event scales
+#*********************************************************************
+# Matching - Warning! ickkw > 0 is still beta
+#*********************************************************************
+ 1        = ickkw            ! 0 no matching, 1 MLM, 2 CKKW matching
+ 1        = highestmult      ! for ickkw=2, highest mult group
+ 1        = ktscheme         ! for ickkw=1, 1 Durham kT, 2 Pythia pTE
+ 1        = alpsfact         ! scale factor for QCD emission vx
+ F        = chcluster        ! cluster only according to channel diag
+ F        = pdfwgt           ! for ickkw=1, perform pdf reweighting
+#*********************************************************************
+#                                                                    
+#**********************************
+# BW cutoff (M+/-bwcutoff*Gamma)
+#**********************************
+  15  = bwcutoff !
+
+  F  = cut_decays ! Apply decays to products
+#*******************                                                 
+# Standard Cuts
+#*******************                                                 
+#                                                                    
+#*********************************************************************
+# Minimum and maximum pt's                                           *
+#*********************************************************************
+ 20  = ptj       ! minimum pt for the jets 
+ 20  = ptb       ! minimum pt for the b 
+  0  = pta       ! minimum pt for the photons 
+  0  = ptl       ! minimum pt for the charged leptons 
+  0  = misset    ! minimum missing Et (sum of neutrino's momenta)
+  0  = ptheavy   ! minimum pt for one heavy final state
+ 1d5 = ptjmax    ! maximum pt for the jets
+ 1d5 = ptbmax    ! maximum pt for the b
+ 1d5 = ptamax    ! maximum pt for the photons
+ 1d5 = ptlmax    ! maximum pt for the charged leptons
+ 1d5 = missetmax ! maximum missing Et (sum of neutrino's momenta)
+#*********************************************************************
+# Minimum and maximum E's (in the lab frame)                         *
+#*********************************************************************
+  0  = ej     ! minimum E for the jets 
+  0  = eb     ! minimum E for the b 
+  0  = ea     ! minimum E for the photons 
+  0  = el     ! minimum E for the charged leptons 
+ 1d5  = ejmax ! maximum E for the jets
+ 1d5  = ebmax ! maximum E for the b
+ 1d5  = eamax ! maximum E for the photons
+ 1d5  = elmax ! maximum E for the charged leptons
+#*********************************************************************
+# Maximum and minimum rapidity                                       *
+#*********************************************************************
+ 5d0  = etaj    ! max rap for the jets 
+ 5d0  = etab    ! max rap for the b 
+ 2d5  = etaa    ! max rap for the photons 
+ 2d5  = etal    ! max rap for the charged leptons 
+ 0d0  = etajmin ! min rap for the jets
+ 0d0  = etabmin ! min rap for the b
+ 0d0  = etaamin ! min rap for the photons
+ 0d0  = etalmin ! main rap for the charged leptons
+#*********************************************************************
+# Minimum and maximum DeltaR distance                                *
+#*********************************************************************
+ 0.001 = drjj    ! min distance between jets 
+ 0.001   = drbb    ! min distance between b's 
+ 0   = drll    ! min distance between leptons 
+ 0   = draa    ! min distance between gammas 
+ 0.001   = drbj    ! min distance between b and jet 
+ 0   = draj    ! min distance between gamma and jet 
+ 0   = drjl    ! min distance between jet and lepton 
+ 0   = drab    ! min distance between gamma and b 
+ 0   = drbl    ! min distance between b and lepton 
+ 0   = dral    ! min distance between gamma and lepton 
+ 1d2 = drjjmax ! max distance between jets
+ 1d2 = drbbmax ! max distance between b's
+ 1d2 = drllmax ! max distance between leptons
+ 1d2 = draamax ! max distance between gammas
+ 1d2 = drbjmax ! max distance between b and jet
+ 1d2 = drajmax ! max distance between gamma and jet
+ 1d2 = drjlmax ! max distance between jet and lepton
+ 1d2 = drabmax ! max distance between gamma and b
+ 1d2 = drblmax ! max distance between b and lepton
+ 1d2 = dralmax ! maxdistance between gamma and lepton
+#*********************************************************************
+# Minimum and maximum invariant mass for pairs                       *
+#*********************************************************************
+ 0   = mmjj    ! min invariant mass of a jet pair 
+ 0   = mmbb    ! min invariant mass of a b pair 
+ 0   = mmaa    ! min invariant mass of gamma gamma pair
+ 0   = mmll    ! min invariant mass of l+l- (same flavour) lepton pair
+ 1d5 = mmjjmax ! max invariant mass of a jet pair
+ 1d5 = mmbbmax ! max invariant mass of a b pair
+ 1d5 = mmaamax ! max invariant mass of gamma gamma pair
+ 1d5 = mmllmax ! max invariant mass of l+l- (same flavour) lepton pair
+#*********************************************************************
+# Minimum and maximum invariant mass for all letpons                 *
+#*********************************************************************
+ 0   = mmnl    ! min invariant mass for all letpons (l+- and vl) 
+ 1d5 = mmnlmax ! max invariant mass for all letpons (l+- and vl) 
+#*********************************************************************
+# Inclusive cuts                                                     *
+#*********************************************************************
+ 0  = xptj ! minimum pt for at least one jet  
+ 0  = xptb ! minimum pt for at least one b 
+ 0  = xpta ! minimum pt for at least one photon 
+ 0  = xptl ! minimum pt for at least one charged lepton 
+#*********************************************************************
+# Control the pt's of the jets sorted by pt                          *
+#*********************************************************************
+ 0   = ptj1min ! minimum pt for the leading jet in pt
+ 0   = ptj2min ! minimum pt for the second jet in pt
+ 0   = ptj3min ! minimum pt for the third jet in pt
+ 0   = ptj4min ! minimum pt for the fourth jet in pt
+ 1d5 = ptj1max ! maximum pt for the leading jet in pt 
+ 1d5 = ptj2max ! maximum pt for the second jet in pt
+ 1d5 = ptj3max ! maximum pt for the third jet in pt
+ 1d5 = ptj4max ! maximum pt for the fourth jet in pt
+ 0   = cutuse  ! reject event if fails any (0) / all (1) jet pt cuts
+#*********************************************************************
+# Control the Ht(k)=Sum of k leading jets                            *
+#*********************************************************************
+ 0   = htjmin ! minimum jet HT=Sum(jet pt)
+ 1d5 = htjmax ! maximum jet HT=Sum(jet pt)
+ 0   = ht2min ! minimum Ht for the two leading jets
+ 0   = ht3min ! minimum Ht for the three leading jets
+ 0   = ht4min ! minimum Ht for the four leading jets
+ 1d5 = ht2max ! maximum Ht for the two leading jets
+ 1d5 = ht3max ! maximum Ht for the three leading jets
+ 1d5 = ht4max ! maximum Ht for the four leading jets
+#*********************************************************************
+# WBF cuts                                                           *
+#*********************************************************************
+ 0   = xetamin ! minimum rapidity for two jets in the WBF case  
+ 0   = deltaeta ! minimum rapidity for two jets in the WBF case 
+#*********************************************************************
+# maximal pdg code for quark to be considered as a jet               *
+# otherwise b cuts are applied                                       *
+#*********************************************************************
+ 5 = maxjetflavor ! Apply b cuts
+#*********************************************************************
+# Jet measure cuts                                                   *
+#*********************************************************************
+ 0   = xqcut   ! minimum kt jet measure between partons
+#*********************************************************************
+
+</MGRunCard>
+<MGVERSION>
+#5.1.4.2
+
+</MGVERSION>
+<MG5ProcCard>
+#************************************************************
+#*                        MadGraph 5                        *
+#*                                                          *
+#*                *                       *                 *
+#*                  *        * *        *                   *
+#*                    * * * * 5 * * * *                     *
+#*                  *        * *        *                   *
+#*                *                       *                 *
+#*                                                          *
+#*                                                          *
+#*         VERSION 1.4.2                 2012-02-08         *
+#*                                                          *
+#*    The MadGraph Development Team - Please visit us at    *
+#*    https://server06.fynu.ucl.ac.be/projects/madgraph     *
+#*                                                          *
+#************************************************************
+#*                                                          *
+#*               Command File for MadGraph 5                *
+#*                                                          *
+#*     run as ./bin/mg5  filename                           *
+#*                                                          *
+#************************************************************
+
+import model sm
+# Define multiparticle labels
+define p = g u c d s u~ c~ d~ s~
+define j = g u c d s u~ c~ d~ s~
+define l+ = e+ mu+
+define l- = e- mu-
+define vl = ve vm vt
+define vl~ = ve~ vm~ vt~
+# Specify process(es) to run
+generate p p > t t~ @1
+# Output processes to MadEvent directory
+output AUTO_TEST_MG5 -f
+
+</MG5ProcCard>
+</LesHouchesEvents>