Merge lp:~maddevelopers/mg5amcnlo/plugin_mode into lp:~maddevelopers/mg5amcnlo/2.5.0

[Olivier Mattelaer]

Hi Guys,

Just changing the target branch for this branch to 2.5.0.

For information I would like to have a freeze version of 2.5.0 the first week of September.
Such that we can play with it for a couple of weeks before releasing it a bit later.
So it would be great if we can move forward on this review (was proposed 2 month ago...)

If you do not want to review this, please abstain.

Cheers,

Olivier

Previous information on the merge request:

This is deep branch which only need to be merged in the next feature release (2.5.0 with collier/PY8)
I propose this for the next bug fixing release (2.4.3) just such that we can move forward on this review.

The changes are pretty simple but at the same time pretty deep.
This version has a new directory PLUGIN where the user can put code to modify the behavior of the code (mainly LO so far).

Three types of plugin can be created:
1) code adding/modifying command to the interface [need to run MG5aMC with ./bin/mg5_aMC --mode=PLUGINNAME]
   This is a mode which is going to be used by maddm for example

2) code defining one (or more) new output mode.
   This is a mode which is used by the MoMenta code (a C++ version of MadWeight develloped in CP3)
   This mode does not need any special command.
   just the usual "output MODE PATH" [where MODE correspond to one of the keyword defined in the plugin]

3) code defining a new/modifying the cluster support
   (just set cluster_type NAME)

So Nothing deep in term of functionality, but it required to re-factorise part of the code in order to have a uniform way to handle the various output mode that we are supporting internally so far.

The details on how to create one of those plugin are available here:
https://cp3.irmp.ucl.ac.be/projects/madgraph/wiki/Plugin

Cheers,

Olivier

PS: Valentin if you want to open such plugin idea to MadLoop. This is of course possible.

[Rikkert Frederix (frederix)]

Hi Olivier,

I don't think I'm the right person for this review.
I've got a question, though. There seems to be many little changes in vendor/IREGI and vendor/Cuttools. Why? It doesn't seem related to this branch.

Best,
Rikkert

review: Abstain

[Olivier Mattelaer (olivier-mattelaer)]

Hi Rik,

> I've got a question, though. There seems to be many little changes in vendor/IREGI and vendor/Cuttools. Why? It doesn’t seem related to this branch.

This branch also contains the latest version of 2.4.3 which are missing in 2.5.0.
This should explain those differences (I never touch expel. Valentin can you cross-check those differences?

Cheers,

Olivier

> On Aug 8, 2016, at 08:39, Rikkert Frederix <email address hidden> wrote:
>
> Review: Abstain
>
> Hi Olivier,
>
> I don't think I'm the right person for this review.
> I've got a question, though. There seems to be many little changes in vendor/IREGI and vendor/Cuttools. Why? It doesn't seem related to this branch.
>
> Best,
> Rikkert
>
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/plugin_mode/+merge/302218
> Your team MadDevelopers is subscribed to branch lp:~maddevelopers/mg5amcnlo/2.5.0.

[lp:~maddevelopers/mg5amcnlo/plugin_mode]

432. By Valentin Hirschi on 2016-08-15

1. Restored the correct version of CutTools and IREGI which links against
   their own version of OneLOop with a dedicated namespace.

433. By Olivier Mattelaer on 2016-08-17

fix a problem with the computation of the dependent parameter in presence of scan/width computation

434. By Olivier Mattelaer on 2016-08-17

merge with branch question_for_reduction_tools_installation

435. By Olivier Mattelaer on 2016-08-18

re-allow the Auto in the reweight_card

[Valentin Hirschi (valentin-hirschi)]

Hi Olivier,

This is a great functionality, especially for the longer term! And if people use it and if there is a clear case for it, we will/should do this as well for NLO/MadLoop indeed.

I tried the examples and it seems to works fine. I would have to develop my own real non-trivial plugin to unravel potential problems, so I only have the following superficial remarks here:

a) For the interface plugin it would be cool if the prompt reflected which plugin the user is in (actually the prompt could be an attribute of the plugin, and if absent it is by default its name).
Maybe also mention on the wiki that people can define their own functions 'complete_<command_name>' and 'help_<command_name>' as well as putting them in the example helloworld.

b) For the output plugin, it would be nice if the user could also redefine what 'launch' does. For now the plugin user simply cannot launch on his own output.

c) I has already tested the cluster type of plugin with my implementation for the SLAC-lsf one, and you had fixed what I had noticed as not working, so this should be fine now.

d) Suggestion: It would be interesting to see if you could also automatically "install" a plugin from a repository somewhere.
So basically implement the command 'install --plugin=<plugin_name>' in madgraph_interface.
This command would look up the repository if the folder '<plugin_name>' exists on the repo and copy it locally in PLUGIN if it does.

e) You should maybe update the wiki page so as to describe the basic plugin 'user_filter.py'.

From the code standpoint, here are my also superficial remarks:

1) Out of curiosity, why was 'using namespace std' not OK for the C++ output?

2) What is the new 'partial_save' of the MG5aMC options?

3) Could we have the plugin user_filter also work for the loops? I can help with this.

If I were to check more detailed things in the code, I'd rather do it live on skype as it is more efficient this way.

Anyway, none of the above is crucial and the unit tests pass (acceptance running now, but so far they're fine).

I therefore accept the merge.

[Valentin Hirschi (valentin-hirschi)]

Approved

review: Approve

[Sébastien Wertz (sebastien-wertz)]

> I tried the examples and it seems to works fine. I would have to develop my
> own real non-trivial plugin to unravel potential problems, so I only have the
> following superficial remarks here:

> 1) Out of curiosity, why was 'using namespace std' not OK for the C++ output?

Hi Valentin,

If you want to check a "non-trivial" plugin, you can always try out the C++ one we've written for the MEM: https://github.com/MoMEMta/MoMEMta-MaGMEE. You won't be able to compile the resulting code without installing our framework, but the plugin output works nonetheless.

Regarding the 'using namespace' statements in C++, it's a problem if they are used in header files: any code directly or indirectly including those headers will get polluted by the namespace, which can cause collisions. Those statements should always only be included in non-header files.

Cheers,
Sébastien

[Olivier Mattelaer (olivier-mattelaer)]

Thanks a lot for this review

> a) For the interface plugin it would be cool if the prompt reflected which
> plugin the user is in (actually the prompt could be an attribute of the
> plugin, and if absent it is by default its name).

sounds too complicated.

> Maybe also mention on the wiki that people can define their own functions
> 'complete_<command_name>' and 'help_<command_name>' as well as putting them in
> the example helloworld.

Done

> b) For the output plugin, it would be nice if the user could also redefine
> what 'launch' does. For now the plugin user simply cannot launch on his own
> output.

Hum for the moment, I would see that as part of the interface plugin.
I also guess that they are less interest since the idea is typically to run externally to MGaMC

> d) Suggestion: It would be interesting to see if you could also automatically
> "install" a plugin from a repository somewhere.
> So basically implement the command 'install --plugin=<plugin_name>' in
> madgraph_interface.
> This command would look up the repository if the folder '<plugin_name>' exists
> on the repo and copy it locally in PLUGIN if it does.

I agree on the interest. So far no one really show interest in that direction.
If this happens then yes this can be done.

> e) You should maybe update the wiki page so as to describe the basic plugin
> 'user_filter.py'.

This is not really a plugin.
I have create another page for it (under the FAQ of the wiki)
https://cp3.irmp.ucl.ac.be/projects/madgraph/wiki/FAQ-General-15

> 2) What is the new 'partial_save' of the MG5aMC options?

Now you can do command like
save options collier
and only collier value will be modified in the mg5_configuration.txt

> 3) Could we have the plugin user_filter also work for the loops? I can help
> with this.

This should be trivial.
But with the level of your loop_filter, I guess that you will want something more refined than my dummy method. If you need help tell me.

> Anyway, none of the above is crucial and the unit tests pass (acceptance
> running now, but so far they're fine).
>
> I therefore accept the merge.

Great thanks.

Cheers,

Olivier

PS: Marco do you plan to review this branch? If not I plan to merge it on Monday. I can obviously wait if you want to take a look.

=== added directory 'PLUGIN'
=== added file 'PLUGIN/__init__.py'
=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2016-08-01 10:08:21 +0000
+++ UpdateNotes.txt	2016-08-18 22:31:39 +0000
@@ -1,5 +1,20 @@
 Update notes for MadGraph5_aMC@NLO (in reverse time order)
 
+2.5.0
+       OM: Modify the structure of the output format such that all the internal format have the same structure
+       OM: Adding the Plugin directory. Three kind of plugin are currently supported
+           - plugin defining a new type of output format
+           - plugin defining a new type of cluster handling
+           - plugin modifying the main interface of MG5aMCnlo 
+           More informations/examples are available here:
+ 	   https://cp3.irmp.ucl.ac.be/projects/madgraph/wiki/Plugin
+       VH: adding the possibility to install COLLIER and to use it to reduce the loop-matrix element
+       OM+VH: At the first loop/NLO computation, a new question will now be asked to choose which program
+           to install to compute the loop. You can still install additional method later via the "install" command
+       OM: add an automatic update of the param_card to write the correct value for all dependent parameter.
+       OM: add the check that the param_card is compatible with the model restriction.
+       OM+VH: 
+     
 2.4.3 (01/08/16)
         OM: Reduce the amount of log file/output generated for LO run (output can use up to three times less output).
         OM: For the LO combination of events (unweighting) pass to the method previously used for loop-induced.

=== modified file 'VERSION'
--- VERSION	2016-08-01 10:08:21 +0000
+++ VERSION	2016-08-18 22:31:39 +0000
@@ -1,4 +1,4 @@
-version = 2.4.3
+version = 2.5.0.alpha
 date = 2016-08-01
 
 

=== modified file 'aloha/aloha_writers.py'
--- aloha/aloha_writers.py	2016-07-06 08:54:04 +0000
+++ aloha/aloha_writers.py	2016-08-18 22:31:39 +0000
@@ -468,10 +468,10 @@
                    'log': 'log(dble(%s))',
                    'asin': 'asin(dble(%s))',
                    'acos': 'acos(dble(%s))',
-                   'abs': 'abs(%s)',
-                   'fabs': 'abs(%s)',
-                   'math.abs': 'abs(%s)',
-                   'cmath.abs': 'abs(%s)',
+                   'abs': 'std::abs(%s)',
+                   'fabs': 'std::abs(%s)',
+                   'math.abs': 'std::abs(%s)',
+                   'cmath.abs': 'std::abs(%s)',
                    '':'(%s)'
                    }
             
@@ -1255,14 +1255,14 @@
     writer = writers.CPPWriter
 
     type2def = {}    
-    type2def['int'] = 'int'
+    type2def['int'] = 'int '
     type2def['double'] = 'double '
-    type2def['complex'] = 'complex<double> '
+    type2def['complex'] = 'std::complex<double> '
     
     #variable overwritten by gpu
     realoperator = '.real()'
     imagoperator = '.imag()'
-    ci_definition = ' complex<double> cI = complex<double>(0.,1.);\n'
+    ci_definition = 'static std::complex<double> cI = std::complex<double>(0.,1.);\n'
     
     
     def change_number_format(self, number):
@@ -1335,7 +1335,7 @@
                    'sqrt': 'sqrt(%s)',
                    'complexconjugate': 'conj(dcmplx(%s))',
                    '/' : '{0}/%s'.format(one),
-                   'abs': 'abs(%s)'
+                   'abs': 'std::abs(%s)'
                    }
             
         if fct in self.fct_format:
@@ -1375,10 +1375,10 @@
             args.append('%s%s%s'% (type, argname, list_arg))
                 
         if not self.offshell:
-            output = 'complex<double> & vertex'
+            output = 'std::complex<double> & vertex'
             #self.declaration.add(('complex','vertex'))
         else:
-            output = 'complex<double> %(spin)s%(id)d[]' % {
+            output = 'std::complex<double> %(spin)s%(id)d[]' % {
                      'spin': self.particles[self.outgoing -1],
                      'id': self.outgoing}
             self.declaration.add(('list_complex', output))
@@ -1450,7 +1450,7 @@
         
         for i,type in enumerate(self.particles):
             if self.declaration.is_used('OM%s' % (i+1)):
-                out.write("    OM{0} = {1};\n    if (M{0} != {1})\n OM{0}={2}/pow(M{0},2);\n".format( 
+                out.write("    OM{0} = {1};\n    if (M{0} != {1})\n OM{0}={2}/(M{0}*M{0});\n".format( 
                          i+1, self.change_number_format(0), self.change_number_format(1)))
             
             if i+1 == self.outgoing:
@@ -1551,13 +1551,13 @@
                         out.write('    denom = %(COUP)s/(%(denom)s)\n' % {'COUP': coup_name,\
                                 'denom':self.write_obj(self.routine.denominator)}) 
                     else:
-                        out.write('    denom = %(coup)s/(pow(P%(i)s[0],2)-pow(P%(i)s[1],2)-pow(P%(i)s[2],2)-pow(P%(i)s[3],2) - M%(i)s * (M%(i)s -cI* W%(i)s));\n' % \
+                        out.write('    denom = %(coup)s/((P%(i)s[0]*P%(i)s[0])-(P%(i)s[1]*P%(i)s[1])-(P%(i)s[2]*P%(i)s[2])-(P%(i)s[3]*P%(i)s[3]) - M%(i)s * (M%(i)s -cI* W%(i)s));\n' % \
                       {'i': self.outgoing, 'coup': coup_name})
                 else:
                     if self.routine.denominator:
                         raise Exception, 'modify denominator are not compatible with complex mass scheme'                
 
-                    out.write('    denom = %(coup)s/(pow(P%(i)s[0],2)-pow(P%(i)s[1],2)-pow(P%(i)s[2],2)-pow(P%(i)s[3],2) - pow(M%(i)s,2));\n' % \
+                    out.write('    denom = %(coup)s/((P%(i)s[0]*P%(i)s[0])-(P%(i)s[1]*P%(i)s[1])-(P%(i)s[2]*P%(i)s[2])-(P%(i)s[3]*P%(i)s[3]) - (M%(i)s*M%(i)s));\n' % \
                       {'i': self.outgoing, 'coup': coup_name})
                 self.declaration.add(('complex','denom'))
                 if aloha.loop_mode:
@@ -1574,7 +1574,7 @@
                                         self.write_obj(numerator.get_rep(ind))))
         return out.getvalue()
         
-    remove_double = re.compile('complex<double> (?P<name>[\w]+)\[\]')
+    remove_double = re.compile('std::complex<double> (?P<name>[\w]+)\[\]')
     def define_symmetry(self, new_nb, couplings=None):
         """Write the call for symmetric routines"""
         number = self.offshell
@@ -1594,8 +1594,7 @@
         if not self.mode == 'no_include':
             h_string.write('#ifndef '+ self.name + '_guard\n')
             h_string.write('#define ' + self.name + '_guard\n')
-            h_string.write('#include <complex>\n')
-            h_string.write('using namespace std;\n\n')
+            h_string.write('#include <complex>\n\n')
 
         h_header = self.get_header_txt(mode='no_include__is_h', couplings=couplings)
         h_string.write(h_header)

=== modified file 'aloha/template_files/ixxxxx.cc'
--- aloha/template_files/ixxxxx.cc	2012-06-13 16:40:13 +0000
+++ aloha/template_files/ixxxxx.cc	2016-08-18 22:31:39 +0000
@@ -10,9 +10,9 @@
   fi[1] = complex<double> (-p[1]*nsf,-p[2]*nsf);
   nh = nhel*nsf;
   if (fmass != 0.0) { 
-    pp = min(p[0],pow((pow(p[1],2)+pow(p[2],2)+pow(p[3],2)),0.5));
+    pp = min(p[0],sqrt(p[1]*p[1]+p[2]*p[2]+p[3]*p[3]));
     if (pp == 0.0){ 
-      sqm[0] = pow(abs(fmass),0.5); 
+      sqm[0] = sqrt(std::abs(fmass)); 
       sqm[1] = Sgn(sqm[0],fmass);
       ip = (1+nh)/2;
       im = (1-nh)/2;
@@ -24,19 +24,19 @@
     else{
       sf[0] = (1+nsf+(1-nsf)*nh)*0.5;
       sf[1] = (1+nsf-(1-nsf)*nh)*0.5;
-      omega[0] = pow(p[0]+pp,0.5);
+      omega[0] = sqrt(p[0]+pp);
       omega[1] = fmass/omega[0];
       ip = (1+nh)/2;
       im = (1-nh)/2;
       sfomega[0] = sf[0]*omega[ip];
       sfomega[1] = sf[1]*omega[im];
       pp3 = max(pp+p[3], 0.0);
-      chi[0] = complex<double>(pow(pp3*0.5/pp,0.5),0);
+      chi[0] = complex<double>(sqrt(pp3*0.5/pp),0);
       if (pp3 == 0.0){
         chi[1] = complex<double> (-nh,0);
       }
       else{
-        chi[1] = complex<double> (nh*p[1],p[2])/pow(2.0*pp*pp3,0.5);
+        chi[1] = complex<double> (nh*p[1],p[2])/sqrt(2.0*pp*pp3);
       }
       fi[2] = sfomega[0]*chi[im];
       fi[3] = sfomega[0]*chi[ip];
@@ -49,10 +49,10 @@
       sqp0p3 = 0.0;
     }
     else{
-    sqp0p3 = pow(max(p[0]+p[3],0.0),0.5)*nsf;}
+    sqp0p3 = sqrt(max(p[0]+p[3],0.0))*nsf;}
     chi[0] = complex<double>(sqp0p3,0.0);
     if (sqp0p3 ==0.0){
-      chi[1] = complex<double>(-nhel*pow(2.0*p[0],0.5),0.0);}
+      chi[1] = complex<double>(-nhel*sqrt(2.0*p[0]),0.0);}
     else{
       chi[1] = complex<double>(nh*p[1],p[2])/sqp0p3;}
     if (nh == 1) {

=== modified file 'aloha/template_files/oxxxxx.cc'
--- aloha/template_files/oxxxxx.cc	2013-06-06 13:29:17 +0000
+++ aloha/template_files/oxxxxx.cc	2016-08-18 22:31:39 +0000
@@ -10,34 +10,34 @@
   fo[1] = complex<double>(p[1]*nsf,p[2]*nsf);
   nh = nhel*nsf;
   if (fmass != 0.000){
-    pp = min(p[0],pow(pow(p[1],2)+pow(p[2],2)+pow(p[3],2),0.5));
+    pp = min(p[0],sqrt((p[1]*p[1])+(p[2]*p[2])+(p[3]*p[3])));
     if (pp == 0.000){
-      sqm[0] = pow(abs(fmass),0.5);
+      sqm[0] = sqrt(std::abs(fmass));
       sqm[1] = Sgn(sqm[0],fmass); 
       ip = -((1-nh)/2) * nhel ;
       im = (1+nh)/2 * nhel;
-      fo[2] = im *sqm[abs(ip)];
-      fo[3] = ip*nsf*sqm[abs(ip)];
-      fo[4] = im*nsf*sqm[abs(im)];
-      fo[5] = ip*sqm[abs(im)];
+      fo[2] = im *sqm[std::abs(ip)];
+      fo[3] = ip*nsf*sqm[std::abs(ip)];
+      fo[4] = im*nsf*sqm[std::abs(im)];
+      fo[5] = ip*sqm[std::abs(im)];
     }
     else{
-      pp = min(p[0],pow(pow(p[1],2)+pow(p[2],2)+pow(p[3],2),0.5));
+      pp = min(p[0],sqrt((p[1]*p[1])+(p[2]*p[2])+(p[3]*p[3])));
       sf[0] = double(1+nsf+(1-nsf)*nh)*0.5;
       sf[1] = double(1+nsf-(1-nsf)*nh)*0.5;
-      omega[0] = pow(p[0]+pp,0.5);
+      omega[0] = sqrt(p[0]+pp);
       omega[1] = fmass/omega[0];
       ip = (1+nh)/2 ;
       im = (1-nh)/2 ;
       sfomeg[0] = sf[0]*omega[ip];
       sfomeg[1] = sf[1]*omega[im];
       pp3 = max(pp+p[3],0.00);
-      chi[0] = complex<double>(pow(pp3*0.5/pp,0.5),0.00);
+      chi[0] = complex<double>(sqrt(pp3*0.5/pp),0.00);
       if (pp3 == 0.00){ 
 	chi[1] = complex<double>(-nh,0.00);
       }
       else{
-	chi[1] = complex<double>(nh*p[1],-p[2])/pow(2.0*pp*pp3,0.5);
+	chi[1] = complex<double>(nh*p[1],-p[2])/sqrt(2.0*pp*pp3);
       }
       fo[2] = sfomeg[1]*chi[im];
       fo[3] = sfomeg[1]*chi[ip];
@@ -50,11 +50,11 @@
       sqp0p3 = 0.00;
     }
     else{
-      sqp0p3 = pow(max(p[0]+p[3],0.00),0.5)*nsf;
+      sqp0p3 = sqrt(max(p[0]+p[3],0.00))*nsf;
     }
     chi[0] = complex<double>(sqp0p3,0.00);
     if(sqp0p3 == 0.000){ 
-      chi[1] = complex<double>(-nhel,0.00)*pow(2.0*p[0],0.5);
+      chi[1] = complex<double>(-nhel,0.00)*sqrt(2.0*p[0]);
     }
     else{
       chi[1] = complex<double>(nh*p[1],-p[2])/sqp0p3;

=== modified file 'aloha/template_files/txxxxx.cc'
--- aloha/template_files/txxxxx.cc	2013-05-07 06:35:39 +0000
+++ aloha/template_files/txxxxx.cc	2016-08-18 22:31:39 +0000
@@ -11,12 +11,12 @@
 	double pt, pt2, pp, pzpt, emp, sqh, sqs;
 	int i, j;
 	
-	sqh = pow( 0.5, 0.5 );
-	sqs = pow( 0.5/3, 0.5 );
+	sqh = sqrt( 0.5);
+	sqs = sqrt( 0.5/3);
 	
 	pt2 = p[1]*p[1] + p[2]*p[2];
-	pp = min( p[0], pow( pt2+p[3]*p[3], 0.5 ) );
-	pt = min( pp, pow( pt2, 0.5 ) );
+	pp = min( p[0], sqrt( pt2+p[3]*p[3]) );
+	pt = min( pp, sqrt( pt2) );
 	
 	ft[4][0] = complex<double>( p[0]*nst, p[3]*nst );
 	ft[5][0] = complex<double>( p[1]*nst, p[2]*nst );
@@ -81,7 +81,7 @@
 	}
 	
 	// construct eps0
-	if( fabs(nhel) <= 1 )
+	if( std::labs(nhel) <= 1 )
 	{
 		if( pp == 0 )
 		{

=== modified file 'aloha/template_files/vxxxxx.cc'
--- aloha/template_files/vxxxxx.cc	2012-06-13 16:40:13 +0000
+++ aloha/template_files/vxxxxx.cc	2016-08-18 22:31:39 +0000
@@ -5,16 +5,16 @@
 void vxxxxx(double p[4],double vmass,int nhel,int nsv, complex<double> vc[6]){
   double hel,hel0,pt,pt2,pp,pzpt,emp,sqh;
   int nsvahl;
-  sqh = pow(0.5,0.5);
+  sqh = sqrt(0.5);
   hel = double(nhel);
-  nsvahl = nsv*abs(hel);
-  pt2 = pow(p[1],2)+pow(p[2],2);
-  pp = min(p[0],pow(pt2+pow(p[3],2),0.5));
-  pt =min(pp,pow(pt2,0.5));
+  nsvahl = nsv*std::abs(hel);
+  pt2 = (p[1]*p[1])+(p[2]*p[2]);
+  pp = min(p[0],sqrt(pt2+(p[3]*p[3])));
+  pt =min(pp,sqrt(pt2));
   vc[0] = complex<double>(p[0]*nsv,p[3]*nsv);
   vc[1] = complex<double>(p[1]*nsv,p[2]*nsv);
   if (vmass != 0.0){
-    hel0 = 1.0-abs(hel);
+    hel0 = 1.0-std::abs(hel);
     if( pp == 0.0 ){ 
       vc[2] = complex<double>(0.0,0.0);
       vc[3] = complex<double>(-hel*sqh,0.0);
@@ -38,7 +38,7 @@
   }
   else{
     pp = p[0];
-    pt = pow(pow(p[1],2)+pow(p[2],2),0.5);
+    pt = sqrt((p[1]*p[1])+(p[2]*p[2]));
     vc[2] = complex<double>(0.0,0.0);
     vc[5] = complex<double>(hel*pt/pp*sqh,0.0);
     if (pt != 0.0) {

=== modified file 'bin/mg5_aMC'
--- bin/mg5_aMC	2016-03-03 16:31:52 +0000
+++ bin/mg5_aMC	2016-08-18 22:31:39 +0000
@@ -45,6 +45,9 @@
                  help='force to be in secure mode')
 parser.add_option("","--debug", action="store_true", default=False, dest='debug', \
                  help='force to launch debug mode')
+parser.add_option("-m", "--mode", dest="plugin",
+                  help="Define some additional command provide by a PLUGIN")
+                               
 (options, args) = parser.parse_args()
 if len(args) == 0:
     args = ''
@@ -119,6 +122,24 @@
     pass
 import madgraph.interface.master_interface as interface
 
+if options.plugin:
+    if not os.path.exists(os.path.join(root_path, 'PLUGIN', options.plugin)):
+        print "ERROR: %s is not present in the PLUGIN directory. Please install it first"
+    __import__('PLUGIN.%s' % options.plugin)
+    plugin = sys.modules['PLUGIN.%s' % options.plugin]
+    if not plugin.new_interface:
+        logging.warning("Plugin: %s do not define dedicated interface and should be used without the --mode options" % options.plugin)
+        sys.exit()
+    import madgraph.various.misc as misc
+    if not misc.is_plugin_supported(plugin):
+        sys.exit()
+    cmd_line = plugin.new_interface(mgme_dir = options.mgme_dir)
+    cmd_line.plugin=options.plugin
+elif options.web:
+    cmd_line = interface.MasterCmdWeb()
+else: 
+    cmd_line = interface.MasterCmd(mgme_dir = options.mgme_dir)
+
 # Call the cmd interface main loop
 try:
     if options.file or args:
@@ -128,14 +149,12 @@
         else:
             input_file = os.path.realpath(options.file)
         if options.web:
-            cmd_line = interface.MasterCmdWeb()
             cmd_line.debug_output = os.path.join(os.path.dirname(input_file),'generation.log')
             cmd_line.use_rawinput = False
             cmd_line.haspiping = False
             cmd_line.run_cmd('import ' + input_file)
             cmd_line.run_cmd('quit')
         else:
-            cmd_line = interface.MasterCmd(mgme_dir = options.mgme_dir)
             cmd_line.use_rawinput = False
             cmd_line.haspiping = False
             cmd_line.run_cmd('import ' + input_file)
@@ -147,10 +166,8 @@
                 os.environ['MADGRAPH_DATA'] = root_path
                 os.environ['MADGRAPH_BASE'] = os.path.join(root_path,'input')
                 os.environ['REMOTE_USER'] = 'webmode'
-            cmd_line = interface.MasterCmdWeb()
             cmd_line.cmdloop()
         else:
-            cmd_line = interface.MasterCmd(mgme_dir = options.mgme_dir)
             cmd_line.cmdloop()
 except KeyboardInterrupt:
     print 'writting history and quit on KeyboardInterrupt' 

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2016-08-14 00:17:23 +0000
+++ madgraph/core/base_objects.py	2016-08-18 22:31:39 +0000
@@ -1587,15 +1587,19 @@
         return [c for c in range(1, len(self.get('particles')) + 1) if \
                 c not in self.get('particle_dict').keys()][0]
                 
-    def write_param_card(self):
+    def write_param_card(self, filepath=None):
         """Write out the param_card, and return as string."""
         
         import models.write_param_card as writer
-        out = StringIO.StringIO() # it's suppose to be written in a file
-        param = writer.ParamCardWriter(self)
-        param.define_output_file(out)
-        param.write_card()
-        return out.getvalue()
+        if not filepath:
+            out = StringIO.StringIO() # it's suppose to be written in a file
+        else:
+            out = filepath
+        param = writer.ParamCardWriter(self, filepath=out)
+        if not filepath:
+            return out.getvalue()
+        else:
+            return param
         
     @ staticmethod
     def load_default_name():
@@ -3014,7 +3018,7 @@
         if self['constrained_orders']:
             mystr = mystr + " ".join('%s%s%d' % (key, 
               self['constrained_orders'][key][1], self['constrained_orders'][key][0]) 
-                    for (key,(value,type)) in sorted(self['constrained_orders'].keys()))  + ' '
+                    for key in sorted(self['constrained_orders'].keys()))  + ' '
 
         # Add perturbation_couplings
         if self['perturbation_couplings']:

=== modified file 'madgraph/core/diagram_generation.py'
--- madgraph/core/diagram_generation.py	2016-02-27 14:33:01 +0000
+++ madgraph/core/diagram_generation.py	2016-08-18 22:31:39 +0000
@@ -496,7 +496,7 @@
         
         return self.get('process').get('perturbation_couplings')
 
-    def generate_diagrams(self, returndiag=False):
+    def generate_diagrams(self, returndiag=False, diagram_filter=False):
         """Generate diagrams. Algorithm:
 
         1. Define interaction dictionaries:
@@ -792,6 +792,9 @@
         if not returndiag and len(res)>0:
             res = self.apply_squared_order_constraints(res)
 
+        if diagram_filter:
+            res = self.apply_user_filter(res)
+
         # Replace final id=0 vertex if necessary
         if not process.get('is_decay_chain'):
             for diagram in res:
@@ -884,6 +887,41 @@
 
         return res
 
+    def apply_user_filter(self, diag_list):
+        """Applies the user specified squared order constraints on the diagram
+        list in argument."""
+
+        if True:
+            try:
+                from PLUGIN.user_filter import remove_diag
+            except ImportError:
+                raise MadGraph5Error, 'user filter required to be defined in PLUGIN/user_filter.py with the function remove_diag(ONEDIAG) which returns True if the daigram has to be removed'
+        else:
+            #example and simple tests
+            def remove_diag(diag):
+                for vertex in diag['vertices']: #last 
+                    if vertex['id'] == 0: #special final vertex
+                        continue 
+                    if vertex['legs'][-1]['number'] < 3: #this means T-channel
+                        if abs(vertex['legs'][-1]['id']) <6:
+                            return True
+                return False                
+
+        res = diag_list.__class__()                
+        nb_removed = 0 
+        for diag in diag_list:
+            if remove_diag(diag):
+                nb_removed +=1
+            else:
+                res.append(diag)
+
+        if nb_removed:
+            logger.warning('Diagram filter is ON and removed %s diagrams for this subprocess.' % nb_removed)
+            
+        return res
+
+
+
     def create_diagram(self, vertexlist):
         """ Return a Diagram created from the vertex list. This function can be
             overloaded by daughter classes."""
@@ -1526,7 +1564,7 @@
         
     def __init__(self, argument=None, collect_mirror_procs = False,
                  ignore_six_quark_processes = [], optimize=False,
-                 loop_filter=None):
+                 loop_filter=None, diagram_filter=None):
         """Allow initialization with ProcessDefinition or
         ProcessDefinitionList
         optimize allows to use param_card information. (usefull for 1-.N)"""
@@ -1548,6 +1586,7 @@
         self['ignore_six_quark_processes'] = ignore_six_quark_processes
         self['use_numerical'] = optimize
         self['loop_filter'] = loop_filter
+        self['diagram_filter'] = diagram_filter # only True/False so far
         
         if isinstance(argument, base_objects.ProcessDefinition) or \
                isinstance(argument, base_objects.ProcessDefinitionList):
@@ -1598,7 +1637,8 @@
                                        self.get('collect_mirror_procs'),
                                        self.get('ignore_six_quark_processes'),
                                        self['use_numerical'],
-                                       loop_filter=self['loop_filter']))
+                                       loop_filter=self['loop_filter'],
+                                       diagram_filter=self['diagram_filter']))
 
         return MultiProcess.__bases__[0].get(self, name) # call the mother routine
 
@@ -1612,7 +1652,8 @@
                                   collect_mirror_procs = False,
                                   ignore_six_quark_processes = [],
                                   use_numerical=False,
-                                  loop_filter=None):
+                                  loop_filter=None,
+                                  diagram_filter=False):
         """Generate amplitudes in a semi-efficient way.
         Make use of crossing symmetry for processes that fail diagram
         generation, but not for processes that succeed diagram
@@ -1682,6 +1723,7 @@
                 sorted_legs = sorted([(l,i+1) for (i,l) in \
                                    enumerate(legs.get_outgoing_id_list(model))])
                 permutation = [l[1] for l in sorted_legs]
+                
                 sorted_legs = array.array('i', [l[0] for l in sorted_legs])
 
                 # Check for six-quark processes
@@ -1769,7 +1811,7 @@
                                                         loop_filter=loop_filter)
 
                 try:
-                    result = amplitude.generate_diagrams()
+                    result = amplitude.generate_diagrams(diagram_filter=diagram_filter)
                 except InvalidCmd as error:
                     failed_procs.append(sorted_legs)
                 else:

=== modified file 'madgraph/interface/amcatnlo_interface.py'
--- madgraph/interface/amcatnlo_interface.py	2016-05-24 09:52:16 +0000
+++ madgraph/interface/amcatnlo_interface.py	2016-08-18 22:31:39 +0000
@@ -45,9 +45,11 @@
 import madgraph.fks.fks_helas_objects as fks_helas
 import madgraph.iolibs.export_fks as export_fks
 import madgraph.iolibs.export_v4 as export_v4
+import madgraph.iolibs.helas_call_writers as helas_call_writers
 import madgraph.loop.loop_base_objects as loop_base_objects
 import madgraph.core.diagram_generation as diagram_generation
 import madgraph.core.helas_objects as helas_objects
+
 import madgraph.various.cluster as cluster
 import madgraph.various.misc as misc
 import madgraph.various.banner as banner_mod
@@ -261,7 +263,7 @@
             return self.list_completion(text, content)
 
 
-    def complete_launch(self, text, line, begidx, endidx):
+    def complete_launch(self, text, line, begidx, endidx, formatting=True):
         """ complete the launch command"""
         args = self.split_arg(line[0:begidx])
 
@@ -299,7 +301,7 @@
             out['Options'] = self.list_completion(text, opt, line)
         
 
-        return self.deal_multiple_categories(out)
+        return self.deal_multiple_categories(out, formatting)
 
 class HelpFKS(mg_interface.HelpToCmd):
 
@@ -562,6 +564,7 @@
     def export(self, nojpeg = False, main_file_name = "", group_processes=False):
         """Export a generated amplitude to file"""
 
+        self._curr_helas_model = helas_call_writers.FortranUFOHelasCallWriter(self._curr_model)
         def generate_matrix_elements(self, group=False):
             """Helper function to generate the matrix elements before
             exporting"""
@@ -659,14 +662,14 @@
                     #me is a FKSHelasProcessFromReals
                     calls = calls + \
                             self._curr_exporter.generate_directories_fks(me, 
-                            self._curr_fortran_model, 
+                            self._curr_helas_model, 
                             ime, len(self._curr_matrix_elements.get('matrix_elements')), 
                             path,self.options['OLP'])
                     self._fks_directories.extend(self._curr_exporter.fksdirs)
                     self.born_processes_for_olp.append(me.born_matrix_element.get('processes')[0])
                 else:
                     glob_directories_map.append(\
-                            [self._curr_exporter, me, self._curr_fortran_model, 
+                            [self._curr_exporter, me, self._curr_helas_model, 
                              ime, len(self._curr_matrix_elements.get('matrix_elements')), 
                              path, self.options['OLP']])
 

=== modified file 'madgraph/interface/amcatnlo_run_interface.py'
--- madgraph/interface/amcatnlo_run_interface.py	2016-07-02 20:34:59 +0000
+++ madgraph/interface/amcatnlo_run_interface.py	2016-08-18 22:31:39 +0000
@@ -87,7 +87,7 @@
     import madgraph.various.shower_card as shower_card
     import madgraph.various.FO_analyse_card as analyse_card
     import madgraph.various.histograms as histograms
-    from madgraph import InvalidCmd, aMCatNLOError, MadGraph5Error
+    from madgraph import InvalidCmd, aMCatNLOError, MadGraph5Error,MG5DIR
 
 class aMCatNLOError(Exception):
     pass
@@ -774,7 +774,7 @@
                 opts += opt._long_opts + opt._short_opts
             return self.list_completion(text, opts, line)
            
-    def complete_banner_run(self, text, line, begidx, endidx):
+    def complete_banner_run(self, text, line, begidx, endidx, formatting=True):
        "Complete the banner run command"
        try:
   
@@ -812,7 +812,7 @@
         run_list = [n.rsplit('/',2)[1] for n in run_list]
         possibilites['RUN Name'] = self.list_completion(text, run_list)
         
-        return self.deal_multiple_categories(possibilites)
+        return self.deal_multiple_categories(possibilites, formatting)
     
         
        except Exception, error:
@@ -1247,6 +1247,7 @@
             with misc.TMP_variable(self, 'allow_notification_center', False):
                 for i,card in enumerate(param_card_iterator):
                     card.write(pjoin(self.me_dir,'Cards','param_card.dat'))
+                    self.check_param_card(pjoin(self.me_dir,'Cards','param_card.dat'), dependent=True)
                     if not options['force']:
                         options['force'] = True
                     if options['run_name']:
@@ -2127,7 +2128,36 @@
         """setup the number of cores for multicore, and the cluster-type for cluster runs"""
         if self.cluster_mode == 1:
             cluster_name = self.options['cluster_type']
-            self.cluster = cluster.from_name[cluster_name](**self.options)
+            try:
+                self.cluster = cluster.from_name[cluster_name](**self.options)
+            except KeyError:
+                if aMCatNLO and ('mg5_path' not in self.options or not self.options['mg5_path']):
+                    raise self.InvalidCmd('%s not native cluster type and not MG5aMC found to check for plugin' % cluster_name)
+                elif aMCatNLO:
+                    mg5dir = self.options['mg5_path']
+                    if mg5dir not in sys.path:
+                        sys.path.append(mg5dir)
+                else:
+                    mg5dir = MG5DIR
+                # Check if a plugin define this type of cluster
+                # check for PLUGIN format
+                for plug in os.listdir(pjoin(mg5dir, 'PLUGIN')):
+                    if os.path.exists(pjoin(mg5dir, 'PLUGIN', plug, '__init__.py')):
+                        try:
+                            __import__('PLUGIN.%s' % plug)
+                        except Exception, error:
+                            logger.critical('plugin directory %s fail to be loaded. Please check it', plug)
+                            continue
+                        plugin = sys.modules['PLUGIN.%s' % plug]  
+                        if not hasattr(plugin, 'new_cluster'):
+                            continue
+                        if not misc.is_plugin_supported(plugin):
+                            continue              
+                        if cluster_name in plugin.new_cluster:
+                            logger.info("cluster handling will be done with PLUGIN: %s" % plug,'$MG:color:BLACK')
+                            self.cluster = plugin.new_cluster[cluster_name](**self.options)
+                            break
+        
         if self.cluster_mode == 2:
             try:
                 import multiprocessing

=== modified file 'madgraph/interface/common_run_interface.py'
--- madgraph/interface/common_run_interface.py	2016-07-29 15:27:30 +0000
+++ madgraph/interface/common_run_interface.py	2016-08-18 22:31:39 +0000
@@ -739,12 +739,25 @@
                     param = param_card['decay'].get((part.pdg_code,))
 
                     if  param.value != 0:
-                        logger.info('''For gauge cancellation, the width of \'%s\' has been set to zero.'''
+                        logger.info('''For gauge cancellation, the width of \'%s\' has been set to zero.'''\
                                     % part.name,'$MG:color:BLACK')
                         param.value = 0
 
             param_card.write_inc_file(outfile, ident_card, default)
 
+    def get_model(self):
+        """return the model related to this process"""
+
+        if self.options['mg5_path']:
+            sys.path.append(self.options['mg5_path'])
+            import models.import_ufo as import_ufo
+            with misc.MuteLogger(['madgraph.model'],[50]):
+                out= import_ufo.import_model(pjoin(self.me_dir,'bin','internal','ufomodel'))
+            return out
+        elif self.mother:
+            return self.mother._curr_model
+        else:
+            return None
 
     def ask_edit_cards(self, cards, mode='fixed', plot=True, first_cmd=None):
         """ """
@@ -1685,16 +1698,47 @@
         if self.cluster_mode == 1:
             opt = self.options
             cluster_name = opt['cluster_type']
-            self.cluster = cluster.from_name[cluster_name](**opt)
-
-
-    def check_param_card(self, path, run=True):
+            if cluster_name in cluster.from_name:
+                self.cluster = cluster.from_name[cluster_name](**opt)
+            else:
+                if MADEVENT and ('mg5_path' not in self.options or not self.options['mg5_path']):
+                    raise self.InvalidCmd('%s not native cluster type and not MG5aMC found to check for plugin')
+                elif MADEVENT:
+                    mg5dir = self.options['mg5_path']
+                    if mg5dir not in sys.path:
+                        sys.path.append(mg5dir)
+                else:
+                    mg5dir = MG5DIR
+                # Check if a plugin define this type of cluster
+                # check for PLUGIN format
+                for plug in os.listdir(pjoin(mg5dir, 'PLUGIN')):
+                    if os.path.exists(pjoin(mg5dir, 'PLUGIN', plug, '__init__.py')):
+                        try:
+                            __import__('PLUGIN.%s' % plug)
+                        except Exception, error:
+                            logger.critical('plugin directory %s fail to be loaded. Please check it', plug)
+                            continue
+                        plugin = sys.modules['PLUGIN.%s' % plug]  
+                        if not hasattr(plugin, 'new_cluster'):
+                            continue
+                        if not misc.is_plugin_supported(plugin):
+                            continue              
+                        if cluster_name in plugin.new_cluster:
+                            logger.info("cluster handling will be done with PLUGIN: %s" % plug,'$MG:color:BLACK')
+                            self.cluster = plugin.new_cluster[cluster_name](**opt)
+                            break
+                else:
+                    raise self.InvalidCmd, "%s is not recognized as a supported cluster format." % cluster_name
+                
+                
+    def check_param_card(self, path, run=True, dependent=False):
         """
         1) Check that no scan parameter are present
         2) Check that all the width are define in the param_card.
         - If a scan parameter is define. create the iterator and recall this fonction 
           on the first element.
-        - If some width are set on 'Auto', call the computation tools."""
+        - If some width are set on 'Auto', call the computation tools.
+        3) if dependent is on True check for dependent parameter (automatic for scan)"""
         
         pattern_scan = re.compile(r'''^(decay)?[\s\d]*scan''', re.I+re.M)  
         pattern_width = re.compile(r'''decay\s+(\+?\-?\d+)\s+auto(@NLO|)''',re.I)
@@ -1709,7 +1753,7 @@
             self.param_card_iterator = main_card
             first_card = main_card.next(autostart=True)
             first_card.write(path)
-            return self.check_param_card(path, run)
+            return self.check_param_card(path, run, dependent=True)
         
         pdg_info = pattern_width.findall(text)
         if pdg_info:
@@ -1720,13 +1764,18 @@
                 if not has_nlo:
                     self.do_compute_widths('%s %s' % (' '.join(pdg), path))
                 else:
-                    self.do_compute_widths('%s %s --nlo' % (' '.join(pdg), path))
+                    self.do_compute_widths('%s %s --nlo' % (' '.join(pdg), path)) 
             else:
                 logger.info('''Some width are on Auto in the card. 
     Those will be computed as soon as you have finish the edition of the cards.
     If you want to force the computation right now and being able to re-edit
     the cards afterwards, you can type \"compute_wdiths\".''')
-
+        
+        if dependent:   
+            card = check_param_card.ParamCard(path)
+            AskforEditCard.update_dependent(self, self.me_dir, card, path, timer=20)
+        
+        return
 
     def add_error_log_in_html(self, errortype=None):
         """If a ME run is currently running add a link in the html output"""
@@ -2138,7 +2187,7 @@
 
 
 
-    def complete_compute_widths(self, text, line, begidx, endidx):
+    def complete_compute_widths(self, text, line, begidx, endidx, formatting=True):
         "Complete the compute_widths command"
 
         args = self.split_arg(line[0:begidx])
@@ -2158,7 +2207,7 @@
                             ['--path=', '--output=', '--min_br=0.\$', '--nlo',
                              '--precision_channel=0.\$', '--body_decay='])            
         
-        return self.deal_multiple_categories(completion)
+        return self.deal_multiple_categories(completion, formatting)
         
 
     def update_make_opts(self):
@@ -2376,7 +2425,7 @@
             filename = pdf_info[filename]['filename']
         
         if os.path.exists(pjoin(pdfsets_dir, filename)):
-            logger.debug('%s is already present in %s', (filename, pdfsets_dir))
+            logger.debug('%s is already present in %s', filename, pdfsets_dir)
             return
              
         logger.info('Trying to download %s' % filename)
@@ -2530,38 +2579,76 @@
                         'fixed_scale': ['run_card fixed_fac_scale T', 'run_card fixed_ren_scale T', 'run_card scale %(0)s', 'run_card dsqrt_q2fact1 %(0)s' ,'run_card dsqrt_q2fact2 %(0)s'],
                         }
     
-    def __init__(self, question, cards=[], mode='auto', *args, **opt):
-
+    def load_default(self):
+        """ define all default variable. No load of card here.
+            This allow to subclass this class and just change init and still have
+            all variables defined."""
+    
+        self.me_dir = None
+        self.param_card = None
+        self.run_card = {}
+        self.pname2block = {}
+        self.conflict = []
+        self.restricted_value = {}
+        self.mode = ''
+        self.cards = [] 
+        self.run_set = []
+        self.has_mw = False
+        self.has_ml = False   
+        self.has_shower = False
+        self.paths = {}
+    
+    def define_paths(self, **opt):
+        
         # Initiation
         if 'pwd' in opt:
             self.me_dir = opt['pwd']
-            del opt['pwd']
-
-        cmd.OneLinePathCompletion.__init__(self, question, *args, **opt)
-
+        elif 'mother_interface' in opt:
+            self.mother_interface = opt['mother_interface']     
         if not hasattr(self, 'me_dir') or not self.me_dir:
             self.me_dir = self.mother_interface.me_dir
-
-        # read the card
+        
+        #define paths
+        self.paths['param'] = pjoin(self.me_dir,'Cards','param_card.dat')
+        self.paths['param_default'] = pjoin(self.me_dir,'Cards','param_card_default.dat')
+        self.paths['run'] = pjoin(self.me_dir,'Cards','run_card.dat')
+        self.paths['run_default'] = pjoin(self.me_dir,'Cards','run_card_default.dat')
+        self.paths['transfer'] =pjoin(self.me_dir,'Cards','transfer_card.dat')
+        self.paths['MadWeight'] =pjoin(self.me_dir,'Cards','MadWeight_card.dat')
+        self.paths['MadWeight_default'] =pjoin(self.me_dir,'Cards','MadWeight_card_default.dat')
+        self.paths['ML'] =pjoin(self.me_dir,'Cards','MadLoopParams.dat')
+        self.paths['shower'] = pjoin(self.me_dir,'Cards','shower_card.dat')
+        self.paths['shower_default'] = pjoin(self.me_dir,'Cards','shower_card_default.dat')
+        self.paths['pythia'] =pjoin(self.me_dir, 'Cards','pythia_card.dat')
+        self.paths['madspin_default'] = pjoin(self.me_dir,'Cards/madspin_card_default.dat')
+        self.paths['madspin'] = pjoin(self.me_dir,'Cards/madspin_card.dat')
+        self.paths['reweight'] = pjoin(self.me_dir,'Cards','reweight_card.dat')
+        self.paths['delphes'] = pjoin(self.me_dir,'Cards','delphes_card.dat')
+
+    def __init__(self, question, cards=[], mode='auto', *args, **opt):
+
+        self.load_default()        
+        self.define_paths(**opt)
+        cmd.OneLinePathCompletion.__init__(self, question, *args, **opt)
 
 
         try:
-            self.param_card = check_param_card.ParamCard(pjoin(self.me_dir,'Cards','param_card.dat'))
+            self.param_card = check_param_card.ParamCard(self.paths['param'])
         except (check_param_card.InvalidParamCard, ValueError) as e:
             logger.error('Current param_card is not valid. We are going to use the default one.')
             logger.error('problem detected: %s' % e)
             files.cp(pjoin(self.me_dir,'Cards','param_card_default.dat'),
                      pjoin(self.me_dir,'Cards','param_card.dat'))
-            self.param_card = check_param_card.ParamCard(pjoin(self.me_dir,'Cards','param_card.dat'))
-        default_param = check_param_card.ParamCard(pjoin(self.me_dir,'Cards','param_card_default.dat'))
+            self.param_card = check_param_card.ParamCard(self.paths['param'])
+        default_param = check_param_card.ParamCard(self.paths['param_default'])
         
         
         try:
-            self.run_card = banner_mod.RunCard(pjoin(self.me_dir,'Cards','run_card.dat'))
+            self.run_card = banner_mod.RunCard(self.paths['run'])
         except IOError:
             self.run_card = {}
         try:
-            run_card_def = banner_mod.RunCard(pjoin(self.me_dir,'Cards','run_card_default.dat'))
+            run_card_def = banner_mod.RunCard(self.paths['run_default'])
         except IOError:
             run_card_def = {}
 
@@ -2596,7 +2683,7 @@
             self.do_change_tf = self.mother_interface.do_define_transfer_fct
             self.complete_change_tf = self.mother_interface.complete_define_transfer_fct
             self.help_change_tf = self.mother_interface.help_define_transfer_fct
-            if not os.path.exists(pjoin(self.me_dir,'Cards','transfer_card.dat')):
+            if not os.path.exists(self.paths['transfer']):
                 logger.warning('No transfer function currently define. Please use the change_tf command to define one.')
             
             
@@ -2605,7 +2692,7 @@
                 import madgraph.madweight.Cards as mwcards
             except:
                 import internal.madweight.Cards as mwcards
-            self.mw_card = mwcards.Card(pjoin(self.me_dir,'Cards','MadWeight_card.dat'))
+            self.mw_card = mwcards.Card(self.paths['MadWeight'])
             self.mw_card = self.mw_card.info
             self.mw_vars = []
             for key in self.mw_card:
@@ -2625,9 +2712,9 @@
                     
         #check if MadLoopParams.dat is present:
         self.has_ml = False
-        if os.path.isfile(pjoin(self.me_dir,'Cards','MadLoopParams.dat')):
+        if os.path.isfile(self.paths['ML']):
             self.has_ml = True
-            self.MLcard = banner_mod.MadLoopParam(pjoin(self.me_dir,'Cards','MadLoopParams.dat'))
+            self.MLcard = banner_mod.MadLoopParam(self.paths['ML'])
             self.MLcardDefault = banner_mod.MadLoopParam()
             
             self.ml_vars = [k.lower() for k in self.MLcard.keys()]
@@ -2648,7 +2735,7 @@
                 import madgraph.various.shower_card as showercards
             except:
                 import internal.shower_card as showercards
-            self.shower_card = showercards.ShowerCard(pjoin(self.me_dir,'Cards','shower_card.dat'))
+            self.shower_card = showercards.ShowerCard(self.paths['shower'])
             self.shower_vars = self.shower_card.keys()
             
             # check for conflict with run_card/param_card
@@ -2660,7 +2747,7 @@
                     self.conflict.append(var)
 
 
-    def complete_set(self, text, line, begidx, endidx):
+    def complete_set(self, text, line, begidx, endidx, formatting=True):
         """ Complete the set command"""
 
         prev_timer = signal.alarm(0) # avoid timer if any
@@ -2838,7 +2925,7 @@
                         possibilities['Special value'] = self.list_completion(text, opts)
                 possibilities['MadWeight Card id' ] = self.list_completion(text, ids) 
 
-        return self.deal_multiple_categories(possibilities)
+        return self.deal_multiple_categories(possibilities, formatting)
 
     def do_set(self, line):
         """ edit the value of one parameter in the card"""
@@ -2893,7 +2980,7 @@
 
         # Special case for the qcut value
         if args[0].lower() == 'qcut':
-            pythia_path = pjoin(self.me_dir, 'Cards','pythia_card.dat')
+            pythia_path = self.paths['pythia']
             if os.path.exists(pythia_path):
                 logger.info('add line QCUT = %s in pythia_card.dat' % args[1])
                 p_card = open(pythia_path,'r').read()
@@ -2907,7 +2994,7 @@
                 return
         # Special case for the showerkt value
         if args[0].lower() == 'showerkt':
-            pythia_path = pjoin(self.me_dir, 'Cards','pythia_card.dat')
+            pythia_path = self.paths['pythia']
             if os.path.exists(pythia_path):
                 logger.info('add line SHOWERKT = %s in pythia_card.dat' % args[1].upper())
                 p_card = open(pythia_path,'r').read()
@@ -2943,14 +3030,13 @@
         if args[0] in ['run_card', 'param_card', 'MadWeight_card', 'shower_card']:
             if args[1] == 'default':
                 logging.info('replace %s by the default card' % args[0])
-                files.cp(pjoin(self.me_dir,'Cards','%s_default.dat' % args[0]),
-                        pjoin(self.me_dir,'Cards','%s.dat'% args[0]))
+                files.cp(self.paths['%s_default' %args[0][:-5]], self.paths[args[0][:-5]])
                 if args[0] == 'param_card':
-                    self.param_card = check_param_card.ParamCard(pjoin(self.me_dir,'Cards','param_card.dat'))
+                    self.param_card = check_param_card.ParamCard(self.paths['param'])
                 elif args[0] == 'run_card':
-                    self.run_card = banner_mod.RunCard(pjoin(self.me_dir,'Cards','run_card.dat'))
+                    self.run_card = banner_mod.RunCard(self.paths['run'])
                 elif args[0] == 'shower_card':
-                    self.shower_card = shower_card_mod.ShowerCard(pjoin(self.me_dir,'Cards','shower_card.dat'))
+                    self.shower_card = shower_card_mod.ShowerCard(self.paths['shower'])
                 return
             else:
                 card = args[0]
@@ -2963,7 +3049,7 @@
             if args[1] == 'default':
                 logging.info('replace MadLoopParams.dat by the default card')
                 self.MLcard = banner_mod.MadLoopParam(self.MLcardDefault)
-                self.MLcard.write(pjoin(self.me_dir,'Cards','MadLoopParams.dat'),
+                self.MLcard.write(self.paths['ML'],
                                   commentdefault=True)
                 return
             else:
@@ -2975,8 +3061,7 @@
         elif args[0] in ['madspin_card']:
             if args[1] == 'default':
                 logging.info('replace madspin_card.dat by the default card')
-                files.cp(pjoin(self.me_dir,'Cards/madspin_card_default.dat'),
-                         pjoin(self.me_dir,'Cards/madspin_card.dat'))
+                files.cp(self.paths['MS_default'], self.paths['madspin'])
                 return
             else:
                 logger.warning("""Command set not allowed for modifying the madspin_card. 
@@ -2995,7 +3080,7 @@
                 logger.warning(text)
 
             if args[start+1] == 'default':
-                default = banner_mod.RunCard(pjoin(self.me_dir,'Cards','run_card_default.dat'))
+                default = banner_mod.RunCard(self.paths['run_default'])
                 if args[start] in default.keys():
                     self.setR(args[start],default[args[start]])
                 else:
@@ -3011,8 +3096,7 @@
                     except NameError:
                         val = args[start+1]
                 self.setR(args[start], val)
-            self.run_card.write(pjoin(self.me_dir,'Cards','run_card.dat'),
-                                pjoin(self.me_dir,'Cards','run_card_default.dat'))
+            self.run_card.write(self.paths['run'], self.paths['run_default'])
             
         ### PARAM_CARD WITH BLOCK NAME -----------------------------------------
         elif (args[start] in self.param_card or args[start] == 'width') \
@@ -3052,7 +3136,7 @@
                                 continue
                             else:
                                 self.setP(args[start], key, args[-1])
-                        self.param_card.write(pjoin(self.me_dir,'Cards','param_card.dat'))
+                        self.param_card.write(self.paths['param'])
                         return
                     logger.warning('invalid set command %s (failed to identify LHA information)' % line)
                     return
@@ -3078,7 +3162,7 @@
             else:
                 logger.warning('invalid set command %s' % line)
                 return
-            self.param_card.write(pjoin(self.me_dir,'Cards','param_card.dat'))
+            self.param_card.write(self.paths['param'])
         
         # PARAM_CARD NO BLOCK NAME ---------------------------------------------
         elif args[start] in self.pname2block and card != 'run_card':
@@ -3113,7 +3197,7 @@
             name = args[start+1]
             value = args[start+2:]
             self.setM(block, name, value)
-            self.mw_card.write(pjoin(self.me_dir,'Cards','MadWeight_card.dat'))        
+            self.mw_card.write(self.paths['MadWeight'])        
         
         # MadWeight_card NO Block name -----------------------------------------
         elif self.has_mw and args[start] in self.mw_vars \
@@ -3135,7 +3219,7 @@
             name = args[start]
             value = args[start+1:]
             self.setM(block, name, value)
-            self.mw_card.write(pjoin(self.me_dir,'Cards','MadWeight_card.dat'))
+            self.mw_card.write(self.paths['MadWeight'])
              
         # MadWeight_card New Block ---------------------------------------------
         elif self.has_mw and args[start].startswith('mw_') and len(args[start:]) == 3\
@@ -3144,7 +3228,7 @@
             name = args[start+1]
             value = args[start+2]
             self.setM(block, name, value)
-            self.mw_card.write(pjoin(self.me_dir,'Cards','MadWeight_card.dat'))    
+            self.mw_card.write(self.paths['MadWeight'])    
 
         #### SHOWER CARD
         elif self.has_shower and args[start].lower() in [l.lower() for l in \
@@ -3159,19 +3243,19 @@
                 return
 
             if args[start+1].lower() == 'default':
-                default = shower_card_mod.ShowerCard(pjoin(self.me_dir,'Cards','shower_card_default.dat'))
+                default = shower_card_mod.ShowerCard(self.paths['shower_default'])
                 if args[start] in default.keys():
-                    self.shower_card.set_param(args[start],default[args[start]],pjoin(self.me_dir,'Cards','shower_card.dat'))
+                    self.shower_card.set_param(args[start],default[args[start]], self.paths['shower'])
                 else:
                     logger.info('remove information %s from the shower_card' % args[start])
                     del self.shower_card[args[start]]
             elif args[start+1].lower() in ['t','.true.','true']:
-                self.shower_card.set_param(args[start],'.true.',pjoin(self.me_dir,'Cards','shower_card.dat'))
+                self.shower_card.set_param(args[start],'.true.',self.paths['shower'])
             elif args[start+1].lower() in ['f','.false.','false']:
-                self.shower_card.set_param(args[start],'.false.',pjoin(self.me_dir,'Cards','shower_card.dat'))
+                self.shower_card.set_param(args[start],'.false.',self.paths['shower'])
             else:
                 args_str = ' '.join(str(a) for a in args[start+1:len(args)])
-                self.shower_card.set_param(args[start],args_str,pjoin(self.me_dir,'Cards','shower_card.dat'))
+                self.shower_card.set_param(args[start],args_str,self.paths['shower'])
      
         # MadLoop Parameter  ---------------------------------------------------
         elif self.has_ml and args[start] in self.ml_vars \
@@ -3189,7 +3273,7 @@
                 value = args[start+1]
                 default = False
             self.setML(args[start], value, default=default)
-            self.MLcard.write(pjoin(self.me_dir,'Cards','MadLoopParams.dat'),
+            self.MLcard.write(self.paths['ML'],
                               commentdefault=True)
                 
         #INVALID --------------------------------------------------------------
@@ -3209,7 +3293,7 @@
             logger.info('name %s was not present in the block %s for the current MadWeight card. We are adding it' % (name,block),'$MG:color:BLACK')
         if value == 'default':
             import madgraph.madweight.Cards as mwcards
-            mw_default = mwcards.Card(pjoin(self.me_dir,'Cards','MadWeight_card_default.dat'))
+            mw_default = mwcards.Card(self.paths['MadWeight_default'])
             try:
                 value = mw_default[block][name]
             except KeyError:
@@ -3227,7 +3311,7 @@
         self.mw_card[block][name] = value
     
     def setR(self, name, value):
-        logger.info('modify parameter %s of the run_card.dat to %s' % (name, value))
+        logger.info('modify parameter %s of the run_card.dat to %s' % (name, value),'$MG:color:BLACK')
         self.run_card.set(name, value, user=True)
 
     def setML(self, name, value, default=False):
@@ -3237,7 +3321,7 @@
         except Exception, error:
             logger.warning("Fail to change parameter. Please Retry. Reason: %s." % error)
             return
-        logger.info('modify parameter %s of the MadLoopParam.dat to %s' % (name, value))
+        logger.info('modify parameter %s of the MadLoopParam.dat to %s' % (name, value),'$MG:color:BLACK')
         if default and name.lower() in self.MLcard.user_set:
             self.MLcard.user_set.remove(name.lower())
 
@@ -3245,7 +3329,7 @@
         if isinstance(value, str):
             value = value.lower()
             if value == 'default':
-                default = check_param_card.ParamCard(pjoin(self.me_dir,'Cards','param_card_default.dat'))
+                default = check_param_card.ParamCard(self.paths['param_default'])
                 value = default[block].param_dict[lhaid].value
 
             elif value in ['auto', 'auto@nlo']:
@@ -3288,7 +3372,7 @@
             not self.run_card['store_rwgt_info']:
             #check if a NLO reweighting is required
                 re_pattern = re.compile(r'''^\s*change\s*mode\s* (LO\+NLO|LO|NLO)\s*(?:#|$)''', re.M+re.I)
-                text = open(pjoin(self.me_dir,'Cards','reweight_card.dat')).read()
+                text = open(self.paths['reweight']).read()
                 options = re_pattern.findall(text)
                 if any(o in ['NLO', 'LO+NLO'] for o in options):
                     logger.info('NLO reweighting is on ON. Automatically set store_rwgt_info to True', '$MG:color:BLACK' )
@@ -3302,15 +3386,89 @@
             logger.warning('No transfer function currently define. Please use the change_tf command to define one.')
     
     def postcmd(self, stop, line):
-        
         ending_question = cmd.OneLinePathCompletion.postcmd(self,stop,line)
+
         if ending_question:
             self.check_card_consistency()
+            self.do_update_dependent('', timer=20)
             return ending_question
     
+    def do_update_dependent(self, line, timer=0):
+        """Change the mass/width of particles which are not free parameter for the 
+        model."""
+        if not self.mother_interface:
+            logger.warning('Failed to update dependent parameter. This might create trouble for external program (like MadSpin/shower/...)')
+        
+        pattern_width = re.compile(r'''decay\s+(\+?\-?\d+)\s+auto(@NLO|)''',re.I)
+        pattern_scan = re.compile(r'''^(decay)?[\s\d]*scan''', re.I+re.M)
+        param_text= open(self.paths['param']).read()
+        
+        if pattern_scan.search(param_text):
+            #for block, key in self.restricted_value:
+            #    self.param_card[block].get(key).value = -9.999e-99
+            #    self.param_card.write(self.paths['param'])
+            return
+        elif pattern_width.search(param_text):
+            self.do_compute_widths('')
+            self.param_card = check_param_card.ParamCard(self.paths['param'])
+    
+        # calling the routine doing the work    
+        self.update_dependent(self.mother_interface, self.me_dir, self.param_card,
+                               self.paths['param'], timer)
+    
+    @staticmethod
+    def update_dependent(mecmd, me_dir, param_card, path ,timer=0):
+        """static method which can also be called from outside the class
+           usefull in presence of scan.
+           return if the param_card was updated or not
+        """
+        modify = True
+        class TimeOutError(Exception): 
+            pass
+        def handle_alarm(signum, frame): 
+            raise TimeOutError
+        signal.signal(signal.SIGALRM, handle_alarm)
+        if timer:
+            signal.alarm(timer)
+            log_level=30
+        else:
+            log_level=20
+        # Try to load the model in the limited amount of time allowed
+        try:
+            model = mecmd.get_model()
+            signal.alarm(0)
+        except TimeOutError:
+            logger.warning('The model takes too long to load so we bypass the updating of dependent parameter.\n'+\
+                           'This might create trouble for external program (like MadSpin/shower/...)\n'+\
+                           'The update can be forced without timer by typing \'update_dependent\' at the time of the card edition')
+            modify =False
+        except Exception:
+            logger.warning('Failed to update dependent parameter. This might create trouble for external program (like MadSpin/shower/...)')
+            signal.alarm(0)
+        else:
+            restrict_card = pjoin(me_dir,'Source','MODEL','param_card_rule.dat')
+            if not os.path.exists(restrict_card):
+                restrict_card = None
+            #restrict_card = None
+            if model:
+                modify = param_card.update_dependent(model, restrict_card, log_level)
+                if modify and path:
+                    param_card.write(path)
+            else:
+                logger.warning('missing MG5aMC code. Fail to update dependent parameter. This might create trouble for program like MadSpin/shower/...')
+            
+        if log_level==20:
+            logger.info('param_card up to date.')
+            
+        return modify
+    
+    
+    
+    
     def check_answer_consistency(self):
         """function called if the code reads a file"""
-        self.check_card_consistency() 
+        self.check_card_consistency()
+        self.do_update_dependent('', timer=20) 
       
     def help_set(self):
         '''help message for set'''
@@ -3354,11 +3512,11 @@
         elif os.path.isfile(line):
             self.copy_file(line)
             self.value = 'repeat'
-        elif os.path.exists(pjoin(self.me_dir, line)):
+        elif self.me_dir and os.path.exists(pjoin(self.me_dir, line)):
             self.copy_file(pjoin(self.me_dir,line))
             self.value = 'repeat'            
         elif line.strip() != '0' and line.strip() != 'done' and \
-            str(line) != 'EOF' and line.strip() in self.allow_arg:
+            str(line) != 'EOF' and line.strip() in self.allow_arg:            
             self.open_file(line)
             self.value = 'repeat'
         else:
@@ -3369,7 +3527,7 @@
     def do_decay(self, line):
         """edit the madspin_card to define the decay of the associate particle"""
         signal.alarm(0) # avoid timer if any
-        path = pjoin(self.me_dir,'Cards','madspin_card.dat')
+        path = self.paths['madspin']
         
         if 'madspin_card.dat' not in self.cards or not os.path.exists(path):
             logger.warning("Command decay not valid. Since MadSpin is not available.")
@@ -3405,7 +3563,7 @@
 
     def do_compute_widths(self, line):
         signal.alarm(0) # avoid timer if any
-        path = pjoin(self.me_dir,'Cards','param_card.dat')
+        path = self.paths['param']
         pattern = re.compile(r'''decay\s+(\+?\-?\d+)\s+auto(@NLO|)''',re.I)
         text = open(path).read()
         pdg_info = pattern.findall(text)
@@ -3454,7 +3612,7 @@
         print '   If you specify some names after the command (i.e. asperge m1 m2) then ASperGe will only'
         print '   diagonalize the associate mass matrices (here m1 and m2).'
 
-    def complete_asperge(self, text, line, begidx, endidx):
+    def complete_asperge(self, text, line, begidx, endidx, formatting=True):
         signal.alarm(0) # avoid timer if any
 
         blockname = self.pname2block.keys()
@@ -3465,7 +3623,7 @@
         output = {'Mixing matrices': self.list_completion(text, valid, line),
                   'Other potential valid input': self.list_completion(text, potential, line)}
 
-        return self.deal_multiple_categories(output)
+        return self.deal_multiple_categories(output, formatting)
 
 
     def do_asperge(self, line):
@@ -3489,7 +3647,7 @@
                 return
 
         opts = line.split()
-        card = pjoin(self.me_dir,'Cards', 'param_card.dat')
+        card = self.paths['param']
         logger.info('running ASperGE')
         returncode = misc.call([pjoin(path,'ASperGe'), card, '%s.new' % card] + opts)
         if returncode:
@@ -3521,7 +3679,7 @@
             logger.warning('Fail to determine the type of the file. Not copied')
         if card_name != 'banner':
             logger.info('copy %s as %s' % (path, card_name))
-            files.cp(path, pjoin(self.me_dir, 'Cards', card_name))
+            files.cp(path, self.paths[card_name.split('_',1)[0]])
         elif card_name == 'banner':
             banner_mod.split_banner(path, self.mother_interface.me_dir, proc_card=False)
             logger.info('Splitting the banner in it\'s component')
@@ -3530,7 +3688,11 @@
 
     def open_file(self, answer):
         """open the file"""
-        me_dir = self.mother_interface.me_dir
+        try:
+            me_dir = self.mother_interface.me_dir
+        except:
+            me_dir = None
+            
         if answer.isdigit():
             if answer == '9':
                 answer = 'plot'
@@ -3540,14 +3702,17 @@
             answer = answer.replace('madweight', 'MadWeight')
         
         if 'MadLoopParams' in answer:
-            answer = pjoin(me_dir,'Cards','MadLoopParams.dat')
+            answer = self.paths['ML']
         if not '.dat' in answer and not '.lhco' in answer:
             if answer != 'trigger':
-                path = pjoin(me_dir,'Cards','%s_card.dat' % answer)
+                path = self.paths[answer]
             else:
-                path = pjoin(me_dir,'Cards','delphes_trigger.dat')
+                path = self.paths['delphes']
         elif not '.lhco' in answer:
-            path = pjoin(me_dir, 'Cards', answer)
+            if '_' in answer:
+                path = self.paths[answer.split('_')[0]]
+            else:
+                path = pjoin(me_dir, 'Cards', answer)
         else:
             path = pjoin(me_dir, self.mw_card['mw_run']['inputfile'])
             if not os.path.exists(path):
@@ -3574,7 +3739,7 @@
                 raise
             
         # reload object to have it in sync
-        if path == pjoin(self.me_dir,'Cards','param_card.dat'):
+        if path == self.paths['param']:
             try:
                 self.param_card = check_param_card.ParamCard(path) 
             except (check_param_card.InvalidParamCard, ValueError) as e:
@@ -3582,14 +3747,41 @@
                 logger.error('problem detected: %s' % e)
                 logger.error('Please re-open the file and fix the problem.')
                 logger.warning('using the \'set\' command without opening the file will discard all your manual change')
-        elif path == pjoin(self.me_dir,'Cards','run_card.dat'):
-            self.run_card = banner_mod.RunCard(pjoin(self.me_dir,'Cards','run_card.dat'))
-        elif path == pjoin(self.me_dir,'Cards','MadLoopParams.dat'):
-            self.MLcard = banner_mod.MadLoopParam(pjoin(self.me_dir,'Cards','MadLoopParams.dat'))
-        elif path == pjoin(self.me_dir,'Cards','MadWeight_card.dat'):
+        elif path == self.paths['run']:
+            self.run_card = banner_mod.RunCard(path)
+        elif path == self.paths['ML']:
+            self.MLcard = banner_mod.MadLoopParam(path)
+        elif path == self.paths['MadWeight']:
             try:
                 import madgraph.madweight.Cards as mwcards
             except:
                 import internal.madweight.Cards as mwcards
-            self.mw_card = mwcards.Card(pjoin(self.me_dir,'Cards','MadWeight_card.dat'))
- 
+            self.mw_card = mwcards.Card(path)
+        return path
+
+class EditParamCard(AskforEditCard):
+    """a dedicated module for the param"""
+    
+    special_shortcut ={}
+    
+    def __init__(self, question, card=[], mode='auto', *args, **opt):
+                 
+        self.load_default()
+        cmd.OneLinePathCompletion.__init__(self, question, *args, **opt)
+        if os.path.isfile(card[0]):
+            self.param_card = check_param_card.ParamCard(card[0])
+            self.paths['param'] = card[0]
+            if os.path.isfile(card[0].replace('.dat', '_default.dat')):
+                self.paths['param_default'] = card[0].replace('.dat', '_default.dat')
+            else:
+                self.paths['param_default'] = card[0]
+        else:
+            raise Exception, 'path %s do not exists' % card[0]
+        
+        self.pname2block, self.restricted_value = self.param_card.analyze_param_card()
+        self.cards=['param']
+        
+    def do_asperge(self, *args, **opts):
+        "Not available"
+        logger.warning("asperge not available in this mode")
+

=== modified file 'madgraph/interface/extended_cmd.py'
--- madgraph/interface/extended_cmd.py	2016-06-20 10:26:01 +0000
+++ madgraph/interface/extended_cmd.py	2016-08-18 22:31:39 +0000
@@ -15,7 +15,6 @@
 """  A file containing different extension of the cmd basic python library"""
 
 
-import cmd
 import logging
 import os
 import pydoc
@@ -68,22 +67,386 @@
                 return
         return deco_f
     return deco_debug
-            
+
+import string
+
+# The following is copy from the standard cmd routine but pass in new class type
+__all__ = ["Cmd"]
+PROMPT = '(Cmd) '
+IDENTCHARS = string.ascii_letters + string.digits + '_'            
+class OriginalCmd(object):
+    """A simple framework for writing line-oriented command interpreters.
+
+    These are often useful for test harnesses, administrative tools, and
+    prototypes that will later be wrapped in a more sophisticated interface.
+
+    A Cmd instance or subclass instance is a line-oriented interpreter
+    framework.  There is no good reason to instantiate Cmd itself; rather,
+    it's useful as a superclass of an interpreter class you define yourself
+    in order to inherit Cmd's methods and encapsulate action methods.
+
+    """
+    prompt = PROMPT
+    identchars = IDENTCHARS
+    ruler = '='
+    lastcmd = ''
+    intro = None
+    doc_leader = ""
+    doc_header = "Documented commands (type help <topic>):"
+    misc_header = "Miscellaneous help topics:"
+    undoc_header = "Undocumented commands:"
+    nohelp = "*** No help on %s"
+    use_rawinput = 1
+
+    def __init__(self, completekey='tab', stdin=None, stdout=None,**opt):
+        """Instantiate a line-oriented interpreter framework.
+
+        The optional argument 'completekey' is the readline name of a
+        completion key; it defaults to the Tab key. If completekey is
+        not None and the readline module is available, command completion
+        is done automatically. The optional arguments stdin and stdout
+        specify alternate input and output file objects; if not specified,
+        sys.stdin and sys.stdout are used.
+
+        """
+        import sys
+        if stdin is not None:
+            self.stdin = stdin
+        else:
+            self.stdin = sys.stdin
+        if stdout is not None:
+            self.stdout = stdout
+        else:
+            self.stdout = sys.stdout
+        self.cmdqueue = []
+        self.completekey = completekey
+        self.cmd_options = opt
+
+    def cmdloop(self, intro=None):
+        """Repeatedly issue a prompt, accept input, parse an initial prefix
+        off the received input, and dispatch to action methods, passing them
+        the remainder of the line as argument.
+
+        """
+
+        self.preloop()
+        if self.use_rawinput and self.completekey:
+            try:
+                import readline
+                self.old_completer = readline.get_completer()
+                readline.set_completer(self.complete)
+                readline.parse_and_bind(self.completekey+": complete")
+            except ImportError:
+                pass
+        try:
+            if intro is not None:
+                self.intro = intro
+            if self.intro:
+                self.stdout.write(str(self.intro)+"\n")
+            stop = None
+            while not stop:
+                if self.cmdqueue:
+                    line = self.cmdqueue.pop(0)
+                else:
+                    if self.use_rawinput:
+                        try:
+                            line = raw_input(self.prompt)
+                        except EOFError:
+                            line = 'EOF'
+                    else:
+                        self.stdout.write(self.prompt)
+                        self.stdout.flush()
+                        line = self.stdin.readline()
+                        if not len(line):
+                            line = 'EOF'
+                        else:
+                            line = line.rstrip('\r\n')
+                line = self.precmd(line)
+                stop = self.onecmd(line)
+                stop = self.postcmd(stop, line)
+            self.postloop()
+        finally:
+            if self.use_rawinput and self.completekey:
+                try:
+                    import readline
+                    readline.set_completer(self.old_completer)
+                except ImportError:
+                    pass
+
+
+    def precmd(self, line):
+        """Hook method executed just before the command line is
+        interpreted, but after the input prompt is generated and issued.
+
+        """
+        return line
+
+    def postcmd(self, stop, line):
+        """Hook method executed just after a command dispatch is finished."""
+        return stop
+
+    def preloop(self):
+        """Hook method executed once when the cmdloop() method is called."""
+        pass
+
+    def postloop(self):
+        """Hook method executed once when the cmdloop() method is about to
+        return.
+
+        """
+        pass
+
+    def parseline(self, line):
+        """Parse the line into a command name and a string containing
+        the arguments.  Returns a tuple containing (command, args, line).
+        'command' and 'args' may be None if the line couldn't be parsed.
+        """
+        line = line.strip()
+        if not line:
+            return None, None, line
+        elif line[0] == '?':
+            line = 'help ' + line[1:]
+        elif line[0] == '!':
+            if hasattr(self, 'do_shell'):
+                line = 'shell ' + line[1:]
+            else:
+                return None, None, line
+        i, n = 0, len(line)
+        while i < n and line[i] in self.identchars: i = i+1
+        cmd, arg = line[:i], line[i:].strip()
+        return cmd, arg, line
+
+    def onecmd(self, line):
+        """Interpret the argument as though it had been typed in response
+        to the prompt.
+
+        This may be overridden, but should not normally need to be;
+        see the precmd() and postcmd() methods for useful execution hooks.
+        The return value is a flag indicating whether interpretation of
+        commands by the interpreter should stop.
+
+        """
+        cmd, arg, line = self.parseline(line)
+        if not line:
+            return self.emptyline()
+        if cmd is None:
+            return self.default(line)
+        self.lastcmd = line
+        if cmd == '':
+            return self.default(line)
+        else:
+            try:
+                func = getattr(self, 'do_' + cmd)
+            except AttributeError:
+                return self.default(line)
+            return func(arg)
+
+    def emptyline(self):
+        """Called when an empty line is entered in response to the prompt.
+
+        If this method is not overridden, it repeats the last nonempty
+        command entered.
+
+        """
+        if self.lastcmd:
+            return self.onecmd(self.lastcmd)
+
+    def default(self, line):
+        """Called on an input line when the command prefix is not recognized.
+
+        If this method is not overridden, it prints an error message and
+        returns.
+
+        """
+        self.stdout.write('*** Unknown syntax: %s\n'%line)
+
+    def completedefault(self, *ignored):
+        """Method called to complete an input line when no command-specific
+        complete_*() method is available.
+
+        By default, it returns an empty list.
+
+        """
+        return []
+
+    def completenames(self, text, *ignored):
+        dotext = 'do_'+text
+        return [a[3:] for a in self.get_names() if a.startswith(dotext)]
+
+    def complete(self, text, state):
+        """Return the next possible completion for 'text'.
+
+        If a command has not been entered, then complete against command list.
+        Otherwise try to call complete_<command> to get list of completions.
+        """
+        if state == 0:
+            import readline
+            origline = readline.get_line_buffer()
+            line = origline.lstrip()
+            stripped = len(origline) - len(line)
+            begidx = readline.get_begidx() - stripped
+            endidx = readline.get_endidx() - stripped
+            if begidx>0:
+                cmd, args, foo = self.parseline(line)
+                if cmd == '':
+                    compfunc = self.completedefault
+                else:
+                    try:
+                        compfunc = getattr(self, 'complete_' + cmd)
+                    except AttributeError:
+                        compfunc = self.completedefault
+            else:
+                compfunc = self.completenames
+            self.completion_matches = compfunc(text, line, begidx, endidx)
+        try:
+            return self.completion_matches[state]
+        except IndexError:
+            return None
+
+    def get_names(self):
+        # Inheritance says we have to look in class and
+        # base classes; order is not important.
+        names = []
+        classes = [self.__class__]
+        while classes:
+            aclass = classes.pop(0)
+            if aclass.__bases__:
+                classes = classes + list(aclass.__bases__)
+            names = names + dir(aclass)
+        return names
+
+    def complete_help(self, *args):
+        return self.completenames(*args)
+
+    def do_help(self, arg):
+        if arg:
+            # XXX check arg syntax
+            try:
+                func = getattr(self, 'help_' + arg)
+            except AttributeError:
+                try:
+                    doc=getattr(self, 'do_' + arg).__doc__
+                    if doc:
+                        self.stdout.write("%s\n"%str(doc))
+                        return
+                except AttributeError:
+                    pass
+                self.stdout.write("%s\n"%str(self.nohelp % (arg,)))
+                return
+            func()
+        else:
+            names = self.get_names()
+            cmds_doc = []
+            cmds_undoc = []
+            help = {}
+            for name in names:
+                if name[:5] == 'help_':
+                    help[name[5:]]=1
+            names.sort()
+            # There can be duplicates if routines overridden
+            prevname = ''
+            for name in names:
+                if name[:3] == 'do_':
+                    if name == prevname:
+                        continue
+                    prevname = name
+                    cmd=name[3:]
+                    if cmd in help:
+                        cmds_doc.append(cmd)
+                        del help[cmd]
+                    elif getattr(self, name).__doc__:
+                        cmds_doc.append(cmd)
+                    else:
+                        cmds_undoc.append(cmd)
+            self.stdout.write("%s\n"%str(self.doc_leader))
+            self.print_topics(self.doc_header,   cmds_doc,   15,80)
+            self.print_topics(self.misc_header,  help.keys(),15,80)
+            self.print_topics(self.undoc_header, cmds_undoc, 15,80)
+
+    def print_topics(self, header, cmds, cmdlen, maxcol):
+        if cmds:
+            self.stdout.write("%s\n"%str(header))
+            if self.ruler:
+                self.stdout.write("%s\n"%str(self.ruler * len(header)))
+            self.columnize(cmds, maxcol-1)
+            self.stdout.write("\n")
+
+    def columnize(self, list, displaywidth=80):
+        """Display a list of strings as a compact set of columns.
+
+        Each column is only as wide as necessary.
+        Columns are separated by two spaces (one was not legible enough).
+        """
+        if not list:
+            self.stdout.write("<empty>\n")
+            return
+        nonstrings = [i for i in range(len(list))
+                        if not isinstance(list[i], str)]
+        if nonstrings:
+            raise TypeError, ("list[i] not a string for i in %s" %
+                              ", ".join(map(str, nonstrings)))
+        size = len(list)
+        if size == 1:
+            self.stdout.write('%s\n'%str(list[0]))
+            return
+        # Try every row count from 1 upwards
+        for nrows in range(1, len(list)):
+            ncols = (size+nrows-1) // nrows
+            colwidths = []
+            totwidth = -2
+            for col in range(ncols):
+                colwidth = 0
+                for row in range(nrows):
+                    i = row + nrows*col
+                    if i >= size:
+                        break
+                    x = list[i]
+                    colwidth = max(colwidth, len(x))
+                colwidths.append(colwidth)
+                totwidth += colwidth + 2
+                if totwidth > displaywidth:
+                    break
+            if totwidth <= displaywidth:
+                break
+        else:
+            nrows = len(list)
+            ncols = 1
+            colwidths = [0]
+        for row in range(nrows):
+            texts = []
+            for col in range(ncols):
+                i = row + nrows*col
+                if i >= size:
+                    x = ""
+                else:
+                    x = list[i]
+                texts.append(x)
+            while texts and not texts[-1]:
+                del texts[-1]
+            for col in range(len(texts)):
+                texts[col] = texts[col].ljust(colwidths[col])
+            self.stdout.write("%s\n"%str("  ".join(texts)))    
+    
+    
+
 
 #===============================================================================
 # CmdExtended
 #===============================================================================
-class BasicCmd(cmd.Cmd):
+class BasicCmd(OriginalCmd):
     """Simple extension for the readline"""
 
     def preloop(self):
         if readline and not 'libedit' in readline.__doc__:
             readline.set_completion_display_matches_hook(self.print_suggestions)
 
-    def deal_multiple_categories(self, dico, forceCategory=False):
+    def deal_multiple_categories(self, dico, formatting=True, forceCategory=False):
         """convert the multiple category in a formatted list understand by our
         specific readline parser"""
 
+        if not formatting:
+            return dico
+
         if 'libedit' in readline.__doc__:
             # No parser in this case, just send all the valid options
             out = []
@@ -316,7 +679,7 @@
             prefix += os.path.sep
 
         if only_dirs:
-            completion = [prefix + f
+            completion = [prefix + f + os.path.sep
                           for f in os.listdir(base_dir)
                           if f.startswith(text) and \
                           os.path.isdir(os.path.join(base_dir, f)) and \
@@ -493,7 +856,7 @@
         self.log = True
         self.history = []
         self.save_line = '' # for line splitting
-        cmd.Cmd.__init__(self, *arg, **opt)
+        super(Cmd, self).__init__(*arg, **opt)
         self.__initpos = os.path.abspath(os.getcwd())
         self.child = None # sub CMD interface call from this one
         self.mother = None #This CMD interface was called from another one
@@ -657,7 +1020,7 @@
         else:
             path_msg = []
             
-        if timeout:
+        if timeout is True:
             try:
                 timeout = self.options['timeout']
             except Exception:
@@ -709,7 +1072,10 @@
             if answer in alias:
                 answer = alias[answer]
             if ask_class:
-                answer = question_instance.default(answer)
+                line=answer
+                answer = question_instance.default(line)
+                question_instance.postcmd(answer, line)
+                return question_instance.answer 
             if hasattr(question_instance, 'check_answer_consistency'):
                 question_instance.check_answer_consistency()
             return answer
@@ -723,6 +1089,7 @@
                 value = alias[value]
         except TypeError:
             pass
+
         if value == default and ask_class:
             value = question_instance.default(default)
         return value
@@ -771,7 +1138,7 @@
                 logger.info('The answer to the previous question is not set in your input file', '$MG:color:BLACK')
                 logger.info('Use %s value' % default, '$MG:color:BLACK')
                 return str(default)
-        
+            
         line = line.replace('\n','').strip()
         if '#' in line: 
             line = line.split('#')[0]
@@ -839,7 +1206,7 @@
         if os.path.exists(self.debug_output):
             os.remove(self.debug_output)
         try:
-            cmd.Cmd.onecmd(self, 'history %s' % self.debug_output.replace(' ', '\ '))
+            super(Cmd,self).onecmd('history %s' % self.debug_output.replace(' ', '\ '))
         except Exception, error:
             logger.error(error)
 
@@ -888,7 +1255,7 @@
             return self.child.nice_user_error(error, line)
         # Make sure that we are at the initial position
         os.chdir(self.__initpos)
-        if line == self.history[-1]:
+        if not self.history or line == self.history[-1]:
             error_text = 'Command \"%s\" interrupted with error:\n' % line
         else:
             error_text = 'Command \"%s\" interrupted in sub-command:\n' %line
@@ -914,7 +1281,7 @@
             error_text = 'Error detected in sub-command %s\n' % self.history[-1]
         error_text += 'write debug file %s \n' % self.debug_output
         self.log = False
-        cmd.Cmd.onecmd(self, 'history %s' % self.debug_output)
+        super(Cmd,self).onecmd('history %s' % self.debug_output)
         debug_file = open(self.debug_output, 'a')
         traceback.print_exc(file=debug_file)
         error_text += self.config_debug % {'debug' :self.debug_output}
@@ -1018,17 +1385,18 @@
         pass # dummy function
             
     def exec_cmd(self, line, errorhandling=False, printcmd=True, 
-                                     precmd=False, postcmd=True, **opt):
+                                     precmd=False, postcmd=True,
+                                     child=True, **opt):
         """for third party call, call the line with pre and postfix treatment
         without global error handling """
 
+
         if printcmd and not line.startswith('#'):
             logger.info(line)
-        if self.child:
+        if self.child and child:
             current_interface = self.child
         else:
             current_interface = self
-        
         if precmd:
             line = current_interface.precmd(line)
         if errorhandling:
@@ -1061,11 +1429,7 @@
 
         if self.history and self.history[-1] == line:        
             self.history.pop()
-        
-
-
-
-     
+             
     # Write the list of command line use in this session
     def do_history(self, line):
         """write in a file the suite of command that was used"""
@@ -1258,7 +1622,7 @@
                 
         # if they are an argument use the default help
         if line:
-            return cmd.Cmd.do_help(self, line)
+            return super(Cmd, self).do_help(line)
         
         
         names = self.get_names()
@@ -1526,12 +1890,16 @@
 class SmartQuestion(BasicCmd):
     """ a class for answering a question with the path autocompletion"""
 
+    allowpath = False
     def preloop(self):
         """Initializing before starting the main loop"""
         self.prompt = '>'
         self.value = None
         BasicCmd.preloop(self)
         
+    @property
+    def answer(self):
+        return self.value
 
     def __init__(self, question, allow_arg=[], default=None, 
                                             mother_interface=None, *arg, **opt):
@@ -1541,7 +1909,7 @@
         self.history_header = ''
         self.default_value = str(default)
         self.mother_interface = mother_interface
-        cmd.Cmd.__init__(self, *arg, **opt)
+        super(SmartQuestion, self).__init__(*arg, **opt)
 
     def __call__(self, question, reprint_opt=True, **opts):
         
@@ -1604,6 +1972,8 @@
                 return func(arg, **opt)        
         except Exception as error:
             logger.warning(error)  
+            if __debug__:
+                raise
             
     def reask(self, reprint_opt=True):
         pat = re.compile('\[(\d*)s to answer\]')
@@ -1620,6 +1990,15 @@
             if not prev_timer:
                 self.question = pat.sub('',self.question)
             print self.question
+            
+        if self.mother_interface:
+            answer = self.mother_interface.check_answer_in_input_file(self, 'EOF', 
+                                                                path=self.allowpath)
+            if answer:
+                stop = self.default(answer)
+                self.postcmd(stop, answer)
+                return False
+            
         return False
         
     def default(self, line):
@@ -1665,8 +2044,8 @@
                 return True
                 
     def cmdloop(self, intro=None):
-        cmd.Cmd.cmdloop(self, intro)
-        return self.value
+        super(SmartQuestion,self).cmdloop(intro)
+        return self.answer
     
 # a function helper
 def smart_input(input_text, allow_arg=[], default=None):
@@ -1681,8 +2060,9 @@
     """ a class for answering a question with the path autocompletion"""
     
     completion_prefix=''
+    allowpath=True
 
-    def completenames(self, text, line, begidx, endidx):
+    def completenames(self, text, line, begidx, endidx, formatting=True):
         prev_timer = signal.alarm(0) # avoid timer if any
         if prev_timer:
             nb_back = len(line)
@@ -1696,7 +2076,7 @@
             out[' Path from ./'] = Cmd.path_completion(text, only_dirs = False)
             out[' Recognized command'] = BasicCmd.completenames(self, text)
             
-            return self.deal_multiple_categories(out)
+            return self.deal_multiple_categories(out, formatting)
         except Exception, error:
             print error
             
@@ -1748,8 +2128,9 @@
                           % ','.join(self.allow_arg)
             print 'please retry'
             reprint_opt = False 
-            
-        return self.reask(reprint_opt)
+
+        if line != 'EOF':
+            return self.reask(reprint_opt)
 
             
 # a function helper

=== modified file 'madgraph/interface/loop_interface.py'
--- madgraph/interface/loop_interface.py	2016-05-26 00:13:49 +0000
+++ madgraph/interface/loop_interface.py	2016-08-18 22:31:39 +0000
@@ -25,6 +25,7 @@
 import madgraph
 from madgraph import MG4DIR, MG5DIR, MadGraph5Error
 import madgraph.interface.madgraph_interface as mg_interface
+import madgraph.interface.extended_cmd as cmd
 import madgraph.interface.launch_ext_program as launch_ext
 import madgraph.interface.extended_cmd as extended_cmd
 import madgraph.core.base_objects as base_objects
@@ -465,11 +466,11 @@
                      noclean, output_type=output_type, group_subprocesses=False)
 
         if self._export_format in ['standalone', 'matchbox']:
-            self._curr_exporter.copy_v4template(modelname=self._curr_model.get('name'))
+            self._curr_exporter.copy_template(self._curr_model)
 
         if self._export_format == "standalone_rw":
             self._export_format = "standalone"
-            self._curr_exporter.copy_v4template(modelname=self._curr_model.get('name'))
+            self._curr_exporter.copy_template(self._curr_model)
             self._export_format = "standalone_rw"
 
         # Reset _done_export, since we have new directory
@@ -490,11 +491,105 @@
         # Put aloha back in its original mode.
         aloha.mp_precision = aloha_original_quad_mode
 
+
+    def install_reduction_library(self):
+        """Code to install the reduction library if needed"""
+        
+        opt = self.options
+        
+        
+        # Check if first time:
+        if (opt['ninja'] is None) or (os.path.isfile(pjoin(opt['ninja'],'libninja.a'))): 
+            return
+        
+        logger.info("First output using loop matrix-elements has been detected. Now asking for loop reduction:", '$MG:color:BLACK')
+        to_install = self.ask('install', '0',  ask_class=AskLoopInstaller, timeout=300, 
+                              path_msg=' ')
+        
+
+        for key, value in to_install.items():
+            if key in ['cuttools', 'iregi']:
+                if os.path.sep not in value:
+                    continue
+                import madgraph.iolibs.files as files
+                if key == 'cuttools':
+                    if os.path.exists(pjoin(value, 'includects')):
+                        path = pjoin(value, 'includects')
+                    elif os.path.exists(pjoin(value, 'CutTools','includects')):
+                        path = pjoin(value, 'CutTools', 'includects')
+                    elif os.path.exists(pjoin(value, 'vendor','CutTools','includects')):
+                        path = pjoin(value, 'vendor','CutTools', 'includects')
+                    else:
+                        logger.warning('invalid path for cuttools import')
+                        continue
+                    
+                    target = pjoin(MG5DIR,'vendor','CutTools','includects')
+                    if not os.path.exists(target):
+                        os.mkdir(target)
+                    files.cp(pjoin(path,'libcts.a'), target)
+                    files.cp(pjoin(path,'mpmodule.mod'), target, log=True)
+                    if os.path.exists(pjoin(path,'compiler_version.log')):
+                        files.cp(pjoin(path,'compiler_version.log'), target)
+
+                if key == 'iregi':
+                    if os.path.exists(pjoin(value, 'src','IREGI4ML5_interface.f90')):
+                        path = pjoin(value, 'src')
+                    elif os.path.exists(pjoin(value, 'IREGI','src','IREGI4ML5_interface.f90')):
+                        path = pjoin(value, 'IREGI', 'src')
+                    elif os.path.exists(pjoin(value, 'vendor','IREGI','src','IREGI4ML5_interface.f90')):
+                        path = pjoin(value, 'vendor', 'IREGI', 'src')
+                    else:
+                        logger.warning('invalid path for IREGI import')
+                        continue    
+                                         
+                    target = pjoin(MG5DIR,'vendor','IREGI','src')
+                    files.cp(pjoin(path,'libiregi.a'), target, log=True)
+            elif value == 'local':
+                ## LOCAL INSTALLATION OF NINJA/COLLIER
+                    logger.info(
+"""MG5aMC will now install the loop reduction tool '%(p)s' from the local offline installer.
+Use the command 'install $(p)s' if you want to update to the latest online version.
+This installation can take some time but only needs to be performed once.""" %{'p': key},'$MG:color:GREEN')
+                    additional_options = ['--ninja_tarball=%s'%pjoin(MG5DIR,'vendor','%s.tar.gz' % key)]
+                    if key == 'ninja':
+                        additional_options.append('--oneloop_tarball=%s'%pjoin(MG5DIR,'vendor','oneloop.tar.gz'))
+                    
+                    try:
+                        self.do_install(key,paths={'HEPToolsInstaller':
+                                pjoin(MG5DIR,'vendor','OfflineHEPToolsInstaller.tar.gz')},
+                        additional_options=additional_options)
+                    except self.InvalidCmd:
+                            logger.warning(
+"""The offline installation of %(p)s was unsuccessful, and MG5aMC disabled it.
+In the future, if you want to reactivate Ninja, you can do so by re-attempting
+its online installation with the command 'install %(p)s' or install it on your
+own and set the path to its library in the MG5aMC option '%(p)s'.""" % {'p': key})
+                            self.exec_cmd("set %s ''" % key)
+                            self.exec_cmd('save options')
+            
+            # ONLINE INSTALLATION
+            elif value == 'install':
+                prog = {'pjfry': 'PJFry', 'golem': 'Golem95'}
+                if key in prog:
+                    self.exec_cmd('install %s' % prog[key])
+                else:
+                    self.exec_cmd('install %s' % key)
+            # Not install
+            elif value == 'off':
+                self.exec_cmd("set %s ''" % key)
+                self.exec_cmd('save options %s' % key)
+            else:
+                self.exec_cmd("set %s %s" % (key,value))
+                self.exec_cmd('save options %s' % key)                
+        
+        
+    
     # Export a matrix element
-    
     def ML5export(self, nojpeg = False, main_file_name = ""):
         """Export a generated amplitude to file"""
 
+        if not self._curr_helas_model:
+            self._curr_helas_model = helas_call_writers.FortranUFOHelasCallWriter(self._curr_model)
         def generate_matrix_elements(self):
             """Helper function to generate the matrix elements before exporting"""
 
@@ -540,9 +635,8 @@
         if self._export_format in self.supported_ML_format:
             for unique_id, me in enumerate(matrix_elements):
                 calls = calls + \
-                        self._curr_exporter.generate_subprocess_directory_v4(\
-                            me, self._curr_fortran_model, (unique_id+1))
-            self._curr_exporter.write_global_specs(matrix_elements)
+                        self._curr_exporter.generate_subprocess_directory(\
+                            me, self._curr_helas_model)
             # If all ME's do not share the same maximum loop vertex rank and the
             # same loop maximum wavefunction size, we need to set the maximum
             # in coef_specs.inc of the HELAS Source. The SubProcesses/P* directory
@@ -555,7 +649,6 @@
                 if len(set(max_lwfspins))>1 or len(set(max_loop_vert_ranks))>1:
                     self._curr_exporter.fix_coef_specs(max(max_lwfspins),\
                                                        max(max_loop_vert_ranks))
-                self._curr_exporter.write_global_specs(matrix_elements)
 
         # Just the matrix.f files
         if self._export_format == 'matrix':
@@ -568,7 +661,7 @@
                     logger.info("Creating new file %s" % filename)
                 calls = calls + self._curr_exporter.write_matrix_element_v4(\
                     writers.FortranWriter(filename),\
-                    me, self._curr_fortran_model)
+                    me, self._curr_helas_model)
                 
         cpu_time2 = time.time() - cpu_time1
 
@@ -611,21 +704,22 @@
                 del self.previous_lorentz
                 del self.previous_couplings
             
-            self._curr_exporter.convert_model_to_mg4(self._curr_model,
+            self._curr_exporter.convert_model(self._curr_model,
                                            wanted_lorentz,
                                            wanted_couplings)
-            
-        compiler = {'fortran': self.options['fortran_compiler'],
-                    'f2py': self.options['f2py_compiler'],
-                    'cpp': self.options['cpp_compiler']}
         
         if self._export_format in self.supported_ML_format:
-            self._curr_exporter.finalize_v4_directory( \
+            flags = []
+            if nojpeg:
+                flags.append('nojpeg')
+            if online:
+                flags.append('online')
+                
+            self._curr_exporter.finalize( \
                                            self._curr_matrix_elements,
                                            self.history,
-                                           not nojpeg,
-                                           online,
-                                           compiler)
+                                           self.options,
+                                           flags)
 
         if self._export_format in self.supported_ML_format:
             logger.info('Output to directory ' + self._export_dir + ' done.')
@@ -791,3 +885,207 @@
 class LoopInterfaceWeb(mg_interface.CheckValidForCmdWeb, LoopInterface):
     pass
 
+
+class AskLoopInstaller(cmd.OneLinePathCompletion):
+    
+    local_installer = ['ninja', 'collier']
+    required = ['cuttools', 'iregi']
+    order = ['cuttools', 'iregi', 'ninja', 'collier', 'golem', 'pjfry']
+    
+    @property
+    def answer(self):
+        return self.code
+    
+    
+    def __init__(self, question, *args, **opts):
+
+        import urllib2
+        try:
+            response=urllib2.urlopen('http://madgraph.phys.ucl.ac.be/F1.html', timeout=3)
+            self.online=True
+        except urllib2.URLError as err: 
+            self.online=False        
+        
+        self.code = {'ninja': 'install',
+                     'collier': 'install',
+                     'golem': 'off',
+                     'pjfry':'off',
+                     'cuttools': 'required',
+                     'iregi': 'required'}
+        if not self.online:
+            self.code['ninja'] = 'local'
+            self.code['collier'] = 'local'
+            self.code['pjfry'] = 'fail'
+            self.code['golem'] = 'fail'
+        if not misc.which('cmake'):
+            self.code['collier'] = 'off'
+            
+            
+
+        
+        # 1. create the question
+        question, allowed_answer = self.create_question(first=True)
+        
+        opts['allow_arg'] = allowed_answer
+        
+        cmd.OneLinePathCompletion.__init__(self, question, *args, **opts)
+        
+
+    def create_question(self, first = False):
+        """ """
+
+        question = "For loop computations, MadLoop requires dedicated tools to"+\
+        " perform the reduction of loop Feynman diagrams using OPP-based and/or TIR approaches.\n"+\
+        "\nWhich one do you want to install? (this needs to be done only once)\n"
+        
+        allowed_answer = set(['0','done'])
+        
+        descript =  {'cuttools': ['cuttools','(OPP)','[0711.3596]'],
+                     'iregi': ['iregi','(TIR)','[1405.0301]'],
+                     'ninja': ['ninja','(OPP)','[1403.1229]'],
+                     'pjfry': ['pjfry','(TIR)','[1112.0500]'],
+                     'golem': ['golem','(TIR)','[0807.0605]'],
+                     'collier': ['collier','(TIR)','[1604.06792]']} 
+
+        
+        status = {'off': '%(start_red)sdo not install%(stop)s',
+                  'install': '%(start_green)swill be installed %(stop)s',
+                  'local': '%(start_green)swill be installed %(stop)s(offline installation from local repository)',
+                  'fail': 'not available without internet connection',
+                  'required': 'will be installed (required)'}
+        
+        for i,key in enumerate(self.order,1):
+            if os.path.sep not in self.code[key]:
+                question += '%s. %%(start_blue)s%-9s %-5s %-13s%%(stop)s : %s%s\n' % \
+                   tuple([i,]+descript[key]+[status[self.code[key]],]+\
+                     ['(recommended)' if key in ['ninja','collier'] and self.code[key] in ['install'] else ''])
+            else:
+                question += '%s. %%(start_blue)s%-9s %-5s %-13s%%(stop)s : %s\n' % tuple([i,]+descript[key]+[self.code[key],])
+            if key in self.required:
+                continue
+            allowed_answer.update([str(i), key])
+            if key in self.local_installer:
+                allowed_answer.update(['key=local','key=off'])
+            if self.online:
+                allowed_answer.update(['key=on','key=install', 'key=off'])
+                
+        question += "You can:\n -> hit 'enter' to proceed\n -> type a number to cycle its options\n -> enter the following command:\n"+\
+          '    %(start_blue)s{tool_name}%(stop)s [%(start_blue)sinstall%(stop)s|%(start_blue)snoinstall%(stop)s|'+\
+          '%(start_blue)s{prefixed_installation_path}%(stop)s]\n'
+        if first:
+            question += '\n%(start_bold)s%(start_red)sIf you are unsure about what this question means, just type enter to proceed. %(stop)s'
+
+        question = question % {'start_green' : '\033[92m',
+                               'start_red' : '\033[91m',
+                               'start_blue' : '\033[34m',
+     'stop':  '\033[0m',
+     'start_bold':'\033[1m', 
+     }
+        return question, allowed_answer
+        
+    def default(self, line):
+        """Default action if line is not recognized"""
+        
+        line = line.strip()
+        args = line.split()
+
+        if line in ['0', 'done','','EOF']:
+            self.value = 'done'
+            return self.answer
+        self.value = 'repeat'        
+        if args:
+            if len(args) ==1 and '=' in args[0]:
+                args = args[0].split('=')
+            args[0] = args[0].lower()
+            if len(args) == 1:
+                # loop over the possibility
+                if args[0].isdigit():
+                    if len(self.order) < int(args[0]):
+                        logger.warning('Invalid integer %s. Please Retry' % args[0])
+                        return 
+                    args[0] = self.order[int(args[0])-1]
+                key = args[0]
+                if key in self.code:
+                    if self.code[key] in ['off']:
+                        if self.online:
+                            self.code[key] = 'install'
+                        elif key in self.local_installer:
+                            self.code[key] = 'local'
+                    elif self.code[key] == 'install':
+                        if key in self.local_installer:
+                            self.code[key] = 'local'
+                        else:
+                            self.code[key] = 'off'
+                    elif self.code[key] == 'local':
+                        self.code[key] = 'off'
+                else: 
+                    logger.warning('Unknown entry \'%s\'. Please retry' % key)
+                    return 
+            elif len(args) == 2:
+                key = args[0]
+                if key not in self.code:
+                    logger.warning('unknown %s type of entry. Bypass command.')
+                    return                     
+                if os.path.sep not in args[1]:
+                    value = args[1].lower()
+                    if value in ['off', 'not','noinstall']:
+                        self.code[key] = 'off'
+                    elif value in ['on', 'install']:
+                        if self.online:
+                            self.code[key] = 'install'
+                        elif key in self.local_installer:
+                            self.code[key] = 'local'
+                        else:
+                            logger.warning('offline installer not available for %s', key)
+                            self.code[key] = 'off'
+                    elif value in ['local']:
+                        if key in self.local_installer:
+                            self.code[key] = 'local'
+                        else:
+                            logger.warning('offline installer not available for %s', key)
+                            self.code[key] = 'off'
+                else:
+                    self.code[key] = args[1]
+            else:
+                self.value = 0
+        self.question,self.allow_arg = self.create_question()
+        return self.answer
+
+    def apply_name(self, name, line):
+
+        if line.startswith('='):
+            line = line[1:]
+        return self.default('%s %s' % (name,line))
+
+
+    do_ninja = lambda self,line : self.apply_name('ninja', line)
+    do_pjfry = lambda self,line : self.apply_name('pjfry', line)
+    do_collier = lambda self,line : self.apply_name('collier', line)
+    do_golem = lambda self,line : self.apply_name('golem', line)
+    do_cuttools = lambda self,line : self.apply_name('cuttools', line)
+    do_iregi =  lambda self,line : self.apply_name('iregi', line)
+    
+ 
+    def complete_prog(self, text, line, begidx, endidx, formatting=True):
+        
+        if os.path.sep in line:
+            args = line[0:begidx].split()
+            if args[-1].endswith(os.path.sep):
+                return self.path_completion(text,
+                                        pjoin(*[a for a in args if a.endswith(os.path.sep)]),
+                                        only_dirs = True)
+            else:
+                return self.path_completion(text, '.', only_dirs = True)
+        else:
+            return self.list_completion(text, ['install', 'noinstall', 'local'], line)
+    
+    complete_ninja = complete_prog 
+    complete_pjfry = complete_prog
+    complete_collier = complete_prog
+    complete_golem = complete_prog
+    complete_cuttools = complete_prog
+    complete_iregi = complete_prog
+    
+    
+               
+   

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2016-08-14 00:17:23 +0000
+++ madgraph/interface/madevent_interface.py	2016-08-18 22:31:39 +0000
@@ -1293,7 +1293,7 @@
         else:
             return self.list_completion(text, ['--threshold='], line)
     
-    def complete_banner_run(self, text, line, begidx, endidx):
+    def complete_banner_run(self, text, line, begidx, endidx, formatting=True):
        "Complete the banner run command"
        try:
   
@@ -1331,7 +1331,7 @@
         run_list = [n.rsplit('/',2)[1] for n in run_list]
         possibilites['RUN Name'] = self.list_completion(text, run_list)
         
-        return self.deal_multiple_categories(possibilites)
+        return self.deal_multiple_categories(possibilites, formatting)
     
         
        except Exception, error:
@@ -1511,7 +1511,7 @@
         else:
             return self.list_completion(text, self._plot_mode + self.results.keys())
         
-    def complete_syscalc(self, text, line, begidx, endidx):
+    def complete_syscalc(self, text, line, begidx, endidx, formatting=True):
         """ Complete the syscalc command """
         
         output = {}
@@ -1527,7 +1527,7 @@
                 tags = ['--tag=%s' % tag['tag'] for tag in self.results[run]]
                 output['options'] += tags
         
-        return self.deal_multiple_categories(output)
+        return self.deal_multiple_categories(output, formatting)
         
     def complete_remove(self, text, line, begidx, endidx):
         """Complete the remove command """
@@ -2035,7 +2035,9 @@
                     #check if the param_card defines a scan.
                     orig_name = self.run_name
                     for card in param_card_iterator:
+                        path = pjoin(self.me_dir,'Cards','param_card.dat')
                         card.write(pjoin(self.me_dir,'Cards','param_card.dat'))
+                        self.check_param_card(path, dependent=True)
                         next_name = param_card_iterator.get_next_name(self.run_name)
                         try:
                             self.exec_cmd("generate_events -f %s" % next_name,

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2016-08-16 00:19:25 +0000
+++ madgraph/interface/madgraph_interface.py	2016-08-18 22:31:39 +0000
@@ -146,6 +146,33 @@
     # Define the Error Class # Define how error are handle
     InvalidCmd = madgraph.InvalidCmd
     ConfigurationError = MadGraph5Error
+    
+    intro_banner = "************************************************************\n" + \
+        "*                                                          *\n" + \
+        "*                     W E L C O M E to                     *\n" + \
+        "*              M A D G R A P H 5 _ a M C @ N L O           *\n" + \
+        "*                                                          *\n" + \
+        "*                                                          *\n" + \
+        "*                 *                       *                *\n" + \
+        "*                   *        * *        *                  *\n" + \
+        "*                     * * * * 5 * * * *                    *\n" + \
+        "*                   *        * *        *                  *\n" + \
+        "*                 *                       *                *\n" + \
+        "*                                                          *\n" + \
+        "%s" + \
+        "*                                                          *\n" + \
+        "*    The MadGraph5_aMC@NLO Development Team - Find us at   *\n" + \
+        "*    https://server06.fynu.ucl.ac.be/projects/madgraph     *\n" + \
+        "*                            and                           *\n" + \
+        "*            http://amcatnlo.web.cern.ch/amcatnlo/         *\n" + \
+        "*                                                          *\n" + \
+        "*               Type 'help' for in-line help.              *\n" + \
+        "*           Type 'tutorial' to learn how MG5 works         *\n" + \
+        "*    Type 'tutorial aMCatNLO' to learn how aMC@NLO works   *\n" + \
+        "*    Type 'tutorial MadLoop' to learn how MadLoop works    *\n" + \
+        "*                                                          *\n" + \
+        "************************************************************"
+    
 
     def __init__(self, *arg, **opt):
         """Init history and line continuation"""
@@ -187,32 +214,7 @@
             
 
 
-        logger.info(\
-        "************************************************************\n" + \
-        "*                                                          *\n" + \
-        "*                     W E L C O M E to                     *\n" + \
-        "*              M A D G R A P H 5 _ a M C @ N L O           *\n" + \
-        "*                                                          *\n" + \
-        "*                                                          *\n" + \
-        "*                 *                       *                *\n" + \
-        "*                   *        * *        *                  *\n" + \
-        "*                     * * * * 5 * * * *                    *\n" + \
-        "*                   *        * *        *                  *\n" + \
-        "*                 *                       *                *\n" + \
-        "*                                                          *\n" + \
-        info_line + \
-        "*                                                          *\n" + \
-        "*    The MadGraph5_aMC@NLO Development Team - Find us at   *\n" + \
-        "*    https://server06.fynu.ucl.ac.be/projects/madgraph     *\n" + \
-        "*                            and                           *\n" + \
-        "*            http://amcatnlo.web.cern.ch/amcatnlo/         *\n" + \
-        "*                                                          *\n" + \
-        "*               Type 'help' for in-line help.              *\n" + \
-        "*           Type 'tutorial' to learn how MG5 works         *\n" + \
-        "*    Type 'tutorial aMCatNLO' to learn how aMC@NLO works   *\n" + \
-        "*    Type 'tutorial MadLoop' to learn how MadLoop works    *\n" + \
-        "*                                                          *\n" + \
-        "************************************************************")
+        logger.info(self.intro_banner % info_line)
 
         cmd.Cmd.__init__(self, *arg, **opt)
 
@@ -1117,11 +1119,13 @@
     def check_install(self, args):
         """check that the install command is valid"""
 
+        hidden_prog = ['Delphes2', 'pythia-pgs']
+
         if len(args) < 1:
             self.help_install()
             raise self.InvalidCmd('install command require at least one argument')
 
-        if args[0] not in self._install_opts:
+        if args[0] not in self._install_opts + hidden_prog:
             if not args[0].startswith('td'):
                 self.help_install()
                 raise self.InvalidCmd('Not recognize program %s ' % args[0])
@@ -1154,13 +1158,15 @@
         if not args:
             if self._done_export:
                 mode = self.find_output_type(self._done_export[0])
-                
-                if not self._done_export[1].startswith(mode):
-                    print mode, self._done_export[1]
+                if (self._done_export[1] == 'plugin' and mode not in self._export_formats):
+                    args.append(mode)
+                    args.append(self._done_export[0])
+                elif self._done_export[1].startswith(mode):
+                    args.append(self._done_export[1])
+                    args.append(self._done_export[0])
+                else:
                     raise self.InvalidCmd, \
                           '%s not valid directory for launch' % self._done_export[0]
-                args.append(self._done_export[1])
-                args.append(self._done_export[0])
                 return
             else:
                 logger.warning('output command missing, run it automatically (with default argument)')
@@ -1306,7 +1312,7 @@
         if args[0] == 'options':
             has_path = None
             for arg in args[1:]:
-                if arg in ['--auto', '--all']:
+                if arg in ['--auto', '--all'] or arg in self.options:
                     continue
                 elif arg.startswith('--'):
                     raise self.InvalidCmd('unknow command for \'save options\'')
@@ -1460,6 +1466,28 @@
 
         if args and args[0] in self._export_formats:
             self._export_format = args.pop(0)
+        elif args:
+            # check for PLUGIN format
+            for plug in os.listdir(pjoin(MG5DIR, 'PLUGIN')):
+                if os.path.exists(pjoin(MG5DIR, 'PLUGIN', plug, '__init__.py')):
+                    try:
+                        __import__('PLUGIN.%s' % plug)
+                    except Exception, error:
+                        logger.warning("error detected in plugin: %s.", plug)
+                        logger.warning("%s", error)
+                        continue
+                    plugin = sys.modules['PLUGIN.%s' % plug]                
+                    if hasattr(plugin, 'new_output'):
+                        if not misc.is_plugin_supported(plugin):
+                            continue
+                        if args[0] in plugin.new_output:
+                            self._export_format = 'plugin'
+                            self._export_plugin = plugin.new_output[args[0]]
+                            logger.info('Output will be done with PLUGIN: %s' % plug ,'$MG:color:BLACK')
+                            args.pop(0)
+                            break
+            else:
+                self._export_format = default
         else:
             self._export_format = default
 
@@ -1494,7 +1522,7 @@
             # Check for special directory treatment
             if path == 'auto' and self._export_format in \
                      ['madevent', 'standalone', 'standalone_cpp', 'matchbox_cpp', 'madweight',
-                      'matchbox']:
+                      'matchbox', 'plugin']:
                 self.get_default_path()
                 if '-noclean' not in args and os.path.exists(self._export_dir):
                     args.append('-noclean')
@@ -1665,6 +1693,11 @@
                                     (self._curr_model['name'], i)
             auto_path = lambda i: pjoin(self.writing_dir,
                                                name_dir(i))
+        elif self._export_format in ['plugin']:
+            name_dir = lambda i: 'PROC_PLUGIN_%s_%s' % \
+                                    (self._curr_model['name'], i)
+            auto_path = lambda i: pjoin(self.writing_dir,
+                                               name_dir(i))
         elif self._export_format == 'pythia8':
             if self.options['pythia8_path']:
                 self._export_dir = self.options['pythia8_path']
@@ -1849,7 +1882,8 @@
         return self.list_completion(text, possibilities)
 
     def model_completion(self, text, process, line, categories = True, \
-                                                      allowed_loop_mode = None):
+                                                      allowed_loop_mode = None,
+                                                      formatting=True):
         """ complete the line with model information. If categories is True,
         it will use completion with categories. If allowed_loop_mode is
         specified, it will only complete with these loop modes."""
@@ -1926,9 +1960,9 @@
             if len(possibilities.keys())==1:
                 return self.list_completion(text, possibilities.values()[0])
             else:
-                return self.deal_multiple_categories(possibilities)
+                return self.deal_multiple_categories(possibilities, formatting)
 
-    def complete_generate(self, text, line, begidx, endidx):
+    def complete_generate(self, text, line, begidx, endidx, formatting=True):
         "Complete the generate command"
 
         # Return list of particle names and multiparticle names, as well as
@@ -1936,25 +1970,25 @@
         args = self.split_arg(line[0:begidx])
 
         valid_sqso_operators=['==','<=','>']
+
         if any(line.endswith('^2 %s '%op) for op in valid_sqso_operators):
             return
         if args[-1].endswith('^2'):
             return self.list_completion(text,valid_sqso_operators)
         match_op = [o for o in valid_sqso_operators if o.startswith(args[-1])]            
-        if args[-2].endswith('^2') and len(match_op)>0:
+        if len(args)>2 and args[-2].endswith('^2') and len(match_op)>0:
             if args[-1] in valid_sqso_operators:
                 return self.list_completion(text,' ')
             if len(match_op)==1:
                 return self.list_completion(text,[match_op[0][len(args[-1]):]])
             else:
                 return self.list_completion(text,match_op)
-
         if len(args) > 2 and args[-1] == '@' or ( args[-1].endswith('=') and \
                             (not '[' in line or ('[' in line and ']' in line))):
             return
 
         try:
-            return self.model_completion(text, ' '.join(args[1:]),line)
+            return self.model_completion(text, ' '.join(args[1:]),line, formatting)
         except Exception as error:
             print error
 
@@ -1966,7 +2000,7 @@
         #                            self._multiparticles.keys() + couplings)
 
 
-    def complete_compute_widths(self, text, line, begidx, endidx):
+    def complete_compute_widths(self, text, line, begidx, endidx,formatting=True):
         "Complete the compute_widths command"
 
         args = self.split_arg(line[0:begidx])
@@ -1987,11 +2021,11 @@
                              '--precision_channel=0.\$', '--body_decay=', '--nlo'])
             completion['particles'] = self.model_completion(text, '', line)
 
-        return self.deal_multiple_categories(completion)
+        return self.deal_multiple_categories(completion,formatting)
 
     complete_decay_diagram = complete_compute_widths
 
-    def complete_add(self, text, line, begidx, endidx):
+    def complete_add(self, text, line, begidx, endidx, formatting):
         "Complete the add command"
 
         args = self.split_arg(line[0:begidx])
@@ -2005,9 +2039,9 @@
         
         elif args[1] == 'model':
             completion_categories = self.complete_import(text, line, begidx, endidx, 
-                                                         allow_restrict=False, treat_completion=False)
+                                                         allow_restrict=False, formatting=False)
             completion_categories['options'] = self.list_completion(text,['--modelname=','--recreate'])
-            return self.deal_multiple_categories(completion_categories) 
+            return self.deal_multiple_categories(completion_categories, formatting) 
             
     def complete_customize_model(self, text, line, begidx, endidx):
         "Complete the customize_model command"
@@ -2019,7 +2053,7 @@
             return self.list_completion(text, ['--save='])
 
 
-    def complete_check(self, text, line, begidx, endidx):
+    def complete_check(self, text, line, begidx, endidx, formatting=True):
         "Complete the check command"
 
         out = {}
@@ -2053,7 +2087,7 @@
           {'Process completion': self.model_completion(text, ' '.join(args[2:]),
           line, categories = False, allowed_loop_mode=['virt']),
           'Param_card.dat path completion:':self.path_completion(text),
-          'options': self.list_completion(text,options)})
+          'options': self.list_completion(text,options)}, formatting)
 
         #Special rules for check cms completion
         if cms_check_mode:
@@ -2085,7 +2119,7 @@
                         return self.deal_multiple_categories(
           {"Examples of completion for option '%s'"%args[-1].split('=')[0]:
 #                    ['%d: %s'%(i+1,ex) for i, ex in enumerate(example)]},
-                    ['%s'%ex for i, ex in enumerate(example)]},
+                    ['%s'%ex for i, ex in enumerate(example)]},formatting,
                                                              forceCategory=True)
                 if args[-1]=='--recompute_width=':
                     return self.list_completion(text,
@@ -2104,17 +2138,20 @@
                         line, categories = False, allowed_loop_mode=['virt']),
                    'Param_card.dat path completion:': self.path_completion(text),
                'reanalyze result on disk / save output:':self.list_completion(
-                                                  text,['-reuse','--analyze='])})
+                                                  text,['-reuse','--analyze='])},
+                                                     formatting)
             elif not any(arg.startswith('--') for arg in args):
                 if '>' in args:
                     return self.deal_multiple_categories({'Process completion': 
                         self.model_completion(text, ' '.join(args[2:]),
                         line, categories = False, allowed_loop_mode=['virt']),
-                        'options': self.list_completion(text,options)})
+                        'options': self.list_completion(text,options)},
+                                                         formatting)
                 else:
                     return self.deal_multiple_categories({'Process completion': 
                         self.model_completion(text, ' '.join(args[2:]),
-                        line, categories = False, allowed_loop_mode=['virt'])})
+                        line, categories = False, allowed_loop_mode=['virt'])},
+                                                         formatting)
             else:
                 return self.list_completion(text,options)
             
@@ -2177,7 +2214,7 @@
                                 'non_propagating', '--']
             return self.list_completion(text, opt)
 
-    def complete_launch(self, text, line, begidx, endidx):
+    def complete_launch(self, text, line, begidx, endidx,formatting=True):
         """ complete the launch command"""
         args = self.split_arg(line[0:begidx])
 
@@ -2211,7 +2248,7 @@
             out['Options'] = self.list_completion(text, opt, line)
 
 
-        return self.deal_multiple_categories(out)
+        return self.deal_multiple_categories(out,formatting)
 
     def complete_load(self, text, line, begidx, endidx):
         "Complete the load command"
@@ -2333,7 +2370,7 @@
             content += possible_options_full
             return self.list_completion(text, content)
 
-    def aloha_complete_output(self, text, line, begidx, endidx):
+    def aloha_complete_output(self, text, line, begidx, endidx,formatting=True):
         "Complete the output aloha command"
         args = self.split_arg(line[0:begidx])
         completion_categories = {}
@@ -2372,7 +2409,7 @@
             completion_categories['Wavefunctions routines'] = self.list_completion(text, wf_opt)
             completion_categories['conjugate_routines'] = self.list_completion(text, opt_conjg)
 
-        return self.deal_multiple_categories(completion_categories)
+        return self.deal_multiple_categories(completion_categories,formatting)
 
     def complete_set(self, text, line, begidx, endidx):
         "Complete the set command"
@@ -2426,7 +2463,7 @@
                         only_dirs = True)
         
     def complete_import(self, text, line, begidx, endidx, allow_restrict=True,
-                        treat_completion=True):
+                        formatting=True):
         "Complete the import command"
 
         args=self.split_arg(line[0:begidx])
@@ -2569,11 +2606,9 @@
         if len(args) >= 3 and mode.startswith('banner') and not '--no_launch' in line:
             completion_categories['options'] = self.list_completion(text, ['--no_launch'])
         
-        if treat_completion:
-            return self.deal_multiple_categories(completion_categories) 
-        else:
-            #this means this function is called as a subgroup of another completion
-            return completion_categories
+        return self.deal_multiple_categories(completion_categories,formatting) 
+
+
     def find_restrict_card(self, model_name, base_dir='./', no_restrict=True):
         """find the restriction file associate to a given model"""
 
@@ -2637,9 +2672,8 @@
     _check_opts = ['full', 'timing', 'stability', 'profile', 'permutation',
                    'gauge','lorentz', 'brs', 'cms']
     _import_formats = ['model_v4', 'model', 'proc_v4', 'command', 'banner']
-    _install_opts = ['pythia-pgs', 'Delphes', 'MadAnalysis', 'ExRootAnalysis',
-                     'update', 'Delphes2', 'SysCalc', 'Golem95', 'PJFry',
-                                                                      'QCDLoop']
+    _install_opts = ['Delphes', 'MadAnalysis', 'ExRootAnalysis',
+                     'update', 'SysCalc', 'Golem95', 'PJFry', 'QCDLoop']
     # The targets below are installed using the HEPToolsInstaller.py script
     _advanced_install_opts = ['ninja','collier']
     
@@ -2732,8 +2766,7 @@
     _curr_model = None  #base_objects.Model()
     _curr_amps = diagram_generation.AmplitudeList()
     _curr_matrix_elements = helas_objects.HelasMultiProcess()
-    _curr_fortran_model = None
-    _curr_cpp_model = None
+    _curr_helas_model = None
     _curr_exporter = None
     _done_export = False
     _curr_decaymodel = None
@@ -2837,6 +2870,11 @@
             warning_duplicate = False
             args.remove('--no_warning=duplicate')
 
+        diagram_filter = False
+        if '--diagram_filter' in args:
+            diagram_filter = True
+            args.remove('--diagram_filter')
+
         # Check the validity of the arguments
         self.check_add(args)
 
@@ -2927,7 +2965,7 @@
             myproc = diagram_generation.MultiProcess(myprocdef,
                                      collect_mirror_procs = collect_mirror_procs,
                                      ignore_six_quark_processes = ignore_six_quark_processes,
-                                     optimize=optimize)
+                                     optimize=optimize, diagram_filter=diagram_filter)
 
 
             for amp in myproc.get('amplitudes'):
@@ -2958,6 +2996,7 @@
         
         model_path = args[0]
         recreate = ('--recreate' in args)
+        keep_decay = ('--keep_decay' in args)
         output_dir = [a.split('=',1)[1] for a in args if a.startswith('--output')]
         if output_dir:
             output_dir = output_dir[0]
@@ -2998,6 +3037,10 @@
         base_model.add_model(path=model_path, identify_particles=identify)
         base_model.write(output_dir)
         
+        if keep_decay and os.path.exists(pjoin(self._curr_model.get('modelpath'), 'decays.py')):
+            base_model.mod_file(pjoin(pjoin(self._curr_model.get('modelpath'), 'decays.py')),
+                                pjoin(pjoin(output_dir, 'decays.py')))
+        
         new_model_name = output_dir
         if restrict_name:
             new_model_name = '%s-%s' % (output_dir, restrict_name)
@@ -4904,9 +4947,6 @@
             if args[0].endswith('_v4'):
                 self._curr_model, self._model_v4_path = \
                                  import_v4.import_model(args[1], self._mgme_dir)
-                self._curr_fortran_model = \
-                      helas_call_writers.FortranHelasCallWriter(\
-                                                               self._curr_model)
             else:
                 # avoid loading the qcd/qed model twice
                 if (args[1].startswith('loop_qcd_qed_sm') or\
@@ -4960,13 +5000,6 @@
                         self._curr_model = None
                         self.do_set('gauge unitary', log= False)
                         return
-                
-                self._curr_fortran_model = \
-                      helas_call_writers.FortranUFOHelasCallWriter(\
-                                                               self._curr_model)
-                self._curr_cpp_model = \
-                      helas_call_writers.CPPUFOHelasCallWriter(\
-                                                               self._curr_model)
 
             if '-modelname' not in args:
                 self._curr_model.pass_particles_name_in_mg_default()
@@ -5077,10 +5110,6 @@
         """ import the UFO model """
 
         self._curr_model = import_ufo.import_model(model_name)
-        self._curr_fortran_model = \
-                helas_call_writers.FortranUFOHelasCallWriter(self._curr_model)
-        self._curr_cpp_model = \
-                helas_call_writers.CPPUFOHelasCallWriter(self._curr_model)
 
     def process_model(self):
         """Set variables _particle_names and _couplings for tab
@@ -5530,7 +5559,6 @@
             logger.info("   when using results produced with this tool.", '$MG:color:BLACK')
             logger.info("------------------------------------------------------", '$MG:color:GREEN')
 
-
         # Load file with path of the different program:
         import urllib
         if paths:
@@ -6488,15 +6516,11 @@
             if self._curr_model.get('parameters'):
                 # This is a UFO model
                 self._model_v4_path = None
-                self._curr_fortran_model = \
-                  helas_call_writers.FortranUFOHelasCallWriter(self._curr_model)
             else:
                 # This is a v4 model
                 self._model_v4_path = import_v4.find_model_path(\
                     self._curr_model.get('name').replace("_v4", ""),
                     self._mgme_dir)
-                self._curr_fortran_model = \
-                  helas_call_writers.FortranHelasCallWriter(self._curr_model)
 
             # Do post-processing of model
             self.process_model()
@@ -6522,14 +6546,8 @@
                         self._model_v4_path = import_v4.find_model_path(\
                                    model.get('name').replace("_v4", ""),
                                    self._mgme_dir)
-                        self._curr_fortran_model = \
-                                helas_call_writers.FortranHelasCallWriter(\
-                                                              model)
                     else:
                         self._model_v4_path = None
-                        self._curr_fortran_model = \
-                                helas_call_writers.FortranUFOHelasCallWriter(\
-                                                              model)
                     # If not exceptions from previous steps, set
                     # _curr_amps and _curr_model
                     self._curr_amps = amps
@@ -6649,37 +6667,53 @@
                 raise self.InvalidCmd('No processes to save!')
 
         elif args[0] == 'options':
-            # First look at options which should be put in MG5DIR/input
+            partial_save = False
             to_define = {}
-            for key, default in self.options_configuration.items():
-                if self.options_configuration[key] != self.options[key] and not self.options_configuration[key] is None:
-                    to_define[key] = self.options[key]
-
-            if not '--auto' in args:
-                for key, default in self.options_madevent.items():
-                    if self.options_madevent[key] != self.options[key] != None:
-                        if '_path' in key and os.path.basename(self.options[key]) == 'None':
-                            continue
-                        to_define[key] = self.options[key]
-                    elif key == 'cluster_queue' and self.options[key] is None:
-                        to_define[key] = self.options[key]
-
-            if '--all' in args:
-                for key, default in self.options_madgraph.items():
-                    if self.options_madgraph[key] != self.options[key] != None and \
-                      key != 'stdout_level':
-                        to_define[key] = self.options[key]
-            elif not '--auto' in args:
-                for key, default in self.options_madgraph.items():
-                    if self.options_madgraph[key] != self.options[key] != None and  key != 'stdout_level':
-                        logger.info('The option %s is modified [%s] but will not be written in the configuration files.' \
-                                    % (key,self.options_madgraph[key]) )
-                        logger.info('If you want to make this value the default for future session, you can run \'save options --all\'')
-            if len(args) >1 and not args[1].startswith('--'):
+            if any(not arg.startswith('--') and arg in self.options 
+                                                               for arg in args):
+                # store in file only those ones
+                partial_save = True
+                all_arg = [arg for arg in args[1:] if not arg.startswith('--') and
+                           arg in self.options]
+                for key in all_arg:
+                    to_define[key] = self.options[key] 
+            else:
+                # First look at options which should be put in MG5DIR/input
+                for key, default in self.options_configuration.items():
+                    if self.options_configuration[key] != self.options[key] and not self.options_configuration[key] is None:
+                        to_define[key] = self.options[key]
+    
+                if not '--auto' in args:
+                    for key, default in self.options_madevent.items():
+                        if self.options_madevent[key] != self.options[key] != None:
+                            if '_path' in key and os.path.basename(self.options[key]) == 'None':
+                                continue
+                            to_define[key] = self.options[key]
+                        elif key == 'cluster_queue' and self.options[key] is None:
+                            to_define[key] = self.options[key]
+    
+                if '--all' in args:
+                    for key, default in self.options_madgraph.items():
+                        if self.options_madgraph[key] != self.options[key] != None and \
+                          key != 'stdout_level':
+                            to_define[key] = self.options[key]
+                elif not '--auto' in args:
+                    for key, default in self.options_madgraph.items():
+                        if self.options_madgraph[key] != self.options[key] != None and  key != 'stdout_level':
+                            logger.info('The option %s is modified [%s] but will not be written in the configuration files.' \
+                                        % (key,self.options_madgraph[key]) )
+                            logger.info('If you want to make this value the default for future session, you can run \'save options --all\'')
+                
+            if len(args) >1 and not args[1].startswith('--') and args[1] not in self.options:
                 filepath = args[1]
             else:
                 filepath = pjoin(MG5DIR, 'input', 'mg5_configuration.txt')
-            basefile = pjoin(MG5DIR, 'input', '.mg5_configuration_default.txt')
+            
+            if partial_save:
+                basefile = filepath
+            else:
+                basefile = pjoin(MG5DIR, 'input', '.mg5_configuration_default.txt')
+                
             basedir = MG5DIR
 
             if to_keep:
@@ -6813,8 +6847,7 @@
             self._curr_model = None
             self._curr_amps = diagram_generation.AmplitudeList()
             self._curr_matrix_elements = helas_objects.HelasMultiProcess()
-            self._curr_fortran_model = None
-            self._curr_cpp_model = None
+            self._curr_helas_model = None
             self._curr_exporter = None
             self._done_export = False
             import_ufo._import_once = []
@@ -7074,7 +7107,11 @@
         config['matchbox'] =       {'check': True, 'exporter': 'v4',  'output': 'Template'}
         config['madweight'] =      {'check': True, 'exporter': 'v4',  'output':'Template'}
 
-        options = config[self._export_format]
+        if self._export_format == 'plugin':
+            options = {'check': self._export_plugin.check, 'exporter':self._export_plugin.exporter, 'output':self._export_plugin.output}
+        else:
+            options = config[self._export_format]
+            
         # check
         if os.path.realpath(self._export_dir) == os.getcwd():
             if len(args) == 0:
@@ -7137,12 +7174,14 @@
         if options['exporter'] == 'v4':
             self._curr_exporter = export_v4.ExportV4Factory(self, noclean, 
                                              group_subprocesses=group_processes)
-            if options['output'] == 'Template':
-                self._curr_exporter.copy_v4template(modelname=self._curr_model.get('name'))
-        if  options['exporter'] == 'cpp' and options['output'] == 'Template':
-            export_cpp.setup_cpp_standalone_dir(self._export_dir, self._curr_model)
-
-        if options['output'] == 'dir' and not os.path.isdir(self._export_dir):
+        elif options['exporter'] == 'cpp':
+            self._curr_exporter = export_cpp.ExportCPPFactory(self, group_subprocesses=group_processes)
+        
+        self._curr_exporter.pass_information_from_cmd(self)
+        
+        if options['output'] == 'Template':
+            self._curr_exporter.copy_template(self._curr_model)
+        elif options['output'] == 'dir' and not os.path.isdir(self._export_dir):
             os.makedirs(self._export_dir)
 
         # Reset _done_export, since we have new directory
@@ -7173,6 +7212,16 @@
                                                                        args=[]):
         """Export a generated amplitude to file."""
 
+        # Define the helas call  writer
+        if self._curr_exporter.exporter == 'cpp':       
+            self._curr_helas_model = helas_call_writers.CPPUFOHelasCallWriter(self._curr_model)
+        elif self._model_v4_path:
+            assert self._curr_exporter.exporter == 'v4'
+            self._curr_helas_model = helas_call_writers.FortranHelasCallWriter(self._curr_model)
+        else:
+            assert self._curr_exporter.exporter == 'v4'
+            self._curr_helas_model = helas_call_writers.FortranUFOHelasCallWriter(self._curr_model)
+
         version = [arg[10:] for arg in args if arg.startswith('--version=')]
         if version:
             version = version[-1]
@@ -7212,16 +7261,18 @@
                     subproc_groups = group_subprocs.SubProcessGroupList()
                     matrix_elements_opts = {'optimized_output':
                                        self.options['loop_optimized_output']}
+                    
+                    grouping_criteria = self._curr_exporter.grouped_mode
                     if non_dc_amps:
                         subproc_groups.extend(\
                           group_subprocs.SubProcessGroup.group_amplitudes(\
-                          non_dc_amps, self._export_format, 
+                          non_dc_amps,grouping_criteria, 
                                      matrix_elements_opts=matrix_elements_opts))
 
                     if dc_amps:
                         dc_subproc_group = \
                                   group_subprocs.DecayChainSubProcessGroup.\
-                                  group_amplitudes(dc_amps, self._export_format,
+                                  group_amplitudes(dc_amps, grouping_criteria,
                                       matrix_elements_opts=matrix_elements_opts)
                         subproc_groups.extend(dc_subproc_group.\
                                     generate_helas_decay_chain_subproc_groups())
@@ -7276,11 +7327,7 @@
         calls = 0
 
         path = self._export_dir
-        if self._export_format in ['standalone_cpp', 'madevent', 'standalone',
-                                   'standalone_msP', 'standalone_msF', 'standalone_rw',
-                                   'matchbox_cpp', 'madweight', 'matchbox']:
-            path = pjoin(path, 'SubProcesses')
-
+            
         cpu_time1 = time.time()
 
         # First treat madevent and pythia8 exports, where we need to
@@ -7288,10 +7335,10 @@
 
         # MadEvent
         if self._export_format == 'madevent':
+            path = pjoin(path, 'SubProcesses')
             calls += self._curr_exporter.export_processes(self._curr_matrix_elements,
-                                                 self._curr_fortran_model)
-            self._curr_exporter.write_global_specs(
-                               self._curr_matrix_elements.get_matrix_elements())
+                                                         self._curr_helas_model)
+
             
             # Write the procdef_mg5.dat file with process info
             card_path = pjoin(path, os.path.pardir, 'SubProcesses', \
@@ -7307,21 +7354,21 @@
                     pass
 
         # Pythia 8
-        if self._export_format == 'pythia8':
+        elif self._export_format == 'pythia8':
             # Output the process files
             process_names = []
             if isinstance(self._curr_matrix_elements, group_subprocs.SubProcessGroupList):
                 for (group_number, me_group) in enumerate(self._curr_matrix_elements):
-                    exporter = export_cpp.generate_process_files_pythia8(\
-                            me_group.get('matrix_elements'), self._curr_cpp_model,
+                    exporter = self._curr_exporter.generate_process_directory(\
+                            me_group.get('matrix_elements'), self._curr_helas_model,
                             process_string = me_group.get('name'),
-                            process_number = group_number, path = path,
+                            process_number = group_number,
                             version = version)
                     process_names.append(exporter.process_name)
             else:
-                exporter = export_cpp.generate_process_files_pythia8(\
-                            self._curr_matrix_elements, self._curr_cpp_model,
-                            process_string = self._generate_info, path = path)
+                exporter =  self._curr_exporter.generate_process_directory(\
+                            self._curr_matrix_elements, self._curr_helas_model,
+                            process_string = self._generate_info, version = version)
                 process_names.append(exporter.process_file_name)
 
             # Output the model parameter and ALOHA files
@@ -7330,44 +7377,14 @@
 
             # Generate the main program file
             filename, make_filename = \
-                      export_cpp.generate_example_file_pythia8(path,
+                      self._curr_exporter.generate_example_file_pythia8(path,
                                                                model_path,
                                                                process_names,
                                                                exporter,
                                                                main_file_name)
-
-        # Pick out the matrix elements in a list
+                      
+                      
         matrix_elements = self._curr_matrix_elements.get_matrix_elements()
-
-        # Fortran MadGraph MadWeight
-        if self._export_format == 'madweight':
-                        
-            if isinstance(self._curr_matrix_elements, group_subprocs.SubProcessGroupList):
-                #remove the merging between electron and muon
-                self._curr_matrix_elements = self._curr_matrix_elements.split_lepton_grouping() 
-                
-                for (group_number, me_group) in enumerate(self._curr_matrix_elements):
-                    calls = calls + \
-                         self._curr_exporter.generate_subprocess_directory_v4(\
-                                me_group, self._curr_fortran_model,
-                                group_number)
-            else:
-                for me_number, me in \
-                   enumerate(self._curr_matrix_elements.get_matrix_elements()):
-                    calls = calls + \
-                            self._curr_exporter.generate_subprocess_directory_v4(\
-                                me, self._curr_fortran_model, me_number)
-
-        # Fortran MadGraph5_aMC@NLO Standalone
-        if self._export_format in ['standalone', 'standalone_msP', 
-                                   'standalone_msF', 'standalone_rw', 'matchbox']:
-            for me in matrix_elements[:]:
-                new_calls = self._curr_exporter.generate_subprocess_directory_v4(\
-                            me, self._curr_fortran_model)
-                if not new_calls:
-                    matrix_elements.remove(me)
-                calls = calls + new_calls
-
         # Just the matrix.f files
         if self._export_format == 'matrix':
             for me in matrix_elements:
@@ -7379,15 +7396,31 @@
                     logger.info("Creating new file %s" % filename)
                 calls = calls + self._curr_exporter.write_matrix_element_v4(\
                     writers.FortranWriter(filename),\
-                    me, self._curr_fortran_model)
+                    me, self._curr_helas_model)
+        elif self._export_format in ['madevent', 'pythia8']:
+            pass
+        # grouping mode
+        elif isinstance(self._curr_matrix_elements, group_subprocs.SubProcessGroupList) and\
+            self._curr_exporter.grouped_mode:
+            modify, self._curr_matrix_elements = self._curr_exporter.modify_grouping(self._curr_matrix_elements)
+            if modify:
+                matrix_elements = self._curr_matrix_elements.get_matrix_elements()
 
-        # C++ standalone
-        if self._export_format in ['standalone_cpp', 'matchbox_cpp']:
-            for me in matrix_elements:
-                export_cpp.generate_subprocess_directory_standalone_cpp(\
-                              me, self._curr_cpp_model,
-                              path = path,
-                              format=self._export_format)
+            for me_number, me in enumerate(self._curr_matrix_elements):
+                calls = calls + \
+                    self._curr_exporter.generate_subprocess_directory(\
+                        me, self._curr_helas_model, me_number)               
+        
+        # ungroup mode
+        else:
+            for nb,me in enumerate(matrix_elements[:]):
+                new_calls = self._curr_exporter.generate_subprocess_directory(\
+                            me, self._curr_helas_model, nb)
+                if  isinstance(new_calls, int):
+                    if new_calls ==0:
+                        matrix_elements.remove(me)
+                    else:
+                        calls = calls + new_calls
 
         cpu_time2 = time.time() - cpu_time1
 
@@ -7416,6 +7449,7 @@
         # Replace the amplitudes with the actual amplitudes from the
         # matrix elements, which allows proper diagram drawing also of
         # decay chain processes
+        matrix_elements = self._curr_matrix_elements.get_matrix_elements()
         self._curr_amps = diagram_generation.AmplitudeList(\
                [me.get('base_amplitude') for me in \
                 matrix_elements])
@@ -7428,79 +7462,42 @@
                              'cpp': self.options['cpp_compiler'],
                              'f2py': self.options['f2py_compiler']}
 
-        
-        if self._export_format in ['madevent', 'standalone', 'standalone_msP', 
-                                   'standalone_msF', 'standalone_rw', 'NLO', 'madweight',
-                                   'matchbox']:
-
-            # For v4 models, copy the model/HELAS information.
-            if self._model_v4_path:
-                logger.info('Copy %s model files to directory %s' % \
+        # Handling of the model.
+        if self._model_v4_path:
+            logger.info('Copy %s model files to directory %s' % \
                             (os.path.basename(self._model_v4_path), self._export_dir))
-                self._curr_exporter.export_model_files(self._model_v4_path)
-                self._curr_exporter.export_helas(pjoin(self._mgme_dir,'HELAS'))
-            else:
-                logger.info('Export UFO model to MG4 format')
-                # wanted_lorentz are the lorentz structures which are
-                # actually used in the wavefunctions and amplitudes in
-                # these processes
-                wanted_lorentz = self._curr_matrix_elements.get_used_lorentz()
-                wanted_couplings = self._curr_matrix_elements.get_used_couplings()
-                # For a unique output of multiple type of exporter need to store this
-                # information.             
-                if hasattr(self, 'previous_lorentz'):
-                    wanted_lorentz = list(set(self.previous_lorentz + wanted_lorentz))
-                    wanted_couplings = list(set(self.previous_couplings + wanted_couplings))
-                    del self.previous_lorentz
-                    del self.previous_couplings
-                if 'store_model' in flaglist:
-                    self.previous_lorentz = wanted_lorentz
-                    self.previous_couplings = wanted_couplings
-                else:
-                    self._curr_exporter.convert_model_to_mg4(self._curr_model,
-                                               wanted_lorentz,
-                                               wanted_couplings)
-        if self._export_format in ['standalone_cpp', 'matchbox_cpp']:
-            logger.info('Export UFO model to C++ format')
+            self._curr_exporter.export_model_files(self._model_v4_path)
+            self._curr_exporter.export_helas(pjoin(self._mgme_dir,'HELAS'))        
+        else:
             # wanted_lorentz are the lorentz structures which are
             # actually used in the wavefunctions and amplitudes in
             # these processes
             wanted_lorentz = self._curr_matrix_elements.get_used_lorentz()
             wanted_couplings = self._curr_matrix_elements.get_used_couplings()
-            export_cpp.convert_model_to_cpp(self._curr_model,
-                                            pjoin(self._export_dir),
-                                            wanted_lorentz,
-                                            wanted_couplings)
-            export_cpp.make_model_cpp(self._export_dir)
-
-
-        elif self._export_format in ['NLO']:
-            ## write fj_lhapdf_opts file
-            devnull = os.open(os.devnull, os.O_RDWR)
-            try:
-                res = misc.call([self.options['lhapdf'], '--version'], \
-                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            except Exception:
-                res = 1
-            if res != 0:
-                logger.info('The value for lhapdf in the current configuration does not ' + \
-                        'correspond to a valid executable.\nPlease set it correctly either in ' + \
-                        'input/mg5_configuration or with "set lhapdf /path/to/lhapdf-config" ' + \
-                        'and regenrate the process. \nTo avoid regeneration, edit the ' + \
-                        ('%s/Cards/amcatnlo_configuration.txt file.\n' % self._export_dir ) + \
-                        'Note that you can still compile and run aMC@NLO with the built-in PDFs\n')
-
-
-
-            self._curr_exporter.finalize_fks_directory( \
-                                           self._curr_matrix_elements,
-                                           self.history,
-                                           not nojpeg,
-                                           online,
-                                           compiler_dict,
-                                           output_dependencies = self.options['output_dependencies'],
-                                           MG5DIR = MG5DIR)
+            # For a unique output of multiple type of exporter need to store this
+            # information.             
+            if hasattr(self, 'previous_lorentz'):
+                wanted_lorentz = list(set(self.previous_lorentz + wanted_lorentz))
+                wanted_couplings = list(set(self.previous_couplings + wanted_couplings))
+                del self.previous_lorentz
+                del self.previous_couplings        
+            if 'store_model' in flaglist:
+                self.previous_lorentz = wanted_lorentz
+                self.previous_couplings = wanted_couplings
+            else:
+                self._curr_exporter.convert_model(self._curr_model, 
+                                               wanted_lorentz,
+                                               wanted_couplings)
+        
+        # move the old options to the flaglist system.
+        if nojpeg:
+            flaglist.append('nojpeg')
+        if online:
+            flaglist.append('online')
             
+
+        if self._export_format in ['NLO']:
+            ## write fj_lhapdf_opts file            
             # Create configuration file [path to executable] for amcatnlo
             filename = os.path.join(self._export_dir, 'Cards', 'amcatnlo_configuration.txt')
             opts_to_keep = ['lhapdf', 'fastjet', 'pythia8_path', 'hwpp_path', 'thepeg_path', 
@@ -7518,15 +7515,12 @@
             self.do_save('options %s' % filename.replace(' ', '\ '), check=False,
                          to_keep={'mg5_path':MG5DIR})
 
-        if self._export_format in ['madevent', 'standalone', 'standalone_msP', 'standalone_msF',
-                                   'standalone_rw', 'madweight', 'matchbox']:
+        # Dedicated finalize function.
+        self._curr_exporter.finalize(self._curr_matrix_elements,
+                                    self.history,
+                                    self.options,
+                                    flaglist)
 
-            self._curr_exporter.finalize_v4_directory( \
-                                           self._curr_matrix_elements,
-                                           self.history,
-                                           not nojpeg,
-                                           online,
-                                           compiler_dict)
 
         if self._export_format in ['madevent', 'standalone', 'standalone_cpp','madweight', 'matchbox']:
             logger.info('Output to directory ' + self._export_dir + ' done.')
@@ -7593,8 +7587,6 @@
                 model = import_ufo.import_model(modelname, decay=True)
         else:
             self._curr_model = model
-            self._curr_fortran_model = \
-                  helas_call_writers.FortranUFOHelasCallWriter(self._curr_model)
         if not isinstance(model, model_reader.ModelReader):
             model = model_reader.ModelReader(model)
 
@@ -7663,7 +7655,7 @@
                     elif value < 0:
                         raise Exception, 'Partial width for %s > %s negative: %s' % \
                                        (particle.get('name'), ' '.join([p.get('name') for p in mode]), value)
-                    elif value < 0.1 and particle['color'] !=1:
+                    elif 0 < value < 0.1 and particle['color'] !=1:
                         logger.warning("partial width of particle %s lower than QCD scale:%s. Set it to zero. (%s)" \
                                    % (particle.get('name'), value, decay_to))
                         value = 0
@@ -7701,7 +7693,7 @@
             decay_dir = pjoin(path,'temp_decay')
             logger_mg.info('More info in temporary files:\n    %s/index.html' % (decay_dir))
             with misc.MuteLogger(['madgraph','ALOHA','cmdprint','madevent'], [40,40,40,40]):
-                self.exec_cmd('output %s -f' % decay_dir)
+                self.exec_cmd('output %s -f' % decay_dir,child=False)
                 # Need to write the correct param_card in the correct place !!!
                 if os.path.exists(opts['output']):
                     files.cp(opts['output'], pjoin(decay_dir, 'Cards', 'param_card.dat'))
@@ -7746,7 +7738,7 @@
             for BR in param['decay'].decay_table[pid]:
                 if len(BR.lhacode) == 3 and skip_2body:
                     continue
-                if BR.value * width <0.1 and particle['color'] !=1:
+                if 0 < BR.value * width <0.1 and particle['color'] !=1:
                     logger.warning("partial width of particle %s lower than QCD scale:%s. Set it to zero. (%s)" \
                                    % (particle.get('name'), BR.value * width, BR.lhacode[1:]))
                                      

=== modified file 'madgraph/interface/master_interface.py'
--- madgraph/interface/master_interface.py	2016-07-20 22:43:24 +0000
+++ madgraph/interface/master_interface.py	2016-08-18 22:31:39 +0000
@@ -80,6 +80,9 @@
     def debug_link_to_command(self):
         """redefine all the command to call directly the appropriate child"""
         
+        if hasattr(self, 'plugin') and self.plugin:
+            return True
+        
         correct = True
         # function which should be self.cmd dependent but which doesn't start
         # by do_xxxx, help_xxx, check_xxxx or complete_xxx 
@@ -114,7 +117,7 @@
         # in the Switcher or in one of the MasterClass
         define = {}
         for mother in MasterCmd.__mro__:
-            if mother.__name__ in ['Cmd', 'BasicCmd', 'ExtendedCmd']:
+            if mother.__name__ in ['OriginalCmd', 'BasicCmd', 'CmdExtended', 'Cmd']:
                 continue
             
             
@@ -134,9 +137,8 @@
         # Do the same for the WEb MasterClass
         define = {}
         for mother in MasterCmdWeb.__mro__:
-            if mother.__name__ in ['Cmd', 'BasicCmd', 'ExtendedCmd']:
+            if mother.__name__ in ['OriginalCmd', 'BasicCmd', 'CmdExtended', 'Cmd']:
                 continue
-            
             for data in mother.__dict__:
                 #check if  define in Switcher
                 if data in Switcher.__dict__ or data.startswith('__'):

=== modified file 'madgraph/interface/reweight_interface.py'
--- madgraph/interface/reweight_interface.py	2016-07-29 15:27:30 +0000
+++ madgraph/interface/reweight_interface.py	2016-08-18 22:31:39 +0000
@@ -853,6 +853,9 @@
         
         return 0
     
+    def do_compute_widths(self, line):
+        return self.mother.do_compute_widths(line)
+    
     def calculate_weight(self, event, space=None):
         """space defines where to find the calculator (in multicore)"""
         

=== modified file 'madgraph/iolibs/export_cpp.py'
--- madgraph/iolibs/export_cpp.py	2016-04-15 11:14:25 +0000
+++ madgraph/iolibs/export_cpp.py	2016-08-18 22:31:39 +0000
@@ -35,9 +35,11 @@
 import madgraph.iolibs.file_writers as writers
 import madgraph.iolibs.template_files as template_files
 import madgraph.iolibs.ufo_expression_parsers as parsers
+import madgraph.various.banner as banner_mod
 from madgraph import MadGraph5Error, InvalidCmd, MG5DIR
 from madgraph.iolibs.files import cp, ln, mv
 
+from madgraph.iolibs.export_v4 import VirtualExporter
 import madgraph.various.misc as misc
 
 import aloha.create_aloha as create_aloha
@@ -48,132 +50,6 @@
 pjoin = os.path.join
 
 
-
-#===============================================================================
-# setup_cpp_standalone_dir
-#===============================================================================
-def setup_cpp_standalone_dir(dirpath, model):
-    """Prepare export_dir as standalone_cpp directory, including:
-    src (for RAMBO, model and ALOHA files + makefile)
-    lib (with compiled libraries from src)
-    SubProcesses (with check_sa.cpp + makefile and Pxxxxx directories)
-    """
-
-    cwd = os.getcwd()
-
-    try:
-        os.mkdir(dirpath)
-    except os.error as error:
-        logger.warning(error.strerror + " " + dirpath)
-    
-    try:
-        os.chdir(dirpath)
-    except os.error:
-        logger.error('Could not cd to directory %s' % dirpath)
-        return 0
-
-    logger.info('Creating subdirectories in directory %s' % dirpath)
-
-    try:
-        os.mkdir('src')
-    except os.error as error:
-        logger.warning(error.strerror + " " + dirpath)
-    
-    try:
-        os.mkdir('lib')
-    except os.error as error:
-        logger.warning(error.strerror + " " + dirpath)
-    
-    try:
-        os.mkdir('Cards')
-    except os.error as error:
-        logger.warning(error.strerror + " " + dirpath)
-    
-    try:
-        os.mkdir('SubProcesses')
-    except os.error as error:
-        logger.warning(error.strerror + " " + dirpath)
-
-    # Write param_card
-    open(os.path.join("Cards","param_card.dat"), 'w').write(\
-        model.write_param_card())
-
-    src_files = ['rambo.h', 'rambo.cc', 'read_slha.h', 'read_slha.cc']
-    
-    # Copy the needed src files
-    for f in src_files:
-        cp(_file_path + 'iolibs/template_files/' + f, 'src')
-
-    # Copy src Makefile
-    makefile = read_template_file('Makefile_sa_cpp_src') % \
-                           {'model': ProcessExporterCPP.get_model_name(model.get('name'))}
-    open(os.path.join('src', 'Makefile'), 'w').write(makefile)
-
-    # Copy SubProcesses files
-    cp(_file_path + 'iolibs/template_files/check_sa.cpp', 'SubProcesses')
-
-    # Copy SubProcesses Makefile
-    makefile = read_template_file('Makefile_sa_cpp_sp') % \
-                                    {'model': ProcessExporterCPP.get_model_name(model.get('name'))}
-    open(os.path.join('SubProcesses', 'Makefile'), 'w').write(makefile)
-
-    # Return to original PWD
-    os.chdir(cwd)
-
-#===============================================================================
-# generate_subprocess_directory_standalone_cpp
-#===============================================================================
-def generate_subprocess_directory_standalone_cpp(matrix_element,
-                                                 cpp_helas_call_writer,
-                                                 path = os.getcwd(),
-                                                 format='standalone_cpp'):
-
-    """Generate the Pxxxxx directory for a subprocess in C++ standalone,
-    including the necessary .h and .cc files"""
-
-    cwd = os.getcwd()
-    # Create the process_exporter
-    if format == 'standalone_cpp':
-        process_exporter_cpp = ProcessExporterCPP(matrix_element,
-                                              cpp_helas_call_writer)
-    elif format == 'matchbox_cpp':
-        process_exporter_cpp = ProcessExporterMatchbox(matrix_element,
-                                              cpp_helas_call_writer)
-    else:
-        raise Exception, 'Unrecognized format %s' % format
-    
-    # Create the directory PN_xx_xxxxx in the specified path
-    dirpath = os.path.join(path, \
-                   "P%d_%s" % (process_exporter_cpp.process_number,
-                               process_exporter_cpp.process_name))
-    try:
-        os.mkdir(dirpath)
-    except os.error as error:
-        logger.warning(error.strerror + " " + dirpath)
-
-    try:
-        os.chdir(dirpath)
-    except os.error:
-        logger.error('Could not cd to directory %s' % dirpath)
-        return 0
-
-    logger.info('Creating files in directory %s' % dirpath)
-
-    process_exporter_cpp.path = dirpath
-    # Create the process .h and .cc files
-    process_exporter_cpp.generate_process_files()
-
-    linkfiles = ['check_sa.cpp', 'Makefile']
-
-    
-    for file in linkfiles:
-        ln('../%s' % file)
-
-    # Return to original PWD
-    os.chdir(cwd)
-
-    return
-
 def make_model_cpp(dir_path):
     """Make the model library in a C++ standalone directory"""
 
@@ -182,16 +58,16 @@
     logger.info("Running make for src")
     misc.compile(cwd=source_dir)
 
-#===============================================================================
-# ProcessExporterCPP
-#===============================================================================
-class ProcessExporterCPP(object):
+
+class OneProcessExporterCPP(object):
     """Class to take care of exporting a set of matrix elements to
     C++ format."""
 
     # Static variables (for inheritance)
     process_dir = '.'
     include_dir = '.'
+    template_path = os.path.join(_file_path, 'iolibs', 'template_files')
+    __template_path = os.path.join(_file_path, 'iolibs', 'template_files') 
     process_template_h = 'cpp_process_h.inc'
     process_template_cc = 'cpp_process_cc.inc'
     process_class_template = 'cpp_process_class.inc'
@@ -217,7 +93,7 @@
             self.matrix_elements = matrix_elements
         else:
             raise base_objects.PhysicsObject.PhysicsObjectError,\
-                  "Wrong object type for matrix_elements"
+                  "Wrong object type for matrix_elements: %s" % type(matrix_elements)
 
         if not self.matrix_elements:
             raise MadGraph5Error("No matrix elements to export")
@@ -305,8 +181,32 @@
             self.amplitudes = helas_objects.HelasMatrixElement({\
                 'diagrams': helas_objects.HelasDiagramList([diagram])})
 
+    #===============================================================================
+    # Global helper methods
+    #===============================================================================
+    @classmethod
+    def read_template_file(cls, filename, classpath=False):
+        """Open a template file and return the contents."""
+         
+        if isinstance(filename, tuple):
+            file_path = filename[0]
+            filename = filename[1]
+        elif isinstance(filename, str):
+            if classpath:
+                file_path = cls.__template_path
+            else:
+                file_path = cls.template_path
+        else:
+            raise MadGraph5Error('Argument should be string or tuple.')
+        
+        return open(os.path.join(file_path, filename)).read()
+        
+        
+                  
+
+
+
     # Methods for generation of process files for C++
-
     def generate_process_files(self):
         """Generate the .h and .cc files needed for C++, for the
         processes described by multi_matrix_element"""
@@ -335,13 +235,14 @@
 
         
         return replace_dict
+    
     #===========================================================================
     # write_process_h_file
     #===========================================================================
     def write_process_h_file(self, writer):
         """Write the class definition (.h) file for the process"""
         
-        if not isinstance(writer, writers.CPPWriter):
+        if writer and not isinstance(writer, writers.CPPWriter):
             raise writers.CPPWriter.CPPWriterError(\
                 "writer not CPPWriter")
 
@@ -362,11 +263,12 @@
         process_class_definitions = self.get_process_class_definitions()
         replace_dict['process_class_definitions'] = process_class_definitions
 
-        file = read_template_file(self.process_template_h) % replace_dict
-
-        # Write the file
-        writer.writelines(file)
-
+        if writer:
+            file = self.read_template_file(self.process_template_h) % replace_dict
+            # Write the file
+            writer.writelines(file)
+        else:
+            return replace_dict
     #===========================================================================
     # write_process_cc_file
     #===========================================================================
@@ -374,8 +276,9 @@
         """Write the class member definition (.cc) file for the process
         described by matrix_element"""
 
-        if not isinstance(writer, writers.CPPWriter):
-            raise writers.CPPWriter.CPPWriterError(\
+        if writer:
+            if not isinstance(writer, writers.CPPWriter):
+                raise writers.CPPWriter.CPPWriterError(\
                 "writer not CPPWriter")
 
         replace_dict = self.get_default_converter()
@@ -397,15 +300,17 @@
         replace_dict['process_function_definitions'] = \
                                                    process_function_definitions
 
-        file = read_template_file(self.process_template_cc) % replace_dict
-
-        # Write the file
-        writer.writelines(file)
-
+        if writer:
+            file = self.read_template_file(self.process_template_cc) % replace_dict
+            # Write the file
+            writer.writelines(file)
+        else:
+            return replace_dict
+        
     #===========================================================================
     # Process export helper functions
     #===========================================================================
-    def get_process_class_definitions(self):
+    def get_process_class_definitions(self, write=True):
         """The complete class definition for the process"""
 
         replace_dict = {}
@@ -472,11 +377,12 @@
                                       replace("0_", "") \
                                       for me in self.matrix_elements])
 
-
-        file = read_template_file(self.process_class_template) % replace_dict
-
-        return file
-
+        if write:
+            file = self.read_template_file(self.process_class_template) % replace_dict
+            return file
+        else:
+            return replace_dict
+        
     def get_process_function_definitions(self):
         """The complete Pythia 8 class definition for the process"""
 
@@ -510,7 +416,7 @@
                                   self.get_all_sigmaKin_lines(color_amplitudes,
                                                               'CPPProcess')
 
-        file = read_template_file(self.process_definition_template) %\
+        file = self.read_template_file(self.process_definition_template) %\
                replace_dict
 
         return file
@@ -584,7 +490,7 @@
         return ret_lines
         
 
-    def get_calculate_wavefunctions(self, wavefunctions, amplitudes):
+    def get_calculate_wavefunctions(self, wavefunctions, amplitudes, write=True):
         """Return the lines for optimized calculation of the
         wavefunctions for all subprocesses"""
 
@@ -603,13 +509,15 @@
         replace_dict['amplitude_calls'] = "\n".join(\
             self.helas_call_writer.get_amplitude_calls(amplitudes))
 
-        file = read_template_file(self.process_wavefunction_template) % \
+        if write:
+            file = self.read_template_file(self.process_wavefunction_template) % \
                 replace_dict
-
-        return file
+            return file
+        else:
+            return replace_dict
        
 
-    def get_sigmaKin_lines(self, color_amplitudes):
+    def get_sigmaKin_lines(self, color_amplitudes, write=True):
         """Get sigmaKin_lines for function definition for Pythia 8 .cc file"""
 
         
@@ -667,22 +575,27 @@
                     
             replace_dict['get_mirror_matrix_lines'] = mirror_matrix_lines
 
-
-            file = \
-                 read_template_file(\
+            if write:
+                file = \
+                 self.read_template_file(\
                             self.process_sigmaKin_function_template) %\
                             replace_dict
-
-            return file
-
+                return file
+            else:
+                return replace_dict
         else:
             ret_lines = "// Call the individual sigmaKin for each process\n"
-            return ret_lines + \
+            ret_lines = ret_lines + \
                    "\n".join(["sigmaKin_%s();" % \
                               me.get('processes')[0].shell_string().\
                               replace("0_", "") for \
                               me in self.matrix_elements])
-
+            if write:
+                return ret_lines 
+            else:
+                replace_dict['get_mirror_matrix_lines'] = ret_lines
+                return replace_dict
+                
     def get_all_sigmaKin_lines(self, color_amplitudes, class_name):
         """Get sigmaKin_process for all subprocesses for Pythia 8 .cc file"""
 
@@ -705,7 +618,7 @@
         return "\n".join(ret_lines)
 
 
-    def get_sigmaKin_single_process(self, i, matrix_element):
+    def get_sigmaKin_single_process(self, i, matrix_element, write=True):
         """Write sigmaKin for each process"""
 
         # Write sigmaKin for the process
@@ -731,14 +644,16 @@
         # Extract denominator
         replace_dict['den_factor'] = matrix_element.get_denominator_factor()
 
-        file = \
-         read_template_file('cpp_process_sigmaKin_subproc_function.inc') %\
-         replace_dict
-
-        return file
-
+        if write:
+            file = \
+            self.read_template_file('cpp_process_sigmaKin_subproc_function.inc') %\
+            replace_dict
+            return file
+        else:
+            return replace_dict
+        
     def get_matrix_single_process(self, i, matrix_element, color_amplitudes,
-                                  class_name):
+                                  class_name, write=True):
         """Write matrix() for each process"""
 
         # Write matrix() for the process
@@ -785,11 +700,13 @@
         #specific exporter hack
         replace_dict =  self.get_class_specific_definition_matrix(replace_dict, matrix_element)
         
-        file = read_template_file(self.single_process_template) % \
+        if write:
+            file = self.read_template_file(self.single_process_template) % \
                 replace_dict
-
-        return file
-
+            return file
+        else:
+            return replace_dict
+        
     def get_class_specific_definition_matrix(self, converter, matrix_element):
         """place to add some specific hack to a given exporter.
         Please always use Super in that case"""
@@ -945,45 +862,9 @@
             res_list.append(res)
 
         return "\n".join(res_list)
-
-    @staticmethod
-    def get_model_name(name):
-        """Replace - with _, + with _plus_ in a model name."""
-
-        name = name.replace('-', '_')
-        name = name.replace('+', '_plus_')
-        return name
-
-#===============================================================================
-# generate_process_files_pythia8
-#===============================================================================
-def generate_process_files_pythia8(multi_matrix_element, cpp_helas_call_writer,
-                                   process_string = "",
-                                   process_number = 0, path = os.getcwd(),
-                                   version='8.2'):
-
-    """Generate the .h and .cc files needed for Pythia 8, for the
-    processes described by multi_matrix_element"""
-
-    process_exporter_pythia8 = ProcessExporterPythia8(multi_matrix_element,
-                                                      cpp_helas_call_writer,
-                                                      process_string,
-                                                      process_number,
-                                                      path,
-                                                      version=version)
-
-    # Set process directory
-    model = process_exporter_pythia8.model
-    model_name = process_exporter_pythia8.model_name
-    process_exporter_pythia8.process_dir = \
-                   'Processes_%(model)s' % {'model': \
-                    model_name}
-    process_exporter_pythia8.include_dir = process_exporter_pythia8.process_dir
-    process_exporter_pythia8.generate_process_files()
-    return process_exporter_pythia8
-
-
-class ProcessExporterMatchbox(ProcessExporterCPP):
+    
+
+class OneProcessExporterMatchbox(OneProcessExporterCPP):
     """Class to take care of exporting a set of matrix elements to
     Matchbox format."""
 
@@ -1007,7 +888,7 @@
     def get_class_specific_definition_matrix(self, converter, matrix_element):
         """ """
         
-        converter = super(ProcessExporterMatchbox, self).get_class_specific_definition_matrix(converter, matrix_element)
+        converter = super(OneProcessExporterMatchbox, self).get_class_specific_definition_matrix(converter, matrix_element)
         
         # T(....)
         converter['color_sting_lines'] = \
@@ -1085,7 +966,7 @@
 #===============================================================================
 # ProcessExporterPythia8
 #===============================================================================
-class ProcessExporterPythia8(ProcessExporterCPP):
+class OneProcessExporterPythia8(OneProcessExporterCPP):
     """Class to take care of exporting a set of matrix elements to
     Pythia 8 format."""
 
@@ -1096,6 +977,8 @@
     process_definition_template = 'pythia8_process_function_definitions.inc'
     process_wavefunction_template = 'pythia8_process_wavefunctions.inc'
     process_sigmaKin_function_template = 'pythia8_process_sigmaKin_function.inc'
+    template_path = os.path.join(_file_path, 'iolibs', 'template_files', 'pythia8')     
+
 
     def __init__(self, *args, **opts):
         """Set process class name"""
@@ -1105,7 +988,7 @@
             del opts['version']
         else:
             self.version='8.2'
-        super(ProcessExporterPythia8, self).__init__(*args, **opts)
+        super(OneProcessExporterPythia8, self).__init__(*args, **opts)
 
         # Check if any processes are not 2->1,2,3
         for me in self.matrix_elements:
@@ -1135,7 +1018,7 @@
     #===========================================================================
     # Process export helper functions
     #===========================================================================
-    def get_process_class_definitions(self):
+    def get_process_class_definitions(self, write=True):
         """The complete Pythia 8 class definition for the process"""
 
         replace_dict = self.get_default_converter()
@@ -1199,12 +1082,13 @@
                                       replace("0_", "") \
                                       for me in self.matrix_elements])
 
-
-        file = read_template_file('pythia8_process_class.inc') % replace_dict
-
-        return file
-
-    def get_process_function_definitions(self):
+        if write:
+            file = self.read_template_file('pythia8_process_class.inc') % replace_dict
+            return file
+        else:
+            return replace_dict
+
+    def get_process_function_definitions(self, write=True):
         """The complete Pythia 8 class definition for the process"""
 
 
@@ -1239,11 +1123,12 @@
         replace_dict['all_sigmaKin'] = \
                                   self.get_all_sigmaKin_lines(color_amplitudes,
                                                               self.process_name)
-
-        file = read_template_file('pythia8_process_function_definitions.inc') %\
+        if write:
+            file = self.read_template_file('pythia8_process_function_definitions.inc') %\
                replace_dict
-
-        return file
+            return file
+        else:
+            return replace_dict
 
     def get_process_influx(self):
         """Return process file name for the process in matrix_element"""
@@ -1292,6 +1177,19 @@
 
         return 
 
+    #===============================================================================
+    # Global helper methods
+    #===============================================================================
+    @classmethod
+    def read_template_file(cls, filename):
+        """Open a template file and return the contents."""
+             
+        try:
+            return super(OneProcessExporterPythia8, cls).read_template_file(filename)     
+        except:
+            return super(OneProcessExporterPythia8, cls).read_template_file(filename, classpath=True)
+
+        
     def get_id_masses(self, process):
         """Return the lines which define the ids for the final state particles,
         for the Pythia phase space"""
@@ -1693,19 +1591,295 @@
 
 
 #===============================================================================
-# Global helper methods
+# ProcessExporterCPP
 #===============================================================================
-def read_template_file(filename):
-    """Open a template file and return the contents."""
-    try:
-        return open(os.path.join(_file_path, \
-                             'iolibs', 'template_files', 'pythia8',
-                             filename)).read()
-    except:
-        return open(os.path.join(_file_path, \
-                             'iolibs', 'template_files',
-                             filename)).read()        
-
+class ProcessExporterCPP(VirtualExporter):
+    """Class to take care of exporting a set of matrix elements to
+    Fortran (v4) format."""
+
+    grouped_mode = False
+    exporter = 'cpp'
+
+    default_opt = {'clean': False, 'complex_mass':False,
+                        'export_format':'madevent', 'mp': False,
+                        'v5_model': True
+                        }
+    
+    oneprocessclass = OneProcessExporterCPP
+    s= _file_path + 'iolibs/template_files/'
+    from_template = {'src': [s+'rambo.h', s+'rambo.cc', s+'read_slha.h', s+'read_slha.cc'],
+                     'SubProcesses': [s+'check_sa.cpp']}
+    to_link_in_P = ['check_sa.cpp', 'Makefile']
+    template_src_make = pjoin(_file_path, 'iolibs', 'template_files','Makefile_sa_cpp_src')
+    template_Sub_make = template_src_make
+    
+    
+
+    def __init__(self, dir_path = "", opt=None):
+        """Initiate the ProcessExporterFortran with directory information"""
+        self.mgme_dir = MG5DIR
+        self.dir_path = dir_path
+        self.model = None
+
+        self.opt = dict(self.default_opt)
+        if opt:
+            self.opt.update(opt)
+        
+        #place holder to pass information to the run_interface
+        self.proc_characteristic = banner_mod.ProcCharacteristic()    
+
+    def copy_template(self, model):
+        """Prepare export_dir as standalone_cpp directory, including:
+        src (for RAMBO, model and ALOHA files + makefile)
+        lib (with compiled libraries from src)
+        SubProcesses (with check_sa.cpp + makefile and Pxxxxx directories)
+        """
+
+        try:
+            os.mkdir(self.dir_path)
+        except os.error as error:
+            logger.warning(error.strerror + " " + self.dir_path)
+        
+        with misc.chdir(self.dir_path):
+            logger.info('Creating subdirectories in directory %s' % self.dir_path)
+
+            for d in ['src', 'lib', 'Cards', 'SubProcesses']:
+                try:
+                    os.mkdir(d)
+                except os.error as error:
+                    logger.warning(error.strerror + " " + self.dir_path)
+    
+            # Write param_card
+            open(os.path.join("Cards","param_card.dat"), 'w').write(\
+                                                       model.write_param_card())
+
+    
+            # Copy the needed src files
+            for key in self.from_template:
+                for f in self.from_template[key]:
+                    cp(f, key)
+
+            # Copy src Makefile
+            makefile = self.read_template_file('Makefile_sa_cpp_src') % \
+                           {'model': self.get_model_name(model.get('name'))}
+            open(os.path.join('src', 'Makefile'), 'w').write(makefile)
+
+            # Copy SubProcesses Makefile
+            makefile = self.read_template_file('Makefile_sa_cpp_sp') % \
+                                    {'model': self.get_model_name(model.get('name'))}
+            open(os.path.join('SubProcesses', 'Makefile'), 'w').write(makefile)
+
+    #===========================================================================
+    # Helper functions
+    #===========================================================================
+    def modify_grouping(self, matrix_element):
+        """allow to modify the grouping (if grouping is in place)
+            return two value:
+            - True/False if the matrix_element was modified
+            - the new(or old) matrix element"""
+            
+        return False, matrix_element
+
+
+
+    def convert_model(self, model, wanted_lorentz = [],
+                         wanted_couplings = []):
+        # create the model parameter files
+        model_builder = UFOModelConverterCPP(model,
+                                         os.path.join(self.dir_path, 'src'),
+                                         wanted_lorentz,
+                                         wanted_couplings)
+        model_builder.write_files()
+    
+    def compile_model(self):
+        make_model_cpp(self.dir_path)
+    
+    @classmethod
+    def read_template_file(cls, *args, **opts):
+        """Open a template file and return the contents."""
+         
+        return cls.oneprocessclass.read_template_file(*args, **opts) 
+        
+    #===============================================================================
+    # generate_subprocess_directory
+    #===============================================================================
+    def generate_subprocess_directory(self, matrix_element, cpp_helas_call_writer,
+                                      proc_number=None):
+        """Generate the Pxxxxx directory for a subprocess in C++ standalone,
+        including the necessary .h and .cc files"""
+
+        
+        process_exporter_cpp = self.oneprocessclass(matrix_element,cpp_helas_call_writer)
+
+        
+        # Create the directory PN_xx_xxxxx in the specified path
+        dirpath = pjoin(self.dir_path, 'SubProcesses', "P%d_%s" % (process_exporter_cpp.process_number, 
+                                             process_exporter_cpp.process_name))
+        try:
+            os.mkdir(dirpath)
+        except os.error as error:
+            logger.warning(error.strerror + " " + dirpath)
+    
+        with misc.chdir(dirpath):
+            logger.info('Creating files in directory %s' % dirpath)
+            process_exporter_cpp.path = dirpath
+            # Create the process .h and .cc files
+            process_exporter_cpp.generate_process_files()
+            for file in self.to_link_in_P:
+                ln('../%s' % file)    
+        return
+
+    @staticmethod
+    def get_model_name(name):
+        """Replace - with _, + with _plus_ in a model name."""
+
+        name = name.replace('-', '_')
+        name = name.replace('+', '_plus_')
+        return name
+    
+    def finalize(self, *args, **opts):
+        """ """
+        self.compile_model()
+        pass
+
+class ProcessExporterMatchbox(ProcessExporterCPP):
+    oneprocessclass = OneProcessExporterMatchbox
+
+class ProcessExporterPythia8(ProcessExporterCPP):
+    oneprocessclass = OneProcessExporterPythia8
+    grouped_mode = 'madevent'
+     
+    #===============================================================================
+    # generate_process_files_pythia8
+    #===============================================================================
+    def generate_process_directory(self, multi_matrix_element, cpp_helas_call_writer,
+                                   process_string = "",
+                                   process_number = 0,
+                                   version='8.2'):
+
+        """Generate the .h and .cc files needed for Pythia 8, for the
+        processes described by multi_matrix_element"""
+
+        process_exporter_pythia8 = OneProcessExporterPythia8(multi_matrix_element,
+                                                      cpp_helas_call_writer,
+                                                      process_string,
+                                                      process_number,
+                                                      self.dir_path,
+                                                      version=version)
+    
+        # Set process directory
+        model = process_exporter_pythia8.model
+        model_name = process_exporter_pythia8.model_name
+        process_exporter_pythia8.process_dir = \
+                       'Processes_%(model)s' % {'model': \
+                        model_name}
+        process_exporter_pythia8.include_dir = process_exporter_pythia8.process_dir
+        process_exporter_pythia8.generate_process_files()
+        return process_exporter_pythia8
+
+    #===============================================================================
+    # generate_example_file_pythia8
+    #===============================================================================
+    @staticmethod
+    def generate_example_file_pythia8(path,
+                                       model_path,
+                                       process_names,
+                                       exporter,
+                                       main_file_name = "",
+                                       example_dir = "examples",
+                                       version="8.2"):
+        """Generate the main_model_name.cc file and Makefile in the examples dir"""
+    
+        filepath = os.path.join(path, example_dir)
+        if not os.path.isdir(filepath):
+            os.makedirs(filepath)
+    
+        replace_dict = {}
+    
+        # Extract version number and date from VERSION file
+        info_lines = get_mg5_info_lines()
+        replace_dict['info_lines'] = info_lines
+    
+        # Extract model name
+        replace_dict['model_name'] = exporter.model_name
+    
+        # Extract include line
+        replace_dict['include_lines'] = \
+                              "\n".join(["#include \"%s.h\"" % proc_name \
+                                         for proc_name in process_names])
+    
+        # Extract setSigmaPtr line
+        replace_dict['sigma_pointer_lines'] = \
+               "\n".join(["pythia.setSigmaPtr(new %s());" % proc_name \
+                         for proc_name in process_names])
+    
+        # Extract param_card path
+        replace_dict['param_card'] = os.path.join(os.path.pardir,model_path,
+                                                  "param_card_%s.dat" % \
+                                                  exporter.model_name)
+    
+        # Create the example main file
+        if version =="8.2":
+            template_path = 'pythia8.2_main_example_cc.inc'
+            makefile_path = 'pythia8.2_main_makefile.inc'
+            replace_dict['include_prefix'] = 'Pythia8/'
+        else:
+            template_path = 'pythia8_main_example_cc.inc'
+            makefile_path = 'pythia8_main_makefile.inc'
+            replace_dict['include_prefix'] = ''
+        
+        
+        file = ProcessExporterPythia8.read_template_file(template_path) % \
+               replace_dict
+    
+        if not main_file_name:
+            num = 1
+            while os.path.exists(os.path.join(filepath,
+                                        'main_%s_%i.cc' % (exporter.model_name, num))) or \
+                  os.path.exists(os.path.join(filepath,
+                                        'main_%s_%i' % (exporter.model_name, num))):
+                num += 1
+            main_file_name = str(num)
+    
+        main_file = 'main_%s_%s' % (exporter.model_name,
+                                    main_file_name)
+    
+        main_filename = os.path.join(filepath, main_file + '.cc')
+    
+        # Write the file
+        writers.CPPWriter(main_filename).writelines(file)
+    
+        replace_dict = {}
+    
+        # Extract version number and date from VERSION file
+        replace_dict['info_lines'] = get_mg5_info_lines()
+    
+        replace_dict['main_file'] = main_file
+    
+        replace_dict['process_dir'] = model_path
+    
+        replace_dict['include_dir'] = exporter.include_dir
+    
+        # Create the makefile
+        file = ProcessExporterPythia8.read_template_file(makefile_path) % replace_dict
+    
+        make_filename = os.path.join(filepath, 'Makefile_%s_%s' % \
+                                (exporter.model_name, main_file_name))
+    
+        # Write the file
+        open(make_filename, 'w').write(file)
+    
+        logger.info("Created files %s and %s in directory %s" \
+                    % (os.path.split(main_filename)[-1],
+                       os.path.split(make_filename)[-1],
+                       os.path.split(make_filename)[0]))
+        return main_file, make_filename
+
+    def convert_model(self,*args,**opts):
+        pass
+    def finalize(self, *args, **opts):
+        pass
+  
 def get_mg5_info_lines():
     """Return info lines for MG5, suitable to place at beginning of
     Fortran files"""
@@ -1753,21 +1927,6 @@
     return res_str + '*'
 
 #===============================================================================
-# Routines to export/output UFO models in C++ format
-#===============================================================================
-
-def convert_model_to_cpp(model, output_dir, wanted_lorentz = [],
-                         wanted_couplings = []):
-    """Create a full valid Pythia 8 model from an MG5 model (coming from UFO)"""
-
-    # create the model parameter files
-    model_builder = UFOModelConverterCPP(model,
-                                         os.path.join(output_dir, 'src'),
-                                         wanted_lorentz,
-                                         wanted_couplings)
-    model_builder.write_files()
-
-#===============================================================================
 # UFOModelConverterCPP
 #===============================================================================
 
@@ -1998,9 +2157,9 @@
             replace_dict['include_prefix'] = ''
 
 
-        file_h = read_template_file(self.param_template_h) % \
+        file_h = self.read_template_file(self.param_template_h) % \
                  replace_dict
-        file_cc = read_template_file(self.param_template_cc) % \
+        file_cc = self.read_template_file(self.param_template_cc) % \
                   replace_dict
         
         return file_h, file_cc
@@ -2109,8 +2268,8 @@
         replace_dict['function_declarations'] = '\n'.join(template_h_files)
         replace_dict['function_definitions'] = '\n'.join(template_cc_files)
 
-        file_h = read_template_file(self.aloha_template_h) % replace_dict
-        file_cc = read_template_file(self.aloha_template_cc) % replace_dict
+        file_h = self.read_template_file(self.aloha_template_h) % replace_dict
+        file_cc = self.read_template_file(self.aloha_template_cc) % replace_dict
 
         # Write the files
         writers.CPPWriter(model_h_file).writelines(file_h)
@@ -2173,105 +2332,14 @@
 
         return line
 
-#===============================================================================
-# generate_example_file_pythia8
-#===============================================================================
-def generate_example_file_pythia8(path,
-                                   model_path,
-                                   process_names,
-                                   exporter,
-                                   main_file_name = "",
-                                   example_dir = "examples",
-                                   version="8.2"):
-    """Generate the main_model_name.cc file and Makefile in the examples dir"""
-
-    filepath = os.path.join(path, example_dir)
-    if not os.path.isdir(filepath):
-        os.makedirs(filepath)
-
-    replace_dict = {}
-
-    # Extract version number and date from VERSION file
-    info_lines = get_mg5_info_lines()
-    replace_dict['info_lines'] = info_lines
-
-    # Extract model name
-    replace_dict['model_name'] = exporter.model_name
-
-    # Extract include line
-    replace_dict['include_lines'] = \
-                          "\n".join(["#include \"%s.h\"" % proc_name \
-                                     for proc_name in process_names])
-
-    # Extract setSigmaPtr line
-    replace_dict['sigma_pointer_lines'] = \
-           "\n".join(["pythia.setSigmaPtr(new %s());" % proc_name \
-                     for proc_name in process_names])
-
-    # Extract param_card path
-    replace_dict['param_card'] = os.path.join(os.path.pardir,model_path,
-                                              "param_card_%s.dat" % \
-                                              exporter.model_name)
-
-    # Create the example main file
-    if version =="8.2":
-        template_path = 'pythia8.2_main_example_cc.inc'
-        makefile_path = 'pythia8.2_main_makefile.inc'
-        replace_dict['include_prefix'] = 'Pythia8/'
-    else:
-        template_path = 'pythia8_main_example_cc.inc'
-        makefile_path = 'pythia8_main_makefile.inc'
-        replace_dict['include_prefix'] = ''
-    
-    
-    file = read_template_file(template_path) % \
-           replace_dict
-
-    if not main_file_name:
-        num = 1
-        while os.path.exists(os.path.join(filepath,
-                                    'main_%s_%i.cc' % (exporter.model_name, num))) or \
-              os.path.exists(os.path.join(filepath,
-                                    'main_%s_%i' % (exporter.model_name, num))):
-            num += 1
-        main_file_name = str(num)
-
-    main_file = 'main_%s_%s' % (exporter.model_name,
-                                main_file_name)
-
-    main_filename = os.path.join(filepath, main_file + '.cc')
-
-    # Write the file
-    writers.CPPWriter(main_filename).writelines(file)
-
-    replace_dict = {}
-
-    # Extract version number and date from VERSION file
-    replace_dict['info_lines'] = get_mg5_info_lines()
-
-    replace_dict['main_file'] = main_file
-
-    replace_dict['process_dir'] = model_path
-
-    replace_dict['include_dir'] = exporter.include_dir
-
-    # Create the makefile
-    file = read_template_file(makefile_path) % replace_dict
-
-    make_filename = os.path.join(filepath, 'Makefile_%s_%s' % \
-                            (exporter.model_name, main_file_name))
-
-    # Write the file
-    open(make_filename, 'w').write(file)
-
-    logger.info("Created files %s and %s in directory %s" \
-                % (os.path.split(main_filename)[-1],
-                   os.path.split(make_filename)[-1],
-                   os.path.split(make_filename)[0]))
-    return main_file, make_filename
-
-    
-
+    #===============================================================================
+    # Global helper methods
+    #===============================================================================
+    @classmethod
+    def read_template_file(cls, filename, classpath=False):
+        """Open a template file and return the contents."""
+         
+        return OneProcessExporterCPP.read_template_file(filename, classpath)
 
 
 #===============================================================================
@@ -2286,8 +2354,8 @@
     namespace = 'Pythia8'
     
     # Dictionaries for expression of MG5 SM parameters into Pythia 8
-    slha_to_expr = {('SMINPUTS', (1,)): '1./csm->alphaEM(pow(pd->m0(23),2))',
-                    ('SMINPUTS', (2,)): 'M_PI*csm->alphaEM(pow(pd->m0(23),2))*pow(pd->m0(23),2)/(sqrt(2.)*pow(pd->m0(24),2)*(pow(pd->m0(23),2)-pow(pd->m0(24),2)))',
+    slha_to_expr = {('SMINPUTS', (1,)): '1./csm->alphaEM(((pd->m0(23))*(pd->m0(23))))',
+                    ('SMINPUTS', (2,)): 'M_PI*csm->alphaEM(((pd->m0(23))*(pd->m0(23))))*((pd->m0(23))*(pd->m0(23)))/(sqrt(2.)*((pd->m0(24))*(pd->m0(24)))*(((pd->m0(23))*(pd->m0(23)))-((pd->m0(24))*(pd->m0(24)))))',
                     ('SMINPUTS', (3,)): 'alpS',
                     ('CKMBLOCK', (1,)): 'csm->VCKMgen(1,2)',
                     }
@@ -2295,6 +2363,7 @@
     # Template files to use
     param_template_h = 'pythia8_model_parameters_h.inc'
     param_template_cc = 'pythia8_model_parameters_cc.inc'
+    template_paths = os.path.join(_file_path, 'iolibs', 'template_files', 'pythia8')     
 
     def prepare_parameters(self):
         """Extract the model parameters from Pythia 8, and store them in
@@ -2412,7 +2481,7 @@
             path = 'pythia8.2_makefile.inc'
         else:
             path = 'pythia8_makefile.inc'
-        makefile = read_template_file(path) % replace_dict
+        makefile = self.read_template_file(path) % replace_dict
 
         # Write the files
         open(makefilename, 'w').write(makefile)
@@ -2433,3 +2502,32 @@
         logger.info("Created %s in directory %s" \
                     % (os.path.split(paramcardname)[-1],
                        os.path.split(paramcardname)[0]))
+        
+    #===============================================================================
+    # Global helper methods
+    #===============================================================================
+    @classmethod
+    def read_template_file(cls, *args, **opts):
+        """Open a template file and return the contents."""
+         
+        return OneProcessExporterPythia8.read_template_file(*args, **opts)
+
+def ExportCPPFactory(cmd, group_subprocesses=False):
+    """ Determine which Export class is required. cmd is the command 
+        interface containing all potential usefull information.
+    """
+
+    opt = cmd.options
+    cformat = cmd._export_format
+    
+    if cformat == 'pythia8':
+        return ProcessExporterPythia8(cmd._export_dir, opt)
+    elif cformat == 'standalone_cpp':
+        return  ProcessExporterCPP(cmd._export_dir, opt)
+    elif cformat == 'matchbox_cpp':
+        return  ProcessExporterMatchbox(cmd._export_dir, opt)
+    elif cformat == 'plugin':
+        return cmd._export_plugin(cmd._export_dir, opt)
+    
+
+

=== modified file 'madgraph/iolibs/export_fks.py'
--- madgraph/iolibs/export_fks.py	2016-06-24 01:32:34 +0000
+++ madgraph/iolibs/export_fks.py	2016-08-18 22:31:39 +0000
@@ -285,10 +285,10 @@
             cp(pjoin(_file_path,cp_file),
                 pjoin(self.dir_path,'bin','internal',os.path.basename(cp_file)))
 
-    def convert_model_to_mg4(self, model, wanted_lorentz = [], 
+    def convert_model(self, model, wanted_lorentz = [], 
                                                          wanted_couplings = []):
 
-        super(ProcessExporterFortranFKS,self).convert_model_to_mg4(model, 
+        super(ProcessExporterFortranFKS,self).convert_model(model, 
                                                wanted_lorentz, wanted_couplings)
         
         IGNORE_PATTERNS = ('*.pyc','*.dat','*.py~')
@@ -705,12 +705,39 @@
         run_card.write(pjoin(self.dir_path, 'Cards', 'run_card.dat'))
 
 
-    def finalize_fks_directory(self, matrix_elements, history, makejpg = False,
-            online = False, 
-            compiler_dict={'fortran': 'gfortran', 'cpp': 'g++'}, 
-            output_dependencies = 'external', MG5DIR = None):
+
+    def finalize(self, matrix_elements, history, mg5options, flaglist):
         """Finalize FKS directory by creating jpeg diagrams, html
         pages,proc_card_mg5.dat and madevent.tar.gz."""
+
+        devnull = os.open(os.devnull, os.O_RDWR)
+        try:
+            res = misc.call([self.options['lhapdf'], '--version'], \
+                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        except Exception:
+            res = 1
+        if res != 0:
+            logger.info('The value for lhapdf in the current configuration does not ' + \
+                        'correspond to a valid executable.\nPlease set it correctly either in ' + \
+                        'input/mg5_configuration or with "set lhapdf /path/to/lhapdf-config" ' + \
+                        'and regenrate the process. \nTo avoid regeneration, edit the ' + \
+                        ('%s/Cards/amcatnlo_configuration.txt file.\n' % self.dir_path ) + \
+                        'Note that you can still compile and run aMC@NLO with the built-in PDFs\n')
+        
+        compiler_dict = {'fortran':  mg5options['fortran_compiler'],
+                             'cpp':  mg5options['cpp_compiler'],
+                             'f2py':  mg5options['f2py_compiler']}
+        
+        if 'nojpeg' in flaglist:
+            makejpg = False
+        else:
+            makejpg = True
+        if 'online' in flaglist:
+            online = True
+        else:
+            online = False
+        output_dependencies = mg5options['output_dependencies']
+        
         
         self.proc_characteristic['grouped_matrix'] = False
         self.create_proc_charac()
@@ -3033,6 +3060,11 @@
     """Class to take care of exporting a set of matrix elements to
     Fortran (v4) format."""
 
+
+    def finalize(self, *args, **opts):
+        ProcessExporterFortranFKS.finalize(self, *args, **opts)
+        #export_v4.ProcessExporterFortranSA.finalize(self, *args, **opts)
+
 #===============================================================================
 # copy the Template in a new directory.
 #===============================================================================

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2016-08-14 00:17:23 +0000
+++ madgraph/iolibs/export_v4.py	2016-08-18 22:31:39 +0000
@@ -68,10 +68,71 @@
                        'f2py': 'f2py',
                        'cpp':'g++'}
 
+
+class VirtualExporter(object):
+    
+    #exporter variable who modified the way madgraph interacts with this class
+    
+    grouped_mode = 'madevent'  
+    # This variable changes the type of object called within 'generate_subprocess_directory'
+    #functions. 
+    # False to avoid grouping (only identical matrix element are merged)
+    # 'madevent' group the massless quark and massless lepton
+    # 'madweight' group the gluon with the massless quark
+    sa_symmetry = False
+    # If no grouped_mode=False, uu~ and u~u will be called independently. 
+    #Putting sa_symmetry generates only one of the two matrix-element.
+    check = True
+    # Ask madgraph to check if the directory already exists and propose to the user to 
+    #remove it first if this is the case
+    output = 'Template'
+    # [Template, None, dir]
+    #    - Template, madgraph will call copy_template
+    #    - dir, madgraph will just create an empty directory for initialisation
+    #    - None, madgraph do nothing for initialisation
+    exporter = 'v4'
+    # language of the output 'v4' for Fortran output
+    #                        'cpp' for C++ output 
+    
+    
+    def __init__(self, dir_path = "", opt=None):
+        return
+
+    def copy_template(self, model):
+        return
+
+    def generate_subprocess_directory(self, subproc_group, helicity_model, me=None):
+    #    generate_subprocess_directory(self, matrix_element, helicity_model, me_number) [for ungrouped]
+        return 0 # return an integer stating the number of call to helicity routine
+    
+    def convert_model(self, model, wanted_lorentz=[], wanted_couplings=[]):
+        return
+    
+    def finalize(self,matrix_element, cmdhistory, MG5options, outputflag):
+        return
+    
+    
+    def pass_information_from_cmd(self, cmd):
+        """pass information from the command interface to the exporter.
+           Please do not modify any object of the interface from the exporter.
+        """
+        return
+    
+    def modify_grouping(self, matrix_element):
+        return False, matrix_element
+           
+    def export_model_files(self, model_v4_path):
+        raise Exception, "V4 model not supported by this type of exporter. Please use UFO model"
+        return
+    
+    def export_helas(self, HELAS_PATH):
+        raise Exception, "V4 model not supported by this type of exporter. Please use UFO model"
+        return
+
 #===============================================================================
 # ProcessExporterFortran
 #===============================================================================
-class ProcessExporterFortran(object):
+class ProcessExporterFortran(VirtualExporter):
     """Class to take care of exporting a set of matrix elements to
     Fortran (v4) format."""
 
@@ -79,10 +140,11 @@
                         'export_format':'madevent', 'mp': False,
                         'v5_model': True
                         }
+    grouped_mode = False
 
-    def __init__(self, mgme_dir = "", dir_path = "", opt=None):
+    def __init__(self,  dir_path = "", opt=None):
         """Initiate the ProcessExporterFortran with directory information"""
-        self.mgme_dir = mgme_dir
+        self.mgme_dir = MG5DIR
         self.dir_path = dir_path
         self.model = None
 
@@ -102,35 +164,29 @@
         
         calls = 0
         if isinstance(matrix_elements, group_subprocs.SubProcessGroupList):
-            unique_id=1
             for (group_number, me_group) in enumerate(matrix_elements):
-                calls = calls + self.generate_subprocess_directory_v4(\
-                    me_group, fortran_model, group_number, unique_id=unique_id)
-                unique_id += len(me_group.get('matrix_elements'))
+                calls = calls + self.generate_subprocess_directory(\
+                                          me_group, fortran_model, group_number)
         else:
             for me_number, me in enumerate(matrix_elements.get_matrix_elements()):
-                calls = calls + self.generate_subprocess_directory_v4(\
+                calls = calls + self.generate_subprocess_directory(\
                                                    me, fortran_model, me_number)    
                         
         return calls    
         
-    #===========================================================================
-    #  Generate an include file with global quantities about all ME's output.
-    #===========================================================================
-    def write_global_specs(self, matrix_elements):
-        """ Writes the file global_specs.inc which contains general information
-        about *all* the ME's output in this directory."""
-        
-        # Do nothing here, but daughter classes such as LoopOptimizedExporterFortran
-        # overwrites this.
-        pass
 
     #===========================================================================
     #  create the run_card 
     #===========================================================================
     def create_run_card(self, matrix_elements, history):
         """ """
- 
+
+
+        # bypass this for the loop-check
+        import madgraph.loop.loop_helas_objects as loop_helas_objects
+        if isinstance(matrix_elements, loop_helas_objects.LoopHelasMatrixElement):
+            matrix_elements = None
+
         run_card = banner_mod.RunCard()
         
         
@@ -157,7 +213,7 @@
     #===========================================================================
     # copy the Template in a new directory.
     #===========================================================================
-    def copy_v4template(self, modelname):
+    def copy_template(self, model):
         """create the directory run_name as a copy of the MadEvent
         Template, and clean the directory
         """
@@ -284,27 +340,30 @@
         process_str = ' '.join(new_process_content)
 
         #format the SubProcess
-        process_text += process_template.substitute({'process': process_str, \
-                                                            'coupling': coupling})
-
-        text = proc_card_template.substitute({'process': process_text,
+        replace_dict = {'process': process_str,
+                        'coupling': coupling}
+        process_text += process_template.substitute(replace_dict)
+        
+        replace_dict = {'process': process_text,
                                             'model': modelname,
-                                            'multiparticle':''})
-        ff = open(file_pos, 'w')
-        ff.write(text)
-        ff.close()
-
+                                            'multiparticle':''}
+        text = proc_card_template.substitute(replace_dict)
+        
+        if file_pos:
+            ff = open(file_pos, 'w')
+            ff.write(text)
+            ff.close()
+        else:
+            return replace_dict
+        
     #===========================================================================
     # Create jpeg diagrams, html pages,proc_card_mg5.dat and madevent.tar.gz
     #===========================================================================
-    def finalize_v4_directory(self, matrix_elements, history = "", makejpg = False, 
-                              online = False, compiler=default_compiler):
-        """Function to finalize v4 directory, for inheritance.
-        """
-        
-        self.create_run_card(matrix_elements, history)
-        
-        pass
+    def finalize(self, matrix_elements, history='', mg5options={}, flaglist=[]):
+        """Function to finalize v4 directory, for inheritance.""" 
+        
+        self.create_run_card(matrix_elements, history)         
+
 
     #===========================================================================
     # Create the proc_characteristic file passing information to the run_interface
@@ -471,9 +530,9 @@
     #  
 
     #===========================================================================
-    # generate_subprocess_directory_v4
+    # generate_subprocess_directory
     #===========================================================================
-    def generate_subprocess_directory_v4(self, matrix_element,
+    def generate_subprocess_directory(self, matrix_element,
                                          fortran_model,
                                          me_number):
         """Routine to generate a subprocess directory (for inheritance)"""
@@ -531,9 +590,11 @@
           parameter (nincoming_prod=%(ninitial)d)""" % replace_dict
 
         # Write the file
-        writer.writelines(file)
-
-        return True
+        if writer:
+            writer.writelines(file)
+            return True
+        else:
+            return replace_dict
 
     #===========================================================================
     # write_helamp_madspin
@@ -552,9 +613,12 @@
           common /to_helamp/helamp """ % replace_dict
 
         # Write the file
-        writer.writelines(file)
+        if writer:
+            writer.writelines(file)
+            return True
+        else:
+            return replace_dict
 
-        return True
 
 
     #===========================================================================
@@ -575,10 +639,11 @@
           parameter (nincoming=%(ninitial)d)""" % replace_dict
 
         # Write the file
-        writer.writelines(file)
-
-        return True
-
+        if writer:
+            writer.writelines(file)
+            return True
+        else:
+            return replace_dict
     #===========================================================================
     # write_pmass_file
     #===========================================================================
@@ -701,62 +766,12 @@
 
         return True
 
-    #===========================================================================
-    # write_props_file
-    #===========================================================================
-    def write_props_file(self, writer, matrix_element, s_and_t_channels):
-        """Write the props.inc file for MadEvent. Needs input from
-        write_configs_file."""
-
-        lines = []
-
-        particle_dict = matrix_element.get('processes')[0].get('model').\
-                        get('particle_dict')
-
-        for iconf, configs in enumerate(s_and_t_channels):
-            for vertex in configs[0] + configs[1][:-1]:
-                leg = vertex.get('legs')[-1]
-                if leg.get('id') not in particle_dict:
-                    # Fake propagator used in multiparticle vertices
-                    mass = 'zero'
-                    width = 'zero'
-                    pow_part = 0
-                else:
-                    particle = particle_dict[leg.get('id')]
-                    # Get mass
-                    if particle.get('mass').lower() == 'zero':
-                        mass = particle.get('mass')
-                    else:
-                        mass = "abs(%s)" % particle.get('mass')
-                    # Get width
-                    if particle.get('width').lower() == 'zero':
-                        width = particle.get('width')
-                    else:
-                        width = "abs(%s)" % particle.get('width')
-
-                    pow_part = 1 + int(particle.is_boson())
-
-                lines.append("prmass(%d,%d)  = %s" % \
-                             (leg.get('number'), iconf + 1, mass))
-                lines.append("prwidth(%d,%d) = %s" % \
-                             (leg.get('number'), iconf + 1, width))
-                lines.append("pow(%d,%d) = %d" % \
-                             (leg.get('number'), iconf + 1, pow_part))
-
-        # Write the file