Merge lp:~maddevelopers/mg5amcnlo/group_pythia8 into lp:~maddevelopers/mg5amcnlo/release_candidate

[Johan Alwall]

- Fixed Pythia 8 output to work for any model, implemented the correct subprocess grouping, added makefiles and example main program, and distribute files in a Pythia 8 distribution correctly
- Implemented launch also for Pythia 8

[lp:~maddevelopers/mg5amcnlo/group_pythia8]

166. By Johan Alwall on 2011-03-26

Some tweaking of the launch command for pythia8

167. By Johan Alwall on 2011-03-26

Changed position of include files in Pythia 8 output to be together with process and model .cc files. Cleaned up command line interface cmd_interface.py to make it more DRY and make the behavior for generate and output more expected.

168. By Johan Alwall on 2011-03-26

Fixed ALOHA output of charge conjugate routines also when there are fermion-flow violating couplings but no Majorana particles in model

169. By Johan Alwall on 2011-03-27

Fixed launch (finally understood how Olivier meant it...)

170. By Johan Alwall on 2011-03-27

Fixed pythia8 launcher, replaced filename hel_amps_model with HelAmps_model in better accordance with other file names

171. By Johan Alwall on 2011-03-30

Changed example main file for Pythia to include all processes defined in one output by the output command.

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

They are problem with the launch command.
1) It's not working now (but that you know and expect me to fix)
2) It's not working as the "other" launch command

- it has a timer, even in interactive mode (where they are only in shell mode for the other)
- it require confirmation for the main (where for the other launch it launches directly)

All the launch routine should follow the same logic!!

[Johan Alwall (johan-alwall)]

Hello Olivier,

Can you please clarify?

> They are problem with the launch command.
> 1) It's not working now (but that you know and expect me to fix)

Exactly what are the problems you refer to?

> 2) It's not working as the "other" launch command
> - it has a timer, even in interactive mode (where they are only in shell mode for the other)

What I really want is to have "enter" select the default value, and to
have the default value displayed even without a timer (just like any
UNIX command with default values). Is this what you refer to above?

> - it require confirmation for the main (where for the other launch it launches directly)

For Pythia, this is a different philosophy. Since the main file is
just an example file, we generally assume that the user wants to
modify it. This is not the case for any other output format.
Furthermore, there is no way of knowing which of the main files the
user wants to run.

> All the launch routine should follow the same logic!!

Not this one. It depends on what the user expects, and this is very
different between the different output formats.

[lp:~maddevelopers/mg5amcnlo/group_pythia8]

172. By Johan Alwall on 2011-03-30

Add on to tutorial text for launch command. Fixed parallel test.

173. By Olivier Mattelaer on 2011-03-30

correct the compute all. The conjugate pair were not set correctly

174. By Johan Alwall on 2011-03-30

Fixed bug in launch selection, remove timout in pythia8 question

175. By Olivier Mattelaer on 2011-03-31

nicer launch interface:
- underline for default
- tab completion for the possible choices
- return default when press enter

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

This is a bit more of feedback on this module:
For the moment, I'm mainly try to use it, didn't look so deep in the code modification.
(I know that your are coding very elegantly)

1)
>All necessary files for Pythia 8 generated.
>Please go to /Users/omatt/Documents/Eclipse2/pythia8_mg5/examples and run
> make -f /Users/omatt/Documents/Eclipse2/pythia8_mg5/examples/Makefile_sm_1
>(with process_name replaced by process name).
>You can then run .//Users/omatt/Documents/Eclipse2/pythia8_mg5/examples/main_sm_1.cc to produce
>events for the process.
>Or run launch and select /Users/omatt/Documents/Eclipse2/pythia8_mg5/examples/main_sm_1.cc.
>Generated helas calls for 2 subprocesses (4 diagrams) in 0.109 s

I found a bit disturbing that : "Generated helas calls for 2 subprocesses (4 diagrams) in 0.109 s"
is after all the information text... is it possible to print it before?

2) In the file main_xxxx.
I found this:
pythia.init(2212, 2212, 14000.);

shouldn't we put the energy default to 7? (in fact the same for the run_card in madevent)

3) It fails to compile on my computer:
Running make for pythia8 directory
Command "launch" interrupted with error:
MadGraph5Error : make failed for pythia8 directory
Please report this bug on https://bugs.launchpad.net/madgraph5
More information is found in 'MG5_debug'.
Please attach this file to your report.

So this should be due to my installation, so I think
a) It can be helpfull to put on the README some information on where we should put the pythia8 program in order that he detect it. (You can add the same type of information for pythia/...)
(and/or add some information in the help launch)

b) This error message should be a bit more instructive. Since here it doesn't help at all.

4) What is the sense of the last option in
Do you want to edit file: main_mssm_1.cc? [y, n, path of the new main_mssm_1.cc]

5) if you open a new mg5 command and try to launch ./examples/main_mssm_1.cc
return InvalidCmd ./examples/main_mssm_1.cc is not a valid directory
and if put launch ./examples/
then he didn't launch pythia8 program.

So in order to launch in pythia8 mode, you should first run output pythia8.
This is very inelegant...

My idea was the following.
1) launch ./examples/main_mssm_1.cc
-> launch this in pytia8 mode
2) launch ./examples/
-> ask which main files to run (this options is not mandatory)
3) launch
-> only if a output pythia8 was run before. (and launch the last created main automaticaly)

If you don't like the point 3, and want to ask which one to launch, this is fine for me, but the two other options are very important to my point of view.

We can look to this little, but important point, together if you want

Cheers,

Olivier

review: Needs Information

[lp:~maddevelopers/mg5amcnlo/group_pythia8]

176. By Johan Alwall on 2011-03-31

Changed order of info after pythia8 output. Added check for valid Pythia 8 directory (include/Pythia.h) before allowing Pythia 8 output.

177. By Johan Alwall on 2011-03-31

Allow output of pythia8 files to invalid directory, but let launch fail instead

178. By Johan Alwall on 2011-03-31

Fixed one last mistake in launch

179. By Johan Alwall on 2011-03-31

Fixed typo in warning message

=== modified file 'aloha/aloha_writers.py'
--- aloha/aloha_writers.py	2011-01-26 13:23:54 +0000
+++ aloha/aloha_writers.py	2011-03-31 16:46:04 +0000
@@ -49,7 +49,7 @@
         elif len(indices) == 2: 
             return  4 * indices[0] + indices[1] + start 
         else:
-            raise Exception                                 
+            raise Exception, 'WRONG CONTRACTION OF LORENTZ OBJECT'                                 
                                  
     def collect_variables(self):
         """Collects Momenta,Mass,Width into lists"""

=== modified file 'aloha/create_aloha.py'
--- aloha/create_aloha.py	2011-02-10 01:07:57 +0000
+++ aloha/create_aloha.py	2011-03-31 16:46:04 +0000
@@ -583,7 +583,16 @@
             if particle.spin == 2 and particle.selfconjugate:
                 need = True
                 break
-        
+
+        if not need:
+            for interaction in self.model.all_vertices:
+                fermions = [p for p in interaction.particles if p.spin == 2]
+                for i in range(0, len(fermions), 2):
+                    if fermions[i].pdg_code * fermions[i+1].pdg_code > 0:
+                        # This is a fermion flow violating interaction
+                        need = True
+                        break
+
         # No majorana particles    
         if not need:
             return {}
@@ -591,7 +600,7 @@
         conjugate_request = {}
         # Check each vertex if they are fermion and/or majorana
         for vertex in self.model.all_vertices:
-            for i in range(0, len(vertex.particles),2):
+            for i in range(0, len(vertex.particles), 2):
                 part1 = vertex.particles[i]
                 if part1.spin !=2:
                     # deal only with fermion
@@ -606,9 +615,9 @@
                 # No majorana => add the associate lorentz structure
                 for lorentz in vertex.lorentz:
                     try:
-                        conjugate_request[lorentz.name].add(i+1)
+                        conjugate_request[lorentz.name].add(i//2+1)
                     except:
-                        conjugate_request[lorentz.name] = set([i+1])
+                        conjugate_request[lorentz.name] = set([i//2+1])
         
         for elem in conjugate_request:
             conjugate_request[elem] = list(conjugate_request[elem])

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2011-03-24 16:15:56 +0000
+++ madgraph/VERSION	2011-03-31 16:46:04 +0000
@@ -1,2 +1,2 @@
-version = 1.0.0.RC1
-date = 2011-04-23
+version = 1.0.0.RC2
+date = 2011-03-30

=== modified file 'madgraph/core/helas_objects.py'
--- madgraph/core/helas_objects.py	2011-02-08 16:27:15 +0000
+++ madgraph/core/helas_objects.py	2011-03-31 16:46:04 +0000
@@ -3298,6 +3298,21 @@
                 self.get_all_wavefunctions() + self.get_all_amplitudes() \
                 if wa.get('interaction_id') != 0]
 
+    def get_mirror_processes(self):
+        """Return a list of processes with initial states interchanged
+        if has mirror processes"""
+
+        if not self.get('has_mirror_process'):
+            return []
+        processes = base_objects.ProcessList()
+        for proc in self.get('processes'):
+            legs = copy.copy(proc.get('legs'))
+            legs[0:2] = [legs[1],legs[0]]
+            process = copy.copy(proc)
+            process.set('legs', legs)
+            processes.append(process)
+        return processes
+
     @staticmethod
     def check_equal_decay_processes(decay1, decay2):
         """Check if two single-sided decay processes
@@ -3950,3 +3965,7 @@
 
         return list(set(coupling_list))
     
+    def get_matrix_elements(self):
+        """Extract the list of matrix elements"""
+
+        return self.get('matrix_elements')

=== modified file 'madgraph/interface/cmd_interface.py'
--- madgraph/interface/cmd_interface.py	2011-03-24 16:15:56 +0000
+++ madgraph/interface/cmd_interface.py	2011-03-31 16:46:04 +0000
@@ -294,30 +294,31 @@
 
     def help_output(self):
         logger.info("syntax [" + "|".join(self._export_formats) + \
-                    "] [name|.|auto] [options]")
+                    "] [path|.|auto] [options]")
         logger.info("-- Output any generated process(es) to file.")
-        logger.info("   mode: Default mode is madevent. Default path is \'.\'.")
+        logger.info("   mode: Default mode is madevent. Default path is \'.\' or auto.")
         logger.info("   - If mode is madevent, create a MadEvent process directory.")
         logger.info("   - If mode is standalone, create a Standalone directory")
         logger.info("   - If mode is matrix, output the matrix.f files for all")
-        logger.info("     generated processes in directory \"name\".")
-        logger.info("   If mode is standalone_cpp, create a standalone C++")
-        logger.info("     directory.")
-        logger.info("   If mode is pythia8, output the .h and .cc files for")
-        logger.info("     the processes in Pythia 8 format in directory \"name\".")
-        logger.info("   If mode is pythia8_model, output the .h and .cc files for")
-        logger.info("     for the model parameters and Aloha functions for the model.")
-        logger.info("   name: The name of the process directory.")
-        logger.info("   If you put '.' instead of a name, your pwd will be used.")
-        logger.info("   If you put 'auto', an automatic name PROC_XX_n will be created.")
+        logger.info("     generated processes in directory \"path\".")
+        logger.info("   - If mode is standalone_cpp, create a standalone C++")
+        logger.info("     directory in \"path\".")
+        logger.info("   - If mode is pythia8, output all files needed to generate")
+        logger.info("     the processes using Pythia 8. Directory \"path\"")
+        logger.info("     should be a Pythia 8 main directory (v. 8.150 or later).")
+        logger.info("   path: The path of the process directory.")
+        logger.info("     If you put '.' as path, your pwd will be used.")
+        logger.info("     If you put 'auto', an automatic directory PROC_XX_n will be created.")
         logger.info("   options:")
         logger.info("      -f: force cleaning of the directory if it already exists")
         logger.info("      -d: specify other MG/ME directory")
-        logger.info("      -noclean: no cleaning performed in \"name\"")
-        logger.info("      -nojpeg: no jpeg diagrams will be generated")
-        logger.info("   Example:")
+        logger.info("      -noclean: no cleaning performed in \"path\".")
+        logger.info("      -nojpeg: no jpeg diagrams will be generated.")
+        logger.info("      -name: the postfix of the main file in pythia8 mode.")
+        logger.info("   Examples:")
         logger.info("       output")
         logger.info("       output standalone MYRUN -f")
+        logger.info("       output pythia8 ../pythia8/ -name qcdprocs")
         
     def help_check(self):
 
@@ -640,13 +641,17 @@
         
         if not args:
             if self._done_export:
+                mode = self.find_output_type(self._done_export[0])
+                if mode != self._done_export[1]:
+                    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:
                 self.help_launch()
                 raise self.InvalidCmd, \
-                       'Impossible to use default location: No output command runned'
+                       'No default location available, please specify location.'
         
         if len(args) != 1:
             self.help_launch()
@@ -675,17 +680,20 @@
         
         card_path = os.path.join(path,'Cards')
         bin_path = os.path.join(path,'bin')
+        src_path = os.path.join(path,'src')
+        include_path = os.path.join(path,'include')
         subproc_path = os.path.join(path,'SubProcesses')
-        
-        if not os.path.isdir(card_path) or not os.path.isdir(subproc_path):
-            raise self.InvalidCmd, '%s : Not a valid directory' % path
 
-        if not os.path.isdir(bin_path):
+        if os.path.isfile(os.path.join(include_path, 'Pythia.h')):
+            return 'pythia8'
+        elif os.path.isdir(src_path):
             return 'standalone_cpp'
         elif os.path.isfile(os.path.join(bin_path,'generate_events')):
             return 'madevent'
-        else:
+        elif os.path.isdir(card_path):
             return 'standalone'
+
+        raise self.InvalidCmd, '%s : Not a valid directory' % path
         
     def check_load(self, args):
         """ check the validity of the line"""
@@ -727,8 +735,10 @@
         
         if args and args[0] in self._export_formats:
             self._export_format = args.pop(0)
+        else:
+            self._export_format = 'madevent'
 
-        if not self._curr_amps and self._export_format != "pythia8_model":
+        if not self._curr_amps:
             text = 'No processes generated. Please generate a process first.'
             raise self.InvalidCmd(text)
 
@@ -760,6 +770,12 @@
             # No valid path
             self.get_default_path()
 
+        if self._done_export == (self._export_dir, self._export_format):
+            # We have already done export in this path
+            logger.info("Matrix elements already exported to directory %s" % \
+                                    self._export_dir)
+            return        
+
         if self._export_format in ['madevent', 'standalone'] \
                and not self._mgme_dir and \
                os.path.realpath(self._export_dir) != os.path.realpath('.'):
@@ -1357,8 +1373,7 @@
     _check_opts = ['full', 'permutation', 'gauge', 'lorentz_invariance']
     _import_formats = ['model_v4', 'model', 'proc_v4', 'command']
     _v4_export_formats = ['madevent', 'standalone', 'matrix'] 
-    _export_formats = _v4_export_formats + ['standalone_cpp', 'pythia8',
-                                            'pythia8_model']
+    _export_formats = _v4_export_formats + ['standalone_cpp', 'pythia8']
     _set_options = ['group_subprocesses_output',
                     'ignore_six_quark_processes']
     # Variables to store object information
@@ -1437,57 +1452,55 @@
             # Reset Helas matrix elements
             self._curr_matrix_elements = helas_objects.HelasMultiProcess()
 
-            try:
-                if line.find(',') == -1:
-                    myprocdef = self.extract_process(line)
+            # Extract process from process definition
+            if ',' in line:
+                myprocdef, line = self.extract_decay_chain_process(line)
+            else:
+                myprocdef = self.extract_process(line)
+
+            # Check that we have something    
+            if not myprocdef:
+                raise MadGraph5Error("Empty or wrong format process, please try again.")
+                
+            cpu_time1 = time.time()
+
+            # Generate processes
+            collect_mirror_procs = \
+                                 self._options['group_subprocesses_output']
+            ignore_six_quark_processes = \
+                           self._options['ignore_six_quark_processes'] if \
+                           "ignore_six_quark_processes" in self._options \
+                           else []
+
+            myproc = diagram_generation.MultiProcess(myprocdef,
+                                          collect_mirror_procs =\
+                                          collect_mirror_procs,
+                                          ignore_six_quark_processes = \
+                                          ignore_six_quark_processes)
+
+            for amp in myproc.get('amplitudes'):
+                if amp not in self._curr_amps:
+                    self._curr_amps.append(amp)
                 else:
-                    myprocdef, line = self.extract_decay_chain_process(line)
-            except MadGraph5Error, error:
-                logger_stderr.warning("Empty or wrong format process :\n" + \
-                                     str(error))
-                return
-                
-            if myprocdef:
-
-                cpu_time1 = time.time()
-                
-                # Generate processes
-                collect_mirror_procs = \
-                                     self._options['group_subprocesses_output']
-                ignore_six_quark_processes = \
-                               self._options['ignore_six_quark_processes'] if \
-                               "ignore_six_quark_processes" in self._options \
-                               else []
-
-                myproc = diagram_generation.MultiProcess(myprocdef,
-                                              collect_mirror_procs =\
-                                              collect_mirror_procs,
-                                              ignore_six_quark_processes = \
-                                              ignore_six_quark_processes)
-                    
-                for amp in myproc.get('amplitudes'):
-                    if amp not in self._curr_amps:
-                        self._curr_amps.append(amp)
-                    else:
-                        warning = "Warning: Already in processes:\n%s" % \
-                                                    amp.nice_string_processes()
-                        logger.warning(warning)
-
-
-                # Reset _done_export, since we have new process
-                self._done_export = False
-
-                cpu_time2 = time.time()
-
-                nprocs = len(myproc.get('amplitudes'))
-                ndiags = sum([amp.get_number_of_diagrams() for \
-                                  amp in myproc.get('amplitudes')])
-                logger.info("%i processes with %i diagrams generated in %0.3f s" % \
-                      (nprocs, ndiags, (cpu_time2 - cpu_time1)))
-                ndiags = sum([amp.get_number_of_diagrams() for \
-                                  amp in self._curr_amps])
-                logger.info("Total: %i processes with %i diagrams" % \
-                      (len(self._curr_amps), ndiags))                
+                    warning = "Warning: Already in processes:\n%s" % \
+                                                amp.nice_string_processes()
+                    logger.warning(warning)
+
+
+            # Reset _done_export, since we have new process
+            self._done_export = False
+
+            cpu_time2 = time.time()
+
+            nprocs = len(myproc.get('amplitudes'))
+            ndiags = sum([amp.get_number_of_diagrams() for \
+                              amp in myproc.get('amplitudes')])
+            logger.info("%i processes with %i diagrams generated in %0.3f s" % \
+                  (nprocs, ndiags, (cpu_time2 - cpu_time1)))
+            ndiags = sum([amp.get_number_of_diagrams() for \
+                              amp in self._curr_amps])
+            logger.info("Total: %i processes with %i diagrams" % \
+                  (len(self._curr_amps), ndiags))                
   
     # Define a multiparticle label
     def do_define(self, line, log=True):
@@ -1816,48 +1829,21 @@
     def do_generate(self, line):
         """Generate an amplitude for a given process"""
 
-        args = split_arg(line)
-
-        # Check args validity
-        self.check_generate(args)
-
+        # Reset amplitudes
+        self._curr_amps = diagram_generation.AmplitudeList()
         # Reset Helas matrix elements
-        self._curr_matrix_elements = helas_objects.HelasMultiProcess()
+        self._curr_matrix_elements = None
         self._generate_info = line
         # Reset _done_export, since we have new process
         self._done_export = False
-
-        # Extract process from process definition
-        if ',' in line:
-            myprocdef, line = self.extract_decay_chain_process(line)
-        else:
-            myprocdef = self.extract_process(line)
-            
-        # Check that we have something    
-        if not myprocdef:
-            raise MadGraph5Error("Empty or wrong format process, please try again.")
-
-        cpu_time1 = time.time()
-        # Generate processes
-        collect_mirror_procs = self._options['group_subprocesses_output']
-        ignore_six_quark_processes = \
-                            self._options['ignore_six_quark_processes'] if \
-                            "ignore_six_quark_processes" in self._options \
-                            else []
-
-        myproc = diagram_generation.MultiProcess(myprocdef,
-                                              collect_mirror_procs = \
-                                              collect_mirror_procs,
-                                              ignore_six_quark_processes = \
-                                              ignore_six_quark_processes)
-        self._curr_amps = myproc.get('amplitudes')
-        cpu_time2 = time.time()
-
-        nprocs = len(self._curr_amps)
-        ndiags = sum([amp.get_number_of_diagrams() for \
-                              amp in self._curr_amps])
-        logger.info("%i processes with %i diagrams generated in %0.3f s" % \
-                  (nprocs, ndiags, (cpu_time2 - cpu_time1)))
+        # Also reset _export_format and _export_dir
+        self._export_format = None
+
+        # Call add process
+        args = split_arg(line)
+        args.insert(0, 'process')
+        
+        self.do_add(" ".join(args))
     
     def extract_process(self, line, proc_number = 0, overall_orders = {}):
         """Extract a process definition from a string. Returns
@@ -2365,7 +2351,7 @@
     def check_for_export_dir(self, filepath):
         """Check if the files is in a valid export directory and assign it to
         export path if if is"""
-        
+
         # keep previous if a previous one is defined
         if self._export_dir:
             return
@@ -2373,8 +2359,8 @@
         path_split = filepath.split(os.path.sep)
         if len(path_split) > 2 and path_split[-2] == 'Cards':
             self._export_dir = os.path.sep.join(path_split[:-2])
-                
-    
+
+
     def do_launch(self, line):
         """Ask for editing the parameter and then 
         Execute the code (madevent/standalone/...)
@@ -2390,7 +2376,9 @@
         if args[0].startswith('standalone'):
             ext_program = launch_ext.SALauncher(args[1], self.timeout, **options)
         elif args[0] == 'madevent':
-            ext_program = launch_ext.MELauncher(args[1], self.timeout, **options)            
+            ext_program = launch_ext.MELauncher(args[1], self.timeout, **options)
+        elif args[0] == 'pythia8':
+            ext_program = launch_ext.Pythia8Launcher(args[1], self.timeout, **options)
         else:
             raise self.InvalidCmd , '%s cannot be run from MG5 interface' % args[0]
         
@@ -2531,7 +2519,12 @@
         noclean = '-noclean' in args
         force = '-f' in args 
         nojpeg = '-nojpeg' in args
-    
+        main_file_name = ""
+        try:
+            main_file_name = args[args.index('-name') + 1]
+        except:
+            pass
+            
         if self._done_export == (self._export_dir, self._export_format):
             logger.info('Matrix elements already exported to directory %s' % \
                         self._export_dir)
@@ -2575,134 +2568,104 @@
         self._done_export = False
 
         # Perform export and finalize right away
-        options = ''
-        if nojpeg:
-            options = '-nojpeg'
+        self.export(nojpeg, main_file_name)
 
-        self.export(options)        
+        # Reset _export_dir, so we don't overwrite by mistake later
+        self._export_dir = None
 
     # Export a matrix element
-    def export(self, line):
+    def export(self, nojpeg = False, main_file_name = ""):
         """Export a generated amplitude to file"""
 
         def generate_matrix_elements(self):
             """Helper function to generate the matrix elements before
             exporting"""
 
+            # Sort amplitudes according to number of diagrams,
+            # to get most efficient multichannel output
+            self._curr_amps.sort(lambda a1, a2: a2.get_number_of_diagrams() - \
+                                 a1.get_number_of_diagrams())
+
             cpu_time1 = time.time()
-            if not self._curr_matrix_elements.get('matrix_elements'):
-                self._curr_matrix_elements = \
-                             helas_objects.HelasMultiProcess(\
-                                           self._curr_amps)
+            ndiags = 0
+            if not self._curr_matrix_elements.get_matrix_elements():
+                if self._options['group_subprocesses_output']:
+                    cpu_time1 = time.time()
+                    dc_amps = [amp for amp in self._curr_amps if isinstance(amp, \
+                                        diagram_generation.DecayChainAmplitude)]
+                    non_dc_amps = diagram_generation.AmplitudeList(\
+                             [amp for amp in self._curr_amps if not \
+                              isinstance(amp, \
+                                         diagram_generation.DecayChainAmplitude)])
+                    subproc_groups = group_subprocs.SubProcessGroupList()
+                    if non_dc_amps:
+                        subproc_groups.extend(\
+                                   group_subprocs.SubProcessGroup.group_amplitudes(\
+                                                                       non_dc_amps))
+                    for dc_amp in dc_amps:
+                        dc_subproc_group = \
+                                 group_subprocs.DecayChainSubProcessGroup.\
+                                                           group_amplitudes(dc_amp)
+                        subproc_groups.extend(\
+                                  dc_subproc_group.\
+                                        generate_helas_decay_chain_subproc_groups())
+
+                    ndiags = sum([len(m.get('diagrams')) for m in \
+                              subproc_groups.get_matrix_elements()])
+                    self._curr_matrix_elements = subproc_groups
+                    # assign a unique id number to all groups
+                    uid = 0 
+                    for group in subproc_groups:
+                        uid += 1 # update the identification number
+                        for me in group.get('matrix_elements'):
+                            me.get('processes')[0].set('uid', uid)
+                else:
+                    self._curr_matrix_elements = \
+                                 helas_objects.HelasMultiProcess(\
+                                               self._curr_amps)
+                    ndiags = sum([len(me.get('diagrams')) for \
+                                  me in self._curr_matrix_elements.\
+                                  get_matrix_elements()])
+                    # assign a unique id number to all process
+                    uid = 0 
+                    for me in self._curr_matrix_elements.get_matrix_elements():
+                        uid += 1 # update the identification number
+                        me.get('processes')[0].set('uid', uid)
+
             cpu_time2 = time.time()
-
-            ndiags = sum([len(me.get('diagrams')) for \
-                          me in self._curr_matrix_elements.\
-                          get('matrix_elements')])
-
             return ndiags, cpu_time2 - cpu_time1
 
         # Start of the actual routine
 
-        args = split_arg(line)
-        # Check the validity of the arguments and return the output path
-        if __debug__:
-            self.check_output(args)
-
-        if self._export_format == 'pythia8_model':
-            cpu_time1 = time.time()
-            export_cpp.convert_model_to_pythia8(\
-                            self._curr_model, self._export_dir)
-            cpu_time2 = time.time()
-            logger.info(("Exported UFO model to Pythia 8 format in %0.3f s") \
-                        % (cpu_time2 - cpu_time1))
-
-            return
-
-        if self._done_export == (self._export_dir, self._export_format):
-            # We have already done export in this path
-            logger.info("Matrix elements already exported to directory %s" % \
-                                    self._export_dir)
-            return        
-
-        # Determine if we want to group subprocesses
-        group_subprocesses = self._export_format == 'madevent' and \
-                             self._options['group_subprocesses_output']
-        
-        if not group_subprocesses:
-            # Do not generate matrix elements, since this is done by the
-            # SubProcessGroup objects
-            ndiags, cpu_time = generate_matrix_elements(self)
+        ndiags, cpu_time = generate_matrix_elements(self)
 
         calls = 0
 
-        nojpeg = '-nojpeg' in args
-
         path = self._export_dir
         if self._export_format in ['standalone_cpp', 'madevent', 'standalone']:
             path = os.path.join(path, 'SubProcesses')
-        
+            
+        cpu_time1 = time.time()
+
+        # First treat madevent and pythia8 exports, where we need to
+        # distinguish between grouped and ungrouped subprocesses
+
+        # MadEvent
         if self._export_format == 'madevent':
-            # Sort amplitudes according to number of diagrams,
-            # to get most efficient multichannel output
-            self._curr_amps.sort(lambda a1, a2: a2.get_number_of_diagrams() - \
-                                 a1.get_number_of_diagrams())
-
-            if group_subprocesses:
-                ndiags = 0
-                cpu_time1 = time.time()
-                dc_amps = [amp for amp in self._curr_amps if isinstance(amp, \
-                                    diagram_generation.DecayChainAmplitude)]
-                non_dc_amps = diagram_generation.AmplitudeList(\
-                         [amp for amp in self._curr_amps if not \
-                          isinstance(amp, \
-                                     diagram_generation.DecayChainAmplitude)])
-                subproc_groups = group_subprocs.SubProcessGroupList()
-                if non_dc_amps:
-                    subproc_groups.extend(\
-                               group_subprocs.SubProcessGroup.group_amplitudes(\
-                                                                   non_dc_amps))
-                for dc_amp in dc_amps:
-                    dc_subproc_group = \
-                             group_subprocs.DecayChainSubProcessGroup.\
-                                                       group_amplitudes(dc_amp)
-                    subproc_groups.extend(\
-                              dc_subproc_group.\
-                                    generate_helas_decay_chain_subproc_groups())
-
-                cpu_time1 = time.time()
-                for sp_group in subproc_groups:
-                    ndiags = ndiags + sum([len(m.get('diagrams')) for m in \
-                          sp_group.get('matrix_elements')])
-                cpu_time = time.time() - cpu_time1
-                cpu_time1 = time.time()
-                for (group_number, me_group) in enumerate(subproc_groups):
+            if isinstance(self._curr_matrix_elements, group_subprocs.SubProcessGroupList):
+                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)
-                    matrix_elements = \
-                                 me_group.get('matrix_elements')
-                    self._curr_matrix_elements.get('matrix_elements').\
-                                                             extend(matrix_elements)
-                cpu_time2 = time.time() - cpu_time1
             else:
-                cpu_time1 = time.time()
                 for me_number, me in \
-                   enumerate(self._curr_matrix_elements.get('matrix_elements')):
+                   enumerate(self._curr_matrix_elements.get_matrix_elements()):
                     calls = calls + \
                             self._curr_exporter.generate_subprocess_directory_v4(\
                                 me, self._curr_fortran_model, me_number)
 
-                cpu_time2 = time.time() - cpu_time1
 
-            # assign a unique id number to all process
-            uid = 0 
-            for me in self._curr_matrix_elements.get('matrix_elements'):
-                for proc in me.get('processes'):
-                    uid += 1 # update the identification number
-                    proc.set('uid', uid) # assign it to the process
-            
             # Write the procdef_mg5.dat file with process info
             card_path = os.path.join(path, os.path.pardir, 'SubProcesses', \
                                      'procdef_mg5.dat')
@@ -2715,15 +2678,48 @@
                 except:
                     pass
                 
+        # Pythia 8
+        if self._export_format == 'pythia8':
+            # Output the model parameter and ALOHA files
+            model_name, model_path = export_cpp.convert_model_to_pythia8(\
+                            self._curr_model, self._export_dir)
+            # 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,
+                            process_string = me_group.get('name'),
+                            process_number = group_number, path = path)
+                    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)
+                process_names.append(exporter.process_file_name)
+
+            # Generate the main program file
+            filename, make_filename = \
+                      export_cpp.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 Standalone
         if self._export_format == 'standalone':
-            for me in self._curr_matrix_elements.get('matrix_elements'):
+            for me in matrix_elements:
                 calls = calls + \
                         self._curr_exporter.generate_subprocess_directory_v4(\
                             me, self._curr_fortran_model)
-            
+
+        # Just the matrix.f files
         if self._export_format == 'matrix':
-            cpu_time1 = time.time()
-            for me in self._curr_matrix_elements.get('matrix_elements'):
+            for me in matrix_elements:
                 filename = os.path.join(path, 'matrix_' + \
                            me.get('processes')[0].shell_string() + ".f")
                 if os.path.isfile(filename):
@@ -2733,22 +2729,19 @@
                 calls = calls + self._curr_exporter.write_matrix_element_v4(\
                     writers.FortranWriter(filename),\
                     me, self._curr_fortran_model)
-            cpu_time2 = time.time() - cpu_time1
 
-        if self._export_format == 'pythia8':
-            export_cpp.generate_process_files_pythia8(\
-                            self._curr_matrix_elements, self._curr_cpp_model,
-                            process_string = self._generate_info, path = path)
-                
+        # C++ standalone
         if self._export_format == 'standalone_cpp':
-            for me in self._curr_matrix_elements.get('matrix_elements'):
+            for me in matrix_elements:
                 export_cpp.generate_subprocess_directory_standalone_cpp(\
                               me, self._curr_cpp_model,
                               path = path)
                 
+        cpu_time2 = time.time() - cpu_time1
+
         logger.info(("Generated helas calls for %d subprocesses " + \
               "(%d diagrams) in %0.3f s") % \
-              (len(self._curr_matrix_elements.get('matrix_elements')),
+              (len(matrix_elements),
                ndiags, cpu_time))
 
         if calls:
@@ -2758,37 +2751,33 @@
             else:
                 logger.info("Wrote files for %d helas calls" % \
                             (calls))
+                
+        if self._export_format == 'pythia8':
+            logger.info("- All necessary files for Pythia 8 generated.")
+            logger.info("  Please go to %s/examples and run" % path)
+            logger.info("      make -f %s" % make_filename)
+            logger.info("  (with process_name replaced by process name).")
+            logger.info("  You can then run ./%s to produce events for the process" % \
+                        filename)
+            logger.info("- Or run launch and select %s.cc." % filename)
+
         # Replace the amplitudes with the actual amplitudes from the
         # matrix elements, which allows proper diagram drawing also of
         # decay chain processes
         self._curr_amps = diagram_generation.AmplitudeList(\
                [me.get('base_amplitude') for me in \
-                self._curr_matrix_elements.get('matrix_elements')])
+                matrix_elements])
 
         # Remember that we have done export
         self._done_export = (self._export_dir, self._export_format)
 
-        if self._export_format in ['madevent', 'standalone', 'standalone_cpp']:
-            # Automatically run finalize
-            options = []
-            if nojpeg:
-                options = ['-nojpeg']
-                
-            self.finalize(options)
+        # Automatically run finalize
+        self.finalize(nojpeg)
             
-        #reinitialize to empty the default output dir
-        self._export_dir = None
-    
-    def finalize(self, options):
+    def finalize(self, nojpeg):
         """Make the html output, write proc_card_mg5.dat and create
         madevent.tar.gz for a MadEvent directory"""
         
-        #look if the user ask to bypass the jpeg creation
-        if '-nojpeg' in options:
-            makejpg = False
-        else:
-            makejpg = True
-
         # For v4 models, copy the model/HELAS information.
         if self._model_v4_path:
             logger.info('Copy %s model files to directory %s' % \
@@ -2822,14 +2811,18 @@
             self._curr_exporter.finalize_v4_directory( \
                                            [self.history_header] + \
                                            self.history,
-                                           makejpg)
+                                           not nojpeg)
 
-        logger.info('Output to directory ' + self._export_dir + ' done.')
+        if self._export_format in ['madevent', 'standalone', 'standalone_cpp']:
+            logger.info('Output to directory ' + self._export_dir + ' done.')
         if self._export_format == 'madevent':
             logger.info('Please see ' + self._export_dir + '/README')
             logger.info('for information about how to generate events from this process.')
             logger.info('You can also use the launch command.')
 
+        #reinitialize to empty the default output dir
+        self._export_dir = None
+    
     def do_restrict(self, line):
         """ from a param_card.dat remove all zero interactions 
             and all zero external parameter."""
@@ -2939,9 +2932,11 @@
 
 # LAUNCH PROGRAM
 _launch_usage = "launch [DIRPATH] [options]\n" + \
-         "-- execute the madevent/standalone output present in DIRPATH\n" + \
+         "-- execute the madevent/standalone/standalone_cpp/pythia8 output present in DIRPATH\n" + \
          "   By default DIRPATH is the latest created directory \n" + \
-         "   Example: launch PROC_SM_1 --name=run2 \n"
+         "   (for pythia8, it should be the Pythia 8 main directory) \n" + \
+         "   Example: launch PROC_sm_1 --name=run2 \n" + \
+         "   Example: launch ../pythia8 \n"
 _launch_parser = optparse.OptionParser(usage=_launch_usage)
 _launch_parser.add_option("-f", "--force", default=False, action='store_true',
                                 help="Use the card present in the directory in order to launch the different program")

=== modified file 'madgraph/interface/extended_cmd.py'
--- madgraph/interface/extended_cmd.py	2011-03-15 12:57:11 +0000
+++ madgraph/interface/extended_cmd.py	2011-03-31 16:46:04 +0000
@@ -239,7 +239,8 @@
             text+='\t %s \n' % option      
         print text
 
-    def list_completion(self, text, list):
+    @staticmethod
+    def list_completion(text, list):
         """Propose completions of text in list"""
         if not text:
             completions = list
@@ -299,9 +300,9 @@
 
 
 #===============================================================================
-# Question in order to return a path with auto-completion
+# Question with auto-completion
 #===============================================================================
-class OneLinePathCompletion(cmd.Cmd):
+class SmartQuestion(cmd.Cmd):
     """ a class for answering a question with the path autocompletion"""
 
     def preloop(self):
@@ -309,31 +310,42 @@
         self.prompt = ''
         self.value = None
 
-    def __init__(self,  allow_arg=[],*arg, **opt):
+    def __init__(self,  allow_arg=[], default=None, *arg, **opt):
         self.allow_arg = allow_arg
         self.history_header = ''
+        self.default_value = default
         cmd.Cmd.__init__(self, *arg, **opt)
 
     def completenames(self, text, *ignored):
         signal.alarm(0) # avoid timer if any
         try:
-            return Cmd.path_completion(text,'.', only_dirs = False)
+            return Cmd.list_completion(text, self.allow_arg)
         except Exception, error:
             print error
             
     def default(self, line):
         """Default action if line is not recognized"""
-        self.value = line
+
+        if line == '' and self.default_value is not None:
+            self.value = self.default_value
+        else:
+            self.value = line
+
+    def emptyline(self):
+        """If empty line, return default"""
+        
+        if self.default_value is not None:
+            self.value = self.default_value
 
     def postcmd(self, stop, line):
         
         try:    
-            if self.value in self.allow_arg or os.path.isfile(self.value):
+            if self.value in self.allow_arg:
                 return True
             else:
                 raise Exception
         except Exception:
-            print """not valid argument. Valid argument are file path or value in (%s).""" \
+            print """not valid argument. Valid argument are in (%s).""" \
                           % ','.join(self.allow_arg)
             print 'please retry'
             return False
@@ -343,11 +355,44 @@
         return self.value
     
 # a function helper
-def raw_path_input(input_text, allow_arg=[]):
-    print input_text
-    obj = OneLinePathCompletion(allow_arg=allow_arg)
-    return os.path.relpath(obj.cmdloop())
-    
+def smart_input(input_text, allow_arg=[], default=None):
+    print input_text
+    obj = SmartQuestion(allow_arg=allow_arg, default=default)
+    return obj.cmdloop()
+
+#===============================================================================
+# Question in order to return a path with auto-completion
+#===============================================================================
+class OneLinePathCompletion(SmartQuestion):
+    """ a class for answering a question with the path autocompletion"""
+
+
+    def completenames(self, text, *ignored):
+        signal.alarm(0) # avoid timer if any
+        
+        return SmartQuestion.completenames(self, text) + Cmd.path_completion(text,'.', only_dirs = False)
+            
+    def postcmd(self, stop, line):
+        
+        try:    
+            if self.value in self.allow_arg: 
+                return True
+            elif os.path.isfile(self.value):
+                return os.path.relpath(self.value)
+            else:
+                raise Exception
+        except Exception, error:
+            print """not valid argument. Valid argument are file path or value in (%s).""" \
+                          % ','.join(self.allow_arg)
+            print 'please retry'
+            return False
+            
+# a function helper
+def raw_path_input(input_text, allow_arg=[], default=None):
+    print input_text
+    obj = OneLinePathCompletion(allow_arg=allow_arg, default=default )
+    return obj.cmdloop()
+
 #===============================================================================
 # 
 #===============================================================================

=== modified file 'madgraph/interface/launch_ext_program.py'
--- madgraph/interface/launch_ext_program.py	2011-03-20 20:39:57 +0000
+++ madgraph/interface/launch_ext_program.py	2011-03-31 16:46:04 +0000
@@ -13,10 +13,13 @@
 #
 ################################################################################
 
+import glob
 import logging
 import os
+import pydoc
+import re
 import subprocess
-
+import time
 
 import madgraph.iolibs.files as files
 import madgraph.iolibs.misc as misc
@@ -93,13 +96,33 @@
         path = os.path.realpath(path)
         subprocess.call([self.editor, path], cwd=os.getcwd())
         
-    def ask(self, question, default):
+    def ask(self, question, default, choices=[], path_info=[]):
         """ ask a question """
         
+        assert type(path_info) == list
+        
         if not self.force:
+            # add choice info to the question
+            if choices + path_info:
+                question += ' ['
+                
+                for data in choices[:9] + path_info:
+                    if default == data:
+                        question += "\033[%dm%s\033[0m" % (4, data)
+                    else:
+                        question += "%s" % data
+                    question += ', '
+                if len(choices) > 9:
+                    question += ', ... , ' 
+                question = question[:-2]+']'
+                
+            if path_info:
+                fct = lambda q: cmd.raw_path_input(q, allow_arg=choices, default=default)
+            else:
+                fct = lambda q: cmd.smart_input(q, allow_arg=choices, default=default)
             try:
                 out =  misc.timed_input(question, default, timeout=self.timeout,
-                                        noerror=False)
+                                        noerror=False, fct=fct)
             except misc.TimeOutError:
                 # avoid to always wait a given time for the next answer
                 self.force = True
@@ -122,19 +145,13 @@
                                     
         if not self.force:
             if msg:  print msg
-            question = 'Do you want to edit file: %(card)s? [y/n/path of the new %(card)s]' 
-            question = question % {'card':filename}
-            try:
-                ans =  misc.timed_input(question, default, timeout=self.timeout,
-                                        noerror=False, fct=fct)
-            except misc.TimeOutError:
-                # avoid to always wait a given time for the next answer
-                self.force = True
-            else:
-                self.timeout=None # answer at least one question so wait...
+            question = 'Do you want to edit file: %(card)s?' % {'card':filename}
+            choices = ['y', 'n']
+            path_info = ['path of the new %(card)s' % {'card':os.path.basename(filename)}]
+            ans = self.ask(question, default, choices, path_info)
         else:
             ans = default
- 
+        
         if ans == 'y':
             path = os.path.join(self.card_dir, filename)
             self.edit_file(path)
@@ -143,9 +160,7 @@
         else:
             path = os.path.join(self.card_dir, filename)
             files.cp(ans, path)
-        
-        
-        
+                
                     
 class SALauncher(ExtLauncher):
     """ A class to launch a simple Standalone test """
@@ -207,7 +222,7 @@
             for i in range(1000):
                 path = os.path.join(self.running_dir, 'Events','run_%02i_banner.txt' % i)
                 if not os.path.exists(path):
-                    self.name = 'run%s' % i
+                    self.name = 'run_%02i' % i
                     break
         
         if self.name == '':
@@ -230,22 +245,22 @@
         if not self.pythia or self.force:
             return
         
-        answer = self.ask('Do you want to run pythia? [y/n]','n')
+        answer = self.ask('Do you want to run pythia?','auto', ['y','n','auto'])
         if answer == 'y':
             self.copy_default_card('pythia')
             self.cards.append('pythia_card.dat')
-        else:
+        elif answer == 'n':
             path = os.path.join(self.card_dir, 'pythia_card.dat')
             try: os.remove(path)
             except OSError: pass
             return # no Need to ask for PGS
         
-        answer = self.ask('Do you want to run PGS? [y/n]','n')
+        answer = self.ask('Do you want to run PGS?','auto', ['y','n','auto'])
         if answer == 'y':
             self.copy_default_card('pgs')
             self.cards.append('pgs_card.dat')
             return # No Need to ask for Delphes
-        else:
+        elif answer == 'n':
             path = os.path.join(self.card_dir, 'pgs_card.dat')
             try: os.remove(path)
             except OSError: pass
@@ -253,11 +268,11 @@
         if not self.delphes:
             return
         
-        answer = self.ask('Do you want to run Delphes? [y/n]','n')
+        answer = self.ask('Do you want to run Delphes?','n', ['y','n','auto'])
         if answer == 'y':
             self.copy_default_card('delphes')
             self.cards.append('delphes_card.dat')
-        else:
+        elif answer == 'n':
             path = os.path.join(self.card_dir, 'delphes_card.dat')
             try: os.remove(path)
             except OSError: pass        
@@ -287,7 +302,122 @@
         logger.info('The total cross-section is %s +- %s pb' % (cross, error))
         logger.info('more information in %s' 
                                  % os.path.join(self.running_dir, 'index.html'))
-        
+                
+
+class Pythia8Launcher(ExtLauncher):
+    """A class to launch Pythia8 run"""
+    
+    cards = []
+
+    def __init__(self, running_dir, timeout, **option):
+        """ initialize launching Pythia 8"""
+
+        running_dir = os.path.join(running_dir, 'examples')
+        ExtLauncher.__init__(self, running_dir, '.', timeout, **option)
+
+    
+    def prepare_run(self):
+        """ ask for pythia-pgs/delphes run """
+
+        self.cards = []
+        
+        # Find all main_model_process.cc files
+        date_file_list = []
+        for file in glob.glob(os.path.join(self.running_dir,'main_*_*.cc')):
+            # retrieves the stats for the current file as a tuple
+            # (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime)
+            # the tuple element mtime at index 8 is the last-modified-date
+            stats = os.stat(file)
+            # create tuple (year yyyy, month(1-12), day(1-31), hour(0-23), minute(0-59), second(0-59),
+            # weekday(0-6, 0 is monday), Julian day(1-366), daylight flag(-1,0 or 1)) from seconds since epoch
+            # note:  this tuple can be sorted properly by date and time
+            lastmod_date = time.localtime(stats[8])
+            date_file_list.append((lastmod_date, os.path.split(file)[-1]))
+
+        if not date_file_list:
+            raise MadGraph5Error, 'No Pythia output found'
+        # Sort files according to date with newest first
+        date_file_list.sort()
+        date_file_list.reverse()
+        files = [d[1] for d in date_file_list]
+        
+        answer = ''
+        answer = self.ask('Select a main file to run:', files[0], files)
+
+        self.cards.append(answer)
+    
+        self.executable = self.cards[-1].replace(".cc","")
+
+        # Assign a valid run name if not put in options
+        if self.name == '':
+            for i in range(1000):
+                path = os.path.join(self.running_dir, '',
+                                    '%s_%02i.log' % (self.executable, i))
+                if not os.path.exists(path):
+                    self.name = '%s_%02i.log' % (self.executable, i)
+                    break
+        
+        if self.name == '':
+            raise MadGraph5Error, 'too many runs in this directory'
+
+        # Find all exported models
+        models = glob.glob(os.path.join(self.running_dir,os.path.pardir,
+                                        "Processes_*"))
+        models = [os.path.split(m)[-1].replace("Processes_","") for m in models]
+        # Extract model name from executable
+        models.sort(key=len)
+        models.reverse()
+        model_dir = ""
+        for model in models:
+            if self.executable.replace("main_", "").startswith(model):
+                model_dir = "Processes_%s" % model
+                break
+        if model_dir:
+            self.model = model
+            self.model_dir = os.path.realpath(os.path.join(self.running_dir,
+                                                           os.path.pardir,
+                                                           model_dir))
+            self.cards.append(os.path.join(self.model_dir,
+                                           "param_card_%s.dat" % model))
+        
+    def launch_program(self):
+        """launch the main program"""
+
+        # Make pythia8
+        print "Running make for pythia8 directory"
+        status = subprocess.call(['make'], stdout = open(os.devnull, 'w'),
+                        stderr = open(os.devnull, 'w'),
+                        cwd=os.path.join(self.running_dir, os.path.pardir))
+        if status != 0:
+            raise MadGraph5Error, "make failed for pythia8 directory"
+        if self.model_dir:
+            print "Running make in %s" % self.model_dir
+            status = subprocess.call(['make'], stdout = open(os.devnull, 'w'),
+                            stderr = open(os.devnull, 'w'),
+                            cwd=self.model_dir)
+            if status != 0:
+                raise MadGraph5Error, "make failed for %s directory" % self.model_dir
+        # Finally run make for executable
+        makefile = self.executable.replace("main_","Makefile_")
+        print "Running make with %s" % makefile
+        status = subprocess.call(['make', '-f', makefile],
+                                 stdout = open(os.devnull, 'w'),
+                                 cwd=self.running_dir)
+        if status != 0:
+            raise MadGraph5Error, "make failed for %s" % self.executable
+        
+        print "Running " + self.executable
+
+        output = open(os.path.join(self.running_dir, self.name), 'w')
+        subprocess.call([self.executable], stdout = output, stderr = output,
+                        cwd=self.running_dir)
+
+        # Display the cross-section to the screen
+        path = os.path.join(self.running_dir, self.name) 
+        pydoc.pager(open(path).read())
+
+        print "Output of the run is found at " + \
+              os.path.realpath(os.path.join(self.running_dir, self.name))
         
         
         

=== modified file 'madgraph/interface/tutorial_text.py'
--- madgraph/interface/tutorial_text.py	2011-03-09 14:46:13 +0000
+++ madgraph/interface/tutorial_text.py	2011-03-31 16:46:04 +0000
@@ -84,6 +84,7 @@
 generate your events/compute the cross-section from this interface:
 Please Enter:
 mg5> launch MY_FIRST_MG5_RUN
+(you can interrupt the computation to continue the tutorial by pressing Ctrl-C)
 """
 
 launch = """This step ends the tutorial of the basic commands of MG5. You can

=== modified file 'madgraph/iolibs/export_cpp.py'
--- madgraph/iolibs/export_cpp.py	2011-03-10 01:04:29 +0000
+++ madgraph/iolibs/export_cpp.py	2011-03-31 16:46:04 +0000
@@ -104,7 +104,7 @@
 
     # Copy src Makefile
     makefile = read_template_file('Makefile_sa_cpp_src') % \
-                                           {'model': model.get('name')}
+                                   {'model': model.get('name').replace('-','_')}
     open(os.path.join('src', 'Makefile'), 'w').write(makefile)
 
     # Copy SubProcesses files
@@ -112,7 +112,7 @@
 
     # Copy SubProcesses Makefile
     makefile = read_template_file('Makefile_sa_cpp_sp') % \
-                                           {'model': model.get('name')}
+                                    {'model': model.get('name').replace('-', '_')}
     open(os.path.join('SubProcesses', 'Makefile'), 'w').write(makefile)
 
     # Return to original PWD
@@ -183,6 +183,8 @@
     C++ format."""
 
     # Static variables (for inheritance)
+    process_dir = '.'
+    include_dir = '.'
     process_template_h = 'cpp_process_h.inc'
     process_template_cc = 'cpp_process_cc.inc'
     process_class_template = 'cpp_process_class.inc'
@@ -194,7 +196,7 @@
         pass
     
     def __init__(self, matrix_elements, cpp_helas_call_writer, process_string = "",
-                 path = os.getcwd()):
+                 process_number = 0, path = os.getcwd()):
         """Initiate with matrix elements, helas call writer, process
         string, path. Generate the process .h and .cc files."""
 
@@ -213,20 +215,28 @@
             raise MadGraph5Error("No matrix elements to export")
 
         self.model = self.matrix_elements[0].get('processes')[0].get('model')
+        self.model_name = self.model.get('name').replace('-', '_')
 
         self.processes = sum([me.get('processes') for \
                               me in self.matrix_elements], [])
+        self.processes.extend(sum([me.get_mirror_processes() for \
+                              me in self.matrix_elements], []))
+
+        self.nprocesses = len(self.matrix_elements)
+        if any([m.get('has_mirror_process') for m in self.matrix_elements]):
+            self.nprocesses = 2*len(self.matrix_elements)
 
         if process_string:
             self.process_string = process_string
         else:
             self.process_string = self.processes[0].base_string()
 
+        self.process_number = process_number
+
         self.process_name = self.get_process_name()
         self.process_class = "CPPProcess"
 
         self.path = path
-        self.process_number = self.processes[0].get('id')
         self.helas_call_writer = cpp_helas_call_writer
 
         if not isinstance(self.helas_call_writer, helas_call_writers.CPPUFOHelasCallWriter):
@@ -273,42 +283,31 @@
         """Generate the .h and .cc files needed for C++, for the
         processes described by multi_matrix_element"""
 
-        cwd = os.getcwd()
-
-        os.chdir(self.path)
-
-        pathdir = os.getcwd()
-
-    def generate_process_files(self):
-
-        """Generate the .h and .cc files needed for Pythia 8, for the
-        processes described by multi_matrix_element"""
-
-        cwd = os.getcwd()
-
-        os.chdir(self.path)
-
-        pathdir = os.getcwd()
-
-        logger.info('Creating files %(process)s.h and %(process)s.cc in' % \
-                    {'process': self.process_class} +\
-                    ' directory %(dir)s' % {'dir': self.path})
-
         # Create the files
-        filename = '%s.h' % self.process_class
+        if not os.path.isdir(os.path.join(self.path, self.include_dir)):
+            os.makedirs(os.path.join(self.path, self.include_dir))
+        filename = os.path.join(self.path, self.include_dir,
+                                '%s.h' % self.process_class)
         self.write_process_h_file(writers.CPPWriter(filename))
 
-        filename = '%s.cc' % self.process_class
+        if not os.path.isdir(os.path.join(self.path, self.process_dir)):
+            os.makedirs(os.path.join(self.path, self.process_dir))
+        filename = os.path.join(self.path, self.process_dir,
+                                '%s.cc' % self.process_class)
         self.write_process_cc_file(writers.CPPWriter(filename))
 
-        os.chdir(cwd)
+        logger.info('Created files %(process)s.h and %(process)s.cc in' % \
+                    {'process': self.process_class} + \
+                    ' directory %(dir)s' % {'dir': os.path.split(filename)[0]})
+
+
 
     #===========================================================================
     # 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):
             raise writers.CPPWriter.CPPWriterError(\
                 "writer not CPPWriter")
@@ -321,7 +320,7 @@
 
         # Extract model name
         replace_dict['model_name'] = \
-                         self.model.get('name')
+                         self.model_name
 
         # Extract process file name
         replace_dict['process_file_name'] = self.process_name
@@ -356,7 +355,7 @@
         replace_dict['process_file_name'] = self.process_name
 
         # Extract model name
-        replace_dict['model_name'] = self.model.get('name')
+        replace_dict['model_name'] = self.model_name
                          
 
         # Extract class function definitions
@@ -379,7 +378,7 @@
         replace_dict = {}
 
         # Extract model name
-        replace_dict['model_name'] = self.model.get('name')
+        replace_dict['model_name'] = self.model_name
 
         # Extract process info lines for all processes
         process_lines = "\n".join([self.get_process_info_lines(me) for me in \
@@ -398,19 +397,19 @@
 
         # Extract process definition
         process_definition = "%s (%s)" % (self.process_string,
-                                          self.model.get('name'))
+                                          self.model_name)
         replace_dict['process_definition'] = process_definition
 
         process = self.processes[0]
 
         replace_dict['process_code'] = self.process_number
         replace_dict['nexternal'] = self.nexternal
-        replace_dict['nprocesses'] = len(self.matrix_elements)
+        replace_dict['nprocesses'] = self.nprocesses
 
         if self.single_helicities:
             replace_dict['all_sigma_kin_definitions'] = \
                           """// Calculate wavefunctions
-                          void calculate_wavefunctions(const int hel[]);
+                          void calculate_wavefunctions(const int perm[], const int hel[]);
                           static const int nwavefuncs = %d;
                           std::complex<double> w[nwavefuncs][18];""" % \
                                                     len(self.wavefunctions)
@@ -443,7 +442,7 @@
         replace_dict = {}
 
         # Extract model name
-        replace_dict['model_name'] = self.model.get('name')
+        replace_dict['model_name'] = self.model_name
 
         # Extract process info lines
         replace_dict['process_lines'] = \
@@ -507,7 +506,7 @@
         if proc_number != 0:
             process_string = "%d_%s" % (proc_number, process_string)
 
-        process_string = "Sigma_%s_%s" % (self.model.get('name'),
+        process_string = "Sigma_%s_%s" % (self.model_name,
                                           process_string)
         return process_string
 
@@ -585,16 +584,42 @@
                             self.get_helicity_matrix(self.matrix_elements[0])
 
             # Extract denominator
-            replace_dict['den_factors'] = \
-                     ",".join([str(me.get_denominator_factor()) for me in \
-                               self.matrix_elements])
-
+            den_factors = [str(me.get_denominator_factor()) for me in \
+                               self.matrix_elements]
+            if self.nprocesses != len(self.matrix_elements):
+                den_factors.extend(den_factors)
+            replace_dict['den_factors'] = ",".join(den_factors)
             replace_dict['get_matrix_t_lines'] = "\n".join(
                     ["t[%(iproc)d]=matrix_%(proc_name)s();" % \
                      {"iproc": i, "proc_name": \
                       me.get('processes')[0].shell_string().replace("0_", "")} \
                      for i, me in enumerate(self.matrix_elements)])
 
+            # Generate lines for mirror matrix element calculation
+            mirror_matrix_lines = ""
+
+            if any([m.get('has_mirror_process') for m in self.matrix_elements]):
+                mirror_matrix_lines += \
+"""             // Mirror initial state momenta for mirror process
+                perm[0]=1;
+                perm[1]=0;
+                // Calculate wavefunctions
+                calculate_wavefunctions(perm, helicities[ihel]);
+                // Mirror back
+                perm[0]=0;
+                perm[1]=1;
+                // Calculate matrix elements
+                """
+                
+                mirror_matrix_lines += "\n".join(
+                    ["t[%(iproc)d]=matrix_%(proc_name)s();" % \
+                     {"iproc": i + len(self.matrix_elements), "proc_name": \
+                      me.get('processes')[0].shell_string().replace("0_", "")} \
+                     for i, me in enumerate(self.matrix_elements) if me.get('has_mirror_process')])
+                    
+            replace_dict['get_mirror_matrix_lines'] = mirror_matrix_lines
+
+
             file = \
                  read_template_file(\
                             self.process_sigmaKin_function_template) %\
@@ -616,7 +641,7 @@
         ret_lines = []
         if self.single_helicities:
             ret_lines.append(\
-                "void %s::calculate_wavefunctions(const int hel[]){" % \
+                "void %s::calculate_wavefunctions(const int perm[], const int hel[]){" % \
                 class_name)
             ret_lines.append("// Calculate wavefunctions for all processes")
             ret_lines.append(self.get_calculate_wavefunctions(\
@@ -741,6 +766,13 @@
                                 process.get('legs')[1].get('id')) \
                                for process in me.get('processes')]]
 
+            # Add mirror processes, 
+            beam_processes.extend([(len(self.matrix_elements) + i, me) for (i, me) in \
+                              enumerate(self.matrix_elements) if beam_parts in \
+                              [(process.get('legs')[0].get('id'),
+                                process.get('legs')[1].get('id')) \
+                               for process in me.get_mirror_processes()]])
+
             # Now add matrix elements for the processes with the right factors
             res_lines.append("// Add matrix elements for processes with beams %s" % \
                              repr(beam_parts))
@@ -749,7 +781,11 @@
                                         (i, len([proc for proc in \
                                          me.get('processes') if beam_parts == \
                                          (proc.get('legs')[0].get('id'),
-                                          proc.get('legs')[1].get('id'))])) \
+                                          proc.get('legs')[1].get('id')) or \
+                                         me.get('has_mirror_process') and \
+                                         beam_parts == \
+                                         (proc.get('legs')[1].get('id'),
+                                          proc.get('legs')[0].get('id'))])) \
                                         for (i, me) in beam_processes]).\
                               replace('*1', '')))
             res_lines.append("}")
@@ -769,8 +805,8 @@
         helicity_line_list = []
 
         for helicities in matrix_element.get_helicity_matrix():
-            helicity_line_list.append(",".join(['%d'] * len(helicities)) % \
-                                      tuple(helicities))
+            helicity_line_list.append("{"+",".join(['%d'] * len(helicities)) % \
+                                       tuple(helicities) + "}")
 
         return helicity_line + ",".join(helicity_line_list) + "};"
 
@@ -800,7 +836,7 @@
                 num_list = matrix_element.get('color_matrix').\
                                             get_line_numerators(index, denominator)
 
-                matrix_strings.append("%s" % \
+                matrix_strings.append("{%s}" % \
                                      ",".join(["%d" % i for i in num_list]))
             matrix_string = "static const double cf[ncolor][ncolor] = {" + \
                             ",".join(matrix_strings) + "};"
@@ -852,7 +888,8 @@
 # generate_process_files_pythia8
 #===============================================================================
 def generate_process_files_pythia8(multi_matrix_element, cpp_helas_call_writer,
-                                   process_string = "", path = os.getcwd()):
+                                   process_string = "",
+                                   process_number = 0, path = os.getcwd()):
 
     """Generate the .h and .cc files needed for Pythia 8, for the
     processes described by multi_matrix_element"""
@@ -860,10 +897,18 @@
     process_exporter_pythia8 = ProcessExporterPythia8(multi_matrix_element,
                                                       cpp_helas_call_writer,
                                                       process_string,
+                                                      process_number,
                                                       path)
 
+    # 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
 
 #===============================================================================
 # ProcessExporterPythia8
@@ -897,7 +942,7 @@
         replace_dict = {}
 
         # Extract model name
-        replace_dict['model_name'] = self.model.get('name')
+        replace_dict['model_name'] = self.model_name
 
         # Extract process info lines for all processes
         process_lines = "\n".join([self.get_process_info_lines(me) for me in \
@@ -913,12 +958,13 @@
 
         # Extract process definition
         process_definition = "%s (%s)" % (self.process_string,
-                                          self.model.get('name'))
+                                          self.model_name)
         replace_dict['process_definition'] = process_definition
 
         process = self.processes[0]
         replace_dict['process_code'] = 10000 + \
-                                       process.get('id')
+                                       100*process.get('id') + \
+                                       self.process_number
 
         replace_dict['inFlux'] = self.get_process_influx()
 
@@ -926,12 +972,12 @@
         replace_dict['resonances'] = self.get_resonance_lines()
 
         replace_dict['nexternal'] = self.nexternal
-        replace_dict['nprocesses'] = len(self.matrix_elements)
+        replace_dict['nprocesses'] = self.nprocesses
         
         if self.single_helicities:
             replace_dict['all_sigma_kin_definitions'] = \
                           """// Calculate wavefunctions
-                          void calculate_wavefunctions(const int hel[]);
+                          void calculate_wavefunctions(const int perm[], const int hel[]);
                           static const int nwavefuncs = %d;
                           std::complex<double> w[nwavefuncs][18];""" % \
                                                     len(self.wavefunctions)
@@ -964,7 +1010,7 @@
         replace_dict = {}
 
         # Extract model name
-        replace_dict['model_name'] = self.model.get('name')
+        replace_dict['model_name'] = self.model_name
 
         # Extract process info lines
         replace_dict['process_lines'] = \
@@ -1185,8 +1231,17 @@
                               [(process.get('legs')[0].get('id'),
                                 process.get('legs')[1].get('id')) \
                                for process in me.get('processes')]]
+            # Pick out all mirror processes for this beam pair
+            beam_mirror_processes = []
+            if beam_parts[0] != beam_parts[1]:
+                beam_mirror_processes = [(i, me) for (i, me) in \
+                              enumerate(self.matrix_elements) if beam_parts in \
+                              [(process.get('legs')[1].get('id'),
+                                process.get('legs')[0].get('id')) \
+                               for process in me.get('processes')]]
 
             final_id_list = []
+            final_mirror_id_list = []
             for (i, me) in beam_processes:
                 final_id_list.extend([tuple([l.get('id') for l in \
                                              proc.get('legs') if l.get('state')]) \
@@ -1194,9 +1249,23 @@
                                       if beam_parts == \
                                       (proc.get('legs')[0].get('id'),
                                        proc.get('legs')[1].get('id'))])
+            for (i, me) in beam_mirror_processes:
+                final_mirror_id_list.extend([tuple([l.get('id') for l in \
+                                             proc.get('legs') if l.get('state')]) \
+                                      for proc in me.get_mirror_processes() \
+                                      if beam_parts == \
+                                      (proc.get('legs')[0].get('id'),
+                                       proc.get('legs')[1].get('id'))])
             final_id_list = set(final_id_list)
-            ncombs = len(final_id_list)
-            #for ids in final_id_list
+            final_mirror_id_list = set(final_mirror_id_list)
+
+            if final_id_list and final_mirror_id_list or \
+               not final_id_list and not final_mirror_id_list:
+                raise ProcessExporterCPPError,\
+                      "Missing processes, or both process and mirror process"
+
+
+            ncombs = len(final_id_list)+len(final_mirror_id_list)
 
             res_lines.append("// Pick one of the flavor combinations %s" % \
                              ", ".join([repr(ids) for ids in final_id_list]))
@@ -1216,11 +1285,32 @@
                           "More than one process with identical " + \
                           "external particles is not supported"
 
-            res_lines.append("int flavors[%d][%d] = {%s};" % \
-                             (ncombs, self.nfinal,
-                              ",".join(str(id) for id in \
-                                       sum([list(ids) for ids in final_id_list],
-                                           []))))
+            for final_ids in final_mirror_id_list:
+                items = [(i, len([ p for p in me.get_mirror_processes() \
+                             if [l.get('id') for l in p.get('legs')] == \
+                             list(beam_parts) + list(final_ids)])) \
+                       for (i, me) in beam_mirror_processes]
+                me_weight.append("+".join(["matrix_element[%i]*%i" % \
+                                           (i+len(self.matrix_elements), l) for\
+                                           (i, l) in items if l > 0]).\
+                                 replace('*1', ''))
+                if any([l>1 for (i, l) in items]):
+                    raise ProcessExporterCPPError,\
+                          "More than one process with identical " + \
+                          "external particles is not supported"
+
+            if final_id_list:
+                res_lines.append("int flavors[%d][%d] = {%s};" % \
+                                 (ncombs, self.nfinal,
+                                  ",".join(["{" + ",".join([str(id) for id \
+                                            in ids]) + "}" for ids \
+                                            in final_id_list])))
+            elif final_mirror_id_list:
+                res_lines.append("int flavors[%d][%d] = {%s};" % \
+                                 (ncombs, self.nfinal,
+                                  ",".join(["{" + ",".join([str(id) for id \
+                                            in ids]) + "}" for ids \
+                                            in final_mirror_id_list])))
             res_lines.append("vector<double> probs;")
             res_lines.append("double sum = %s;" % "+".join(me_weight))
             for me in me_weight:
@@ -1292,12 +1382,67 @@
                                         for (l,i) in itertools.product(legs, [0,1])])
 
                 # Write out colors for the selected color flow
-                res_lines.append("static int col[%d][%d] = {%s};" % \
-                                 (ncolor, 2 * self.nexternal,
-                                  ",".join(str(i) for i in sum(color_flows, []))))
-
-                res_lines.append("setColAcol(%s);" % \
-                                 ",".join(["col[ic][%d]" % i for i in \
+                res_lines.append("static int colors[%d][%d] = {%s};" % \
+                                 (ncolor, 2 * self.nexternal,
+                                  ",".join(["{" + ",".join([str(id) for id \
+                                            in flows]) + "}" for flows \
+                                            in color_flows])))
+
+                res_lines.append("setColAcol(%s);" % \
+                                 ",".join(["colors[ic][%d]" % i for i in \
+                                          range(2 * self.nexternal)]))
+            res_lines.append('}')
+
+        # Same thing but for mirror processes
+        for ime, me in enumerate(self.matrix_elements):
+            if not me.get('has_mirror_process'):
+                continue
+            res_lines.append("else if(%s){" % \
+                                 "||".join(["&&".join(["id%d == %d" % \
+                                            (i+1, l.get('id')) for (i, l) in \
+                                            enumerate(p.get('legs'))])\
+                                           for p in me.get_mirror_processes()]))
+
+            proc = me.get('processes')[0]
+            if not me.get('color_basis'):
+                # If no color basis, just output trivial color flow
+                res_lines.append("setColAcol(%s);" % ",".join(["0"]*2*self.nfinal))
+            else:
+                # Else, build a color representation dictionnary
+                repr_dict = {}
+                legs = proc.get_legs_with_decays()
+                legs[0:2] = [legs[1],legs[0]]
+                for l in legs:
+                    repr_dict[l.get('number')] = \
+                        proc.get('model').get_particle(l.get('id')).get_color()
+                # Get the list of color flows
+                color_flow_list = \
+                    me.get('color_basis').color_flow_decomposition(\
+                                                      repr_dict, self.ninitial)
+                # Select a color flow
+                ncolor = len(me.get('color_basis'))
+                res_lines.append("""vector<double> probs;
+                  double sum = %s;
+                  for(int i=0;i<ncolor[%i];i++)
+                  probs.push_back(jamp2[%i][i]/sum);
+                  int ic = rndmPtr->pick(probs);""" % \
+                                 ("+".join(["jamp2[%d][%d]" % (ime, i) for i \
+                                            in range(ncolor)]), ime, ime))
+
+                color_flows = []
+                for color_flow_dict in color_flow_list:
+                    color_flows.append([color_flow_dict[l.get('number')][i] % 500 \
+                                        for (l,i) in itertools.product(legs, [0,1])])
+
+                # Write out colors for the selected color flow
+                res_lines.append("static int colors[%d][%d] = {%s};" % \
+                                 (ncolor, 2 * self.nexternal,
+                                  ",".join(["{" + ",".join([str(id) for id \
+                                            in flows]) + "}" for flows \
+                                            in color_flows])))
+
+                res_lines.append("setColAcol(%s);" % \
+                                 ",".join(["colors[ic][%d]" % i for i in \
                                           range(2 * self.nexternal)]))
             res_lines.append('}')
 
@@ -1330,13 +1475,13 @@
     info = misc.get_pkg_info()
     info_lines = ""
     if info and info.has_key('version') and  info.has_key('date'):
-        info_lines = "#  by MadGraph 5 v. %s, %s\n" % \
+        info_lines = "#  MadGraph 5 v. %s, %s\n" % \
                      (info['version'], info['date'])
         info_lines = info_lines + \
                      "#  By the MadGraph Development Team\n" + \
                      "#  Please visit us at https://launchpad.net/madgraph5"
     else:
-        info_lines = "#  by MadGraph 5\n" + \
+        info_lines = "#  MadGraph 5\n" + \
                      "#  By the MadGraph Development Team\n" + \
                      "#  Please visit us at https://launchpad.net/madgraph5"        
 
@@ -1370,7 +1515,7 @@
     return res_str + '*'
 
 #===============================================================================
-# Routines to output UFO models in C++ format
+# Routines to export/output UFO models in C++ format
 #===============================================================================
 
 def convert_model_to_cpp(model, output_dir, wanted_lorentz = [],
@@ -1407,19 +1552,22 @@
                       ('SMINPUTS', (1,)): ('aEM',)}
 
     # Template files to use
+    include_dir = '.'
+    cc_file_dir = '.'
     param_template_h = 'cpp_model_parameters_h.inc'
     param_template_cc = 'cpp_model_parameters_cc.inc'
     aloha_template_h = 'cpp_hel_amps_h.inc'
     aloha_template_cc = 'cpp_hel_amps_cc.inc'
 
-    copy_files = ["read_slha.h", "read_slha.cc"]
+    copy_include_files = []
+    copy_cc_files = []
 
     def __init__(self, model, output_path, wanted_lorentz = [],
                  wanted_couplings = []):
         """ initialization of the objects """
 
         self.model = model
-        self.model_name = model['name']
+        self.model_name = model['name'].replace('-','_')
 
         self.dir_path = output_path
 
@@ -1464,17 +1612,19 @@
             elif 'aS' in key:
                 for p in self.model['parameters'][key]:
                     self.params_dep.append(base_objects.ModelVariable(p.name,
-                                                 self.p_to_cpp.parse(p.expr),
-                                                 p.type,
-                                                 p.depend))
+                                              p.name + " = " + \
+                                              self.p_to_cpp.parse(p.expr) + ";",
+                                              p.type,
+                                              p.depend))
             else:
                 for p in self.model['parameters'][key]:
                     if p.name == 'ZERO':
                         continue
                     self.params_indep.append(base_objects.ModelVariable(p.name,
-                                                 self.p_to_cpp.parse(p.expr),
-                                                 p.type,
-                                                 p.depend))
+                                              p.name + " = " + \
+                                              self.p_to_cpp.parse(p.expr) + ";",
+                                              p.type,
+                                              p.depend))
 
         # For external parameters, want to read off the SLHA block code
         while params_ext:
@@ -1483,19 +1633,19 @@
             expression = ""
             assert param.value.imag == 0
             if len(param.lhacode) == 1:
-                expression = "slha.get_block_entry(\"%s\", %d, %e);" % \
-                             (param.lhablock.lower(), param.lhacode[0],
-                              param.value.real)
+                expression = "%s = slha.get_block_entry(\"%s\", %d, %e);" % \
+                             (param.name, param.lhablock.lower(),
+                              param.lhacode[0], param.value.real)
             elif len(param.lhacode) == 2:
                 expression = "indices[0] = %d;\nindices[1] = %d;\n" % \
                              (param.lhacode[0], param.lhacode[1])
-                expression += "%s=slha.get_block_entry(\"%s\", indices, %e);" \
+                expression += "%s = slha.get_block_entry(\"%s\", indices, %e);" \
                               % (param.name, param.lhablock.lower(), param.value.real)
             else:
                 raise MadGraph5Error("Only support for SLHA blocks with 1 or 2 indices")
             self.params_indep.insert(0,
                                    base_objects.ModelVariable(param.name,
-                                                              expression,
+                                                   expression,
                                                               'real'))
             
     def prepare_couplings(self, wanted_couplings = []):
@@ -1525,7 +1675,7 @@
 
         # Convert coupling expressions from Python to C++
         for coup in self.coups_dep.values() + self.coups_indep:
-            coup.expr = self.p_to_cpp.parse(coup.expr)
+            coup.expr = coup.name + " = " + self.p_to_cpp.parse(coup.expr) + ";"
 
     # Routines for writing the parameter files
 
@@ -1533,15 +1683,47 @@
         """Generate the parameters_model.h and parameters_model.cc
         files, which have the parameters and couplings for the model."""
 
-        parameter_h_file = os.path.join(self.dir_path,
-                                    'Parameters_%s.h' % self.model.get('name'))
-        parameter_cc_file = os.path.join(self.dir_path,
-                                     'Parameters_%s.cc' % self.model.get('name'))
+        if not os.path.isdir(os.path.join(self.dir_path, self.include_dir)):
+            os.makedirs(os.path.join(self.dir_path, self.include_dir))
+        if not os.path.isdir(os.path.join(self.dir_path, self.cc_file_dir)):
+            os.makedirs(os.path.join(self.dir_path, self.cc_file_dir))
+
+        parameter_h_file = os.path.join(self.dir_path, self.include_dir,
+                                    'Parameters_%s.h' % self.model_name)
+        parameter_cc_file = os.path.join(self.dir_path, self.cc_file_dir,
+                                     'Parameters_%s.cc' % self.model_name)
+
+        file_h, file_cc = self.generate_parameters_class_files()
+
+        # Write the files
+        writers.CPPWriter(parameter_h_file).writelines(file_h)
+        writers.CPPWriter(parameter_cc_file).writelines(file_cc)
+
+        # Copy additional needed files
+        for copy_file in self.copy_include_files:
+            shutil.copy(os.path.join(_file_path, 'iolibs',
+                                         'template_files',copy_file),
+                        os.path.join(self.dir_path, self.include_dir))
+        # Copy additional needed files
+        for copy_file in self.copy_cc_files:
+            shutil.copy(os.path.join(_file_path, 'iolibs',
+                                         'template_files',copy_file),
+                        os.path.join(self.dir_path, self.cc_file_dir))
+
+        logger.info("Created files %s and %s in directory" \
+                    % (os.path.split(parameter_h_file)[-1],
+                       os.path.split(parameter_cc_file)[-1]))
+        logger.info("%s and %s" % \
+                    (os.path.split(parameter_h_file)[0],
+                     os.path.split(parameter_cc_file)[0]))
+
+    def generate_parameters_class_files(self):
+        """Create the content of the Parameters_model.h and .cc files"""
 
         replace_dict = {}
 
         replace_dict['info_lines'] = get_mg5_info_lines()
-        replace_dict['model_name'] = self.model.get('name')
+        replace_dict['model_name'] = self.model_name
 
         replace_dict['independent_parameters'] = \
                                    "// Model parameters independent of aS\n" + \
@@ -1578,21 +1760,8 @@
                  replace_dict
         file_cc = read_template_file(self.param_template_cc) % \
                   replace_dict
-
-        # Write the files
-        writers.CPPWriter(parameter_h_file).writelines(file_h)
-        writers.CPPWriter(parameter_cc_file).writelines(file_cc)
-
-        # Copy additional needed files
-        for copy_file in self.copy_files:
-            shutil.copy(os.path.join(_file_path, 'iolibs',
-                                         'template_files',copy_file),
-                            self.dir_path)
-
-        logger.info("Created files %s and %s in directory %s" \
-                    % (os.path.split(parameter_h_file)[-1],
-                       os.path.split(parameter_cc_file)[-1],
-                       os.path.split(parameter_h_file)[0]))
+        
+        return file_h, file_cc
 
     def write_parameters(self, params):
         """Write out the definitions of parameters"""
@@ -1620,10 +1789,7 @@
 
         res_strings = []
         for param in params:
-            if param.expr.find('\n') >= 0:
-                res_strings.append("%s;" % param.expr)
-            else:
-                res_strings.append("%s=%s;" % (param.name, param.expr))
+            res_strings.append("%s" % param.expr)
 
         # Correct width sign for Majorana particles (where the width
         # and mass need to have the same sign)        
@@ -1652,18 +1818,23 @@
     def write_aloha_routines(self):
         """Generate the hel_amps_model.h and hel_amps_model.cc files, which
         have the complete set of generalized Helas routines for the model"""
+        
+        if not os.path.isdir(os.path.join(self.dir_path, self.include_dir)):
+            os.makedirs(os.path.join(self.dir_path, self.include_dir))
+        if not os.path.isdir(os.path.join(self.dir_path, self.cc_file_dir)):
+            os.makedirs(os.path.join(self.dir_path, self.cc_file_dir))
 
-        model_h_file = os.path.join(self.dir_path,
-                                    'hel_amps_%s.h' % self.model.get('name'))
-        model_cc_file = os.path.join(self.dir_path,
-                                     'hel_amps_%s.cc' % self.model.get('name'))
+        model_h_file = os.path.join(self.dir_path, self.include_dir,
+                                    'HelAmps_%s.h' % self.model_name)
+        model_cc_file = os.path.join(self.dir_path, self.cc_file_dir,
+                                     'HelAmps_%s.cc' % self.model_name)
 
         replace_dict = {}
 
         replace_dict['output_name'] = self.output_name
         replace_dict['info_lines'] = get_mg5_info_lines()
         replace_dict['namespace'] = self.namespace
-        replace_dict['model_name'] = self.model.get('name')
+        replace_dict['model_name'] = self.model_name
 
         # Read in the template .h and .cc files, stripped of compiler
         # commands and namespaces
@@ -1671,14 +1842,14 @@
         template_cc_files = self.read_aloha_template_files(ext = 'cc')
 
         aloha_model = create_aloha.AbstractALOHAModel(\
-                                         self.model.get('name'))
+                                         self.model_name)
         if self.wanted_lorentz:
             aloha_model.compute_subset(self.wanted_lorentz)
         else:
             aloha_model.compute_all(save=False)
         for abstracthelas in dict(aloha_model).values():
             aloha_writer = aloha_writers.ALOHAWriterForCPP(abstracthelas,
-                                                        self.dir_path)
+                                                           self.dir_path)
             header = aloha_writer.define_header()
             template_h_files.append(self.write_function_declaration(\
                                          aloha_writer, header))
@@ -1695,10 +1866,12 @@
         writers.CPPWriter(model_h_file).writelines(file_h)
         writers.CPPWriter(model_cc_file).writelines(file_cc)
 
-        logger.info("Created files %s and %s in directory %s" \
+        logger.info("Created files %s and %s in directory" \
                     % (os.path.split(model_h_file)[-1],
-                       os.path.split(model_cc_file)[-1],
-                       os.path.split(model_h_file)[0]))
+                       os.path.split(model_cc_file)[-1]))
+        logger.info("%s and %s" % \
+                    (os.path.split(model_h_file)[0],
+                     os.path.split(model_cc_file)[0]))
 
 
     def read_aloha_template_files(self, ext):
@@ -1752,15 +1925,113 @@
         return line
 
 #===============================================================================
-# Routines to output UFO models in Pythia8 format
-#===============================================================================
-
-def convert_model_to_pythia8(model, output_dir):
+# generate_example_file_pythia8
+#===============================================================================
+def generate_example_file_pythia8(path,
+                                   model_path,
+                                   process_names,
+                                   exporter,
+                                   main_file_name = "",
+                                   example_dir = "examples"):
+    """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
+    file = read_template_file('pythia8_main_example_cc.inc') % \
+           replace_dict
+
+    if not main_file_name:
+        num = 1
+        while 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('pythia8_main_makefile.inc') % \
+           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
+
+    
+
+#===============================================================================
+# Routines to export/output UFO models in Pythia8 format
+#===============================================================================
+
+def convert_model_to_pythia8(model, pythia_dir):
     """Create a full valid Pythia 8 model from an MG5 model (coming from UFO)"""
 
+    if not os.path.isfile(os.path.join(pythia_dir, 'include', 'Pythia.h')):
+        logger.warning('Directory %s is not a valid Pythia 8 main dir.' % pythia_dir)
+
     # create the model parameter files
-    model_builder = UFOModelConverterPythia8(model, output_dir)
+    model_builder = UFOModelConverterPythia8(model, pythia_dir)
+    model_builder.cc_file_dir = "Processes_" + model_builder.model_name
+    model_builder.include_dir = model_builder.cc_file_dir
+
     model_builder.write_files()
+    # Write makefile
+    model_builder.write_makefile()
+    # Write param_card
+    model_builder.write_param_card()
+    return model_builder.model_name, model_builder.cc_file_dir
 
 #===============================================================================
 # UFOModelConverterPythia8
@@ -1772,7 +2043,7 @@
     # Static variables (for inheritance)
     output_name = 'Pythia 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)))',
@@ -1798,20 +2069,21 @@
             elif 'aS' in key:
                 for p in self.model['parameters'][key]:
                     self.params_dep.append(base_objects.ModelVariable(p.name,
-                                                 self.p_to_cpp.parse(p.expr),
+                                                 p.name + " = " + \
+                                                 self.p_to_cpp.parse(p.expr) + ';',
                                                  p.type,
                                                  p.depend))
             else:
                 for p in self.model['parameters'][key]:
                     self.params_indep.append(base_objects.ModelVariable(p.name,
-                                                 self.p_to_cpp.parse(p.expr),
+                                                 p.name + " = " + \
+                                                 self.p_to_cpp.parse(p.expr) + ';',
                                                  p.type,
                                                  p.depend))
 
         # For external parameters, want to use the internal Pythia
         # parameters for SM params and masses and widths. For other
-        # parameters, want to read off the SLHA block code (TO BE
-        # IMPLEMENTED)
+        # parameters, want to read off the SLHA block code
         while params_ext:
             param = params_ext.pop(0)
             key = (param.lhablock, tuple(param.lhacode))
@@ -1819,35 +2091,100 @@
                 # This value needs to be set event by event
                 self.params_dep.insert(0,
                                        base_objects.ModelVariable(param.name,
-                                                         self.slha_to_expr[key],
-                                                         'real'))
+                                                   param.name + ' = ' + \
+                                                   self.slha_to_expr[key] + ';',
+                                                   'real'))
             else:
                 try:
                     # This is an SM parameter defined above
                     self.params_indep.insert(0,
                                              base_objects.ModelVariable(param.name,
-                                                         self.slha_to_expr[key],
-                                                         'real'))
+                                                   param.name + ' = ' + \
+                                                   self.slha_to_expr[key] + ';',
+                                                   'real'))
                 except:
                     # For Yukawa couplings, masses and widths, insert
                     # the Pythia 8 value
                     if param.lhablock == 'YUKAWA':
-                        self.slha_to_expr[key] = 'pd->mRun(%i, 120.)' \
+                        self.slha_to_expr[key] = 'pd->mRun(%i, pd->m0(24))' \
                                                  % param.lhacode[0]
                     if param.lhablock == 'MASS':
                         self.slha_to_expr[key] = 'pd->m0(%i)' \
                                             % param.lhacode[0]
                     if param.lhablock == 'DECAY':
-                        self.slha_to_expr[key] = 'pd->mWidth(%i)' \
-                                            % param.lhacode[0]
+                        self.slha_to_expr[key] = \
+                                            'pd->mWidth(%i)' % param.lhacode[0]
                     if key in self.slha_to_expr:
                         self.params_indep.insert(0,\
-                                                 base_objects.ModelVariable(param.name,
-                                                          self.slha_to_expr[key],
-                                                          'real'))
+                                     base_objects.ModelVariable(param.name,
+                                     param.name + "=" + self.slha_to_expr[key] \
+                                                                + ';',
+                                                                'real'))
                     else:
-                        # Fix unknown parameters as soon as Pythia has fixed this
-                        raise MadGraph5Error, \
-                              "Parameter with key " + repr(key) + \
-                              " unknown in model export to Pythia 8"
-
+                        # This is a BSM parameter which is read from SLHA
+                        if len(param.lhacode) == 1:
+                            expression = "if(!slhaPtr->getEntry<double>(\"%s\", %d, %s)){\n" % \
+                                         (param.lhablock.lower(),
+                                          param.lhacode[0],
+                                          param.name) + \
+                                          ("cout << \"Warning, setting %s to %e\" << endl;\n" \
+                                          + "%s = %e;}") % (param.name, param.value.real,
+                                                           param.name, param.value.real)
+                        elif len(param.lhacode) == 2:
+                            expression = "if(!slhaPtr->getEntry<double>(\"%s\", %d, %d, %s)){\n" % \
+                                         (param.lhablock.lower(),
+                                          param.lhacode[0],
+                                          param.lhacode[1],
+                                          param.name) + \
+                                          ("cout << \"Warning, setting %s to %e\" << endl;\n" \
+                                          + "%s = %e;}") % (param.name, param.value.real,
+                                                           param.name, param.value.real)
+                        elif len(param.lhacode) == 3:
+                            expression = "if(!slhaPtr->getEntry<double>(\"%s\", %d, %d, %d, %s)){\n" % \
+                                         (param.lhablock.lower(),
+                                          param.lhacode[0],
+                                          param.lhacode[1],
+                                          param.lhacode[2],
+                                          param.name) + \
+                                          ("cout << \"Warning, setting %s to %e\" << endl;\n" \
+                                          + "%s = %e;}") % (param.name, param.value.real,
+                                                           param.name, param.value.real)
+                        else:
+                            raise MadGraph5Error("Only support for SLHA blocks with 1 or 2 indices")
+                        self.params_indep.insert(0,
+                                               base_objects.ModelVariable(param.name,
+                                                                          expression,
+                                                                          'real'))
+
+    def write_makefile(self):
+        """Generate the Makefile, which creates library files."""
+
+        makefilename = os.path.join(self.dir_path, self.cc_file_dir,
+                                    'Makefile')
+
+        replace_dict = {}
+
+        replace_dict['info_lines'] = get_mg5_info_lines()
+        replace_dict['model'] = self.model_name
+
+        makefile = read_template_file('pythia8_makefile.inc') % replace_dict
+
+        # Write the files
+        open(makefilename, 'w').write(makefile)
+
+        logger.info("Created %s in directory %s" \
+                    % (os.path.split(makefilename)[-1],
+                       os.path.split(makefilename)[0]))
+
+    def write_param_card(self):
+        """Generate the param_card for the model."""
+
+        paramcardname = os.path.join(self.dir_path, self.cc_file_dir,
+                                    'param_card_%s.dat' % self.model_name)
+        # Write out param_card
+        open(paramcardname, 'w').write(\
+            self.model.write_param_card())
+
+        logger.info("Created %s in directory %s" \
+                    % (os.path.split(paramcardname)[-1],
+                       os.path.split(paramcardname)[0]))

=== modified file 'madgraph/iolibs/group_subprocs.py'
--- madgraph/iolibs/group_subprocs.py	2011-03-23 13:50:59 +0000
+++ madgraph/iolibs/group_subprocs.py	2011-03-31 16:46:04 +0000
@@ -384,6 +384,23 @@
         """Test if object obj is a valid element."""
 
         return isinstance(obj, SubProcessGroup)
+
+    def get_matrix_elements(self):
+        """Extract the list of matrix elements"""
+        return helas_objects.HelasMatrixElementList(\
+            sum([group.get('matrix_elements') for group in self], []))
+
+    def get_used_lorentz(self):
+        """Return the list of ALOHA routines used in these matrix elements"""
+        
+        return helas_objects.HelasMultiProcess(
+            {'matrix_elements': self.get_matrix_elements()}).get_used_lorentz()
+    
+    def get_used_couplings(self):
+        """Return the list of ALOHA routines used in these matrix elements"""
+        
+        return helas_objects.HelasMultiProcess(
+            {'matrix_elements': self.get_matrix_elements()}).get_used_couplings()
     
 #===============================================================================
 # DecayChainSubProcessGroup

=== modified file 'madgraph/iolibs/helas_call_writers.py'
--- madgraph/iolibs/helas_call_writers.py	2010-12-19 03:57:07 +0000
+++ madgraph/iolibs/helas_call_writers.py	2011-03-31 16:46:04 +0000
@@ -977,7 +977,7 @@
             # Fill out with X up to 6 positions
             call = call + 'x' * (6 - len(call))
             # Specify namespace for Helas calls
-            call = call + "(p[%d],"
+            call = call + "(p[perm[%d]],"
             if argument.get('spin') != 1:
                 # For non-scalars, need mass and helicity
                 call = call + "mME[%d],hel[%d],"

=== modified file 'madgraph/iolibs/misc.py'
--- madgraph/iolibs/misc.py	2011-03-16 09:16:15 +0000
+++ madgraph/iolibs/misc.py	2011-03-31 16:46:04 +0000
@@ -120,7 +120,7 @@
         
     if timeout:
         signal.alarm(timeout)
-        question += '[%ss to answer [%s]] ' % (timeout, str(default))    
+        question += '[%ss to answer] ' % (timeout)    
     try:
         result = fct(question)
     except TimeOutError:

=== modified file 'madgraph/iolibs/template_files/Makefile_sa_cpp_src'
--- madgraph/iolibs/template_files/Makefile_sa_cpp_src	2010-10-27 16:56:32 +0000
+++ madgraph/iolibs/template_files/Makefile_sa_cpp_src	2011-03-31 16:46:04 +0000
@@ -5,7 +5,7 @@
 
 all: $(target)
 
-objects=hel_amps_%(model)s.o Parameters_%(model)s.o rambo.o read_slha.o
+objects=HelAmps_%(model)s.o Parameters_%(model)s.o rambo.o read_slha.o
 
 $(target): $(objects)
 	$(AR) cru $@ $(objects)

=== modified file 'madgraph/iolibs/template_files/cpp_hel_amps_cc.inc'
--- madgraph/iolibs/template_files/cpp_hel_amps_cc.inc	2010-10-27 21:30:35 +0000
+++ madgraph/iolibs/template_files/cpp_hel_amps_cc.inc	2011-03-31 16:46:04 +0000
@@ -3,7 +3,7 @@
 %(info_lines)s
 //==========================================================================
 
-#include "hel_amps_%(model_name)s.h"
+#include "HelAmps_%(model_name)s.h"
 
 namespace %(namespace)s_%(model_name)s {
 

=== modified file 'madgraph/iolibs/template_files/cpp_hel_amps_h.inc'
--- madgraph/iolibs/template_files/cpp_hel_amps_h.inc	2010-10-27 21:30:35 +0000
+++ madgraph/iolibs/template_files/cpp_hel_amps_h.inc	2011-03-31 16:46:04 +0000
@@ -3,8 +3,8 @@
 %(info_lines)s
 //==========================================================================
 
-#ifndef hel_amps_%(model_name)s_H
-#define hel_amps_%(model_name)s_H
+#ifndef HelAmps_%(model_name)s_H
+#define HelAmps_%(model_name)s_H
 
 #include <cmath> 
 #include <complex>
@@ -15,4 +15,4 @@
 %(function_declarations)s
 } // end namespace %(namespace)s_%(model_name)s
 
-#endif // hel_amps_%(model_name)s_H
\ No newline at end of file
+#endif // HelAmps_%(model_name)s_H
\ No newline at end of file

=== modified file 'madgraph/iolibs/template_files/cpp_process_cc.inc'
--- madgraph/iolibs/template_files/cpp_process_cc.inc	2010-10-27 16:56:32 +0000
+++ madgraph/iolibs/template_files/cpp_process_cc.inc	2011-03-31 16:46:04 +0000
@@ -1,10 +1,10 @@
 //==========================================================================
-// This file has been automatically generated for Pythia 8 by
+// This file has been automatically generated for C++ Standalone by
 %(info_lines)s
 //==========================================================================
 
 #include "CPPProcess.h"
-#include "hel_amps_%(model_name)s.h"
+#include "HelAmps_%(model_name)s.h"
 
 using namespace MG5_%(model_name)s;
 

=== modified file 'madgraph/iolibs/template_files/cpp_process_h.inc'
--- madgraph/iolibs/template_files/cpp_process_h.inc	2010-10-27 16:56:32 +0000
+++ madgraph/iolibs/template_files/cpp_process_h.inc	2011-03-31 16:46:04 +0000
@@ -1,5 +1,5 @@
 //==========================================================================
-// This file has been automatically generated for Pythia 8
+// This file has been automatically generated for C++ Standalone by
 %(info_lines)s
 //==========================================================================
 

=== modified file 'madgraph/iolibs/template_files/cpp_process_sigmaKin_function.inc'
--- madgraph/iolibs/template_files/cpp_process_sigmaKin_function.inc	2010-10-27 16:56:32 +0000
+++ madgraph/iolibs/template_files/cpp_process_sigmaKin_function.inc	2011-03-31 16:46:04 +0000
@@ -17,13 +17,19 @@
 for(int i = 0; i < nprocesses; i++){
     matrix_element[i] = 0.;
 }
+// Define permutation
+int perm[nexternal];
+for(int i = 0; i < nexternal; i++){
+  perm[i]=i;
+}
 
 if (sum_hel == 0 || ntry < 10){
 // Calculate the matrix element for all helicities
   for(int ihel = 0; ihel < ncomb; ihel ++){
     if (goodhel[ihel] || ntry < 2){
-      calculate_wavefunctions(helicities[ihel]);
+      calculate_wavefunctions(perm, helicities[ihel]);
       %(get_matrix_t_lines)s
+%(get_mirror_matrix_lines)s
       double tsum = 0;
       for(int iproc = 0;iproc < nprocesses; iproc++){
          matrix_element[iproc]+=t[iproc];
@@ -48,8 +54,9 @@
     if (jhel >= ngood) jhel=0;
     double hwgt = double(ngood)/double(sum_hel);
     int ihel = igood[jhel];
-    calculate_wavefunctions(helicities[ihel]);
+    calculate_wavefunctions(perm, helicities[ihel]);
     %(get_matrix_t_lines)s
+%(get_mirror_matrix_lines)s
     for(int iproc = 0;iproc < nprocesses; iproc++){
       matrix_element[iproc]+=t[iproc]*hwgt;
     }

=== added file 'madgraph/iolibs/template_files/pythia8_main_example_cc.inc'
--- madgraph/iolibs/template_files/pythia8_main_example_cc.inc	1970-01-01 00:00:00 +0000
+++ madgraph/iolibs/template_files/pythia8_main_example_cc.inc	2011-03-31 16:46:04 +0000
@@ -0,0 +1,71 @@
+//==========================================================================
+// This file has been automatically generated for Pythia 8 by
+%(info_lines)s
+// File based on main25.cc in Pythia 8.149
+//==========================================================================
+
+#include "Pythia.h"
+%(include_lines)s
+
+using namespace Pythia8; 
+ 
+int main() {
+
+  // Number of events to generate and to list. Max number of errors.
+  // Warning: generation of complete events is much slower than if you use
+  // PartonLevel:all = off to only get cross sections, so adjust nEvent.
+  int nEvent = 3000;
+  int nList  = 1;
+  int nAbort = 5;
+
+  // Pythia generator.
+  Pythia pythia;
+
+  // Read param_card file
+  pythia.readString("SLHA:file = %(param_card)s");
+
+  // Provide process pointers to Pythia
+  %(sigma_pointer_lines)s
+
+  // Phase space cut on pThat.
+  pythia.readString("PhaseSpace:pTHatMin = 20.");
+
+  // Optionally only compare cross sections.
+  pythia.readString("PartonLevel:all = off");
+
+  // Initialization for LHC.
+  pythia.init( 2212, 2212, 14000.);
+
+  // List changes.
+  pythia.settings.listChanged();
+  pythia.particleData.listChanged();
+
+  // Begin event loop.
+  int iAbort = 0;
+  for (int iEvent = 0; iEvent < nEvent; ++iEvent) {
+    if (iEvent%%(max(1,nEvent/20)) == 0) 
+      cout << " Now begin event " << iEvent << "\n";
+
+    // Generate events. Quit if many failures.
+    if (!pythia.next()) {
+      if (++iAbort < nAbort) continue;
+      cout << " Event generation aborted prematurely, owing to error!\n"; 
+      break;
+    }
+ 
+    // List first few events.
+    if (iEvent < nList) { 
+      pythia.info.list();
+      pythia.process.list();
+      pythia.event.list();
+    }
+
+  // End of event loop.
+  }
+
+  // Final statistics.
+  pythia.statistics();
+
+  // Done.
+  return 0;
+}

=== added file 'madgraph/iolibs/template_files/pythia8_main_makefile.inc'
--- madgraph/iolibs/template_files/pythia8_main_makefile.inc	1970-01-01 00:00:00 +0000
+++ madgraph/iolibs/template_files/pythia8_main_makefile.inc	2011-03-31 16:46:04 +0000
@@ -0,0 +1,39 @@
+#==========================================================================
+# This file has been automatically generated for Pythia 8 by
+%(info_lines)s
+#==========================================================================
+
+SHELL = /bin/sh
+
+-include ../config.mk
+
+# flags:
+#
+#FFLAGSSHARED = -fPIC
+CFLAGSSHARED = -fPIC
+CXXFLAGSSHARED = -fPIC
+
+# Location of directories.
+TMPDIR=../tmp
+INCDIR1=include
+INCDIR2=%(include_dir)s
+SRCDIR=.
+LIBDIR=lib
+LIBDIRARCH=lib/archive
+PROCDIR=%(process_dir)s
+
+all: $(targets) ../config.mk
+
+config.mk: ../configure
+	cd ..; ./configure
+
+CPPFLAGS= -I../$(INCDIR1) -I../$(INCDIR2)
+LIBS=-L../$(LIBDIRARCH) -lpythia8 -llhapdfdummy -l$(PROCDIR)
+
+all: %(main_file)s
+
+%(main_file)s: %(main_file)s.o ../$(LIBDIRARCH)/lib$(PROCDIR).a
+	g++ -o %(main_file)s %(main_file)s.o $(LIBS)
+
+../$(LIBDIRARCH)/lib$(PROCDIR).a: ../$(PROCDIR)/Makefile
+	cd ../$(PROCDIR); make

=== added file 'madgraph/iolibs/template_files/pythia8_makefile.inc'
--- madgraph/iolibs/template_files/pythia8_makefile.inc	1970-01-01 00:00:00 +0000
+++ madgraph/iolibs/template_files/pythia8_makefile.inc	2011-03-31 16:46:04 +0000
@@ -0,0 +1,107 @@
+#==========================================================================
+# This file has been automatically generated for Pythia 8 by
+%(info_lines)s
+# Makefile in compliance with the Pythia 8 1.4.9 makefile
+#==========================================================================
+
+SHELL = /bin/sh
+
+-include ../config.mk
+
+# flags:
+#
+#FFLAGSSHARED = -fPIC
+CFLAGSSHARED = -fPIC
+CXXFLAGSSHARED = -fPIC
+
+# Location of directories.
+TMPDIR=tmp
+INCDIR=../include
+SRCDIR=.
+LIBDIR=../lib
+LIBDIRARCH=../lib/archive
+
+# Location of libraries to be built.
+ifeq ($(SHAREDLIBS),yes)
+  targets=$(LIBDIRARCH)/libProcesses_%(model)s.a
+  targets+=$(LIBDIR)/libProcesses_%(model)s.$(SHAREDSUFFIX)
+else
+  targets=$(LIBDIRARCH)/libProcesses_%(model)s.a
+endif
+
+all: $(targets) ../config.mk
+
+config.mk: ../configure
+	cd ..; ./configure
+
+# Main part: build library. 
+
+$(TMPDIR)/%%.o : $(SRCDIR)/%%.cc
+	@mkdir -p $(TMPDIR)
+	$(CXX) $(CXXFLAGS) $(CXXFLAGSSHARED) -c -I$(INCDIR) -I$(SRCDIR) $< -o $@
+
+$(TMPDIR)/archive/%%.o : $(SRCDIR)/%%.cc
+	@mkdir -p $(TMPDIR)/archive
+	$(CXX) $(CXXFLAGS) -c -I$(INCDIR) -I$(SRCDIR) $< -o $@
+
+# Creating the dependency files *.d
+# The compiler with option -M is used to build the dependency strings. They
+# are further edited with sed (stream editor). The first sed command adds the
+# dependency for the *.d files themselves, the second one is needed because
+# object files are put in the directory different from src. The last line
+# removes empty *.d files produced in case of error.
+
+ifeq ($(SHAREDLIBS),yes)
+  $(TMPDIR)/%%.d : $(SRCDIR)/%%.cc
+	@echo Making dependency for file $<; \
+	mkdir -p $(TMPDIR); \
+	$(CC) -M -I$(INCDIR) -I$(SRCDIR) $< | \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' | \
+	sed 's/$*\.o/$(TMPDIR)\/$*.o/' > $@; \
+	[ -s $@ ] || rm -f $@
+endif
+
+$(TMPDIR)/archive/%%.d : $(SRCDIR)/%%.cc
+	@echo Making dependency for file $<; \
+	mkdir -p $(TMPDIR)/archive; \
+	$(CC) -M -I$(INCDIR) -I$(SRCDIR) $< | \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' | \
+	sed 's/$*\.o/$(TMPDIR)\/archive\/$*.o/' > $@; \
+	[ -s $@ ] || rm -f $@
+
+objects := $(patsubst $(SRCDIR)/%%.cc,$(TMPDIR)/%%.o,$(wildcard $(SRCDIR)/*.cc))
+objectsarch := $(patsubst $(SRCDIR)/%%.cc,$(TMPDIR)/archive/%%.o,$(wildcard $(SRCDIR)/*.cc))
+
+$(LIBDIR)/libProcesses_%(model)s.$(SHAREDSUFFIX): $(objects)
+	@mkdir -p $(LIBDIR)
+	$(CXX) $(LDFLAGSSHARED) -o $@ $(objects) $(LDFLAGLIBNAME),$(notdir $@)
+
+$(LIBDIRARCH)/libProcesses_%(model)s.a: $(objectsarch)
+	@mkdir -p $(LIBDIRARCH)
+	ar cru $@ $(objectsarch)
+
+deps := $(patsubst $(SRCDIR)/%%.cc,$(TMPDIR)/%%.d,$(wildcard $(SRCDIR)/*.cc))
+depsarch := $(patsubst $(SRCDIR)/%%.cc,$(TMPDIR)/archive/%%.d,$(wildcard $(SRCDIR)/*.cc))
+
+
+# The "if" below is needed in order to avoid producing the dependency files
+# when you want to just clean
+
+ifeq (,$(findstring clean, $(MAKECMDGOALS)))
+-include $(deps)
+-include $(depsarch)
+endif
+
+# Clean up: remove (almost?) everything that cannot be recreated.
+
+.PHONY: clean distclean
+
+clean:
+	rm -rf $(TMPDIR)
+	rm -rf $(LIBDIR)
+
+distclean: clean
+	rm -f config.mk
+	rm -f *~; rm -f \#*;
+	cd $(SRCDIR); rm -f *~; rm -f \#*; cd -
+	cd $(INCDIR); rm -f *~; rm -f \#*; cd -

=== modified file 'madgraph/iolibs/template_files/pythia8_model_parameters_cc.inc'
--- madgraph/iolibs/template_files/pythia8_model_parameters_cc.inc	2010-07-30 07:30:26 +0000
+++ madgraph/iolibs/template_files/pythia8_model_parameters_cc.inc	2011-03-31 16:46:04 +0000
@@ -20,19 +20,16 @@
 	return instance;
     }
 
-    void Parameters_%(model_name)s::setIndependentParameters(ParticleData*& pd, CoupSM*& csm){
-	// First set "zero"
-	zero=0;
-	ZERO=0;
+    void Parameters_%(model_name)s::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){
 	%(set_independent_parameters)s
     }
-    void Parameters_%(model_name)s::setIndependentCouplings(ParticleData*& pd, CoupSM*& csm){
+    void Parameters_%(model_name)s::setIndependentCouplings(){
 	%(set_independent_couplings)s
     }
-    void Parameters_%(model_name)s::setDependentParameters(ParticleData*& pd, CoupSM*& csm, double alpS){
+    void Parameters_%(model_name)s::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){
 	%(set_dependent_parameters)s
     }
-    void Parameters_%(model_name)s::setDependentCouplings(ParticleData*& pd, CoupSM*&csm){
+    void Parameters_%(model_name)s::setDependentCouplings(){
 	%(set_dependent_couplings)s
     }
 

=== modified file 'madgraph/iolibs/template_files/pythia8_model_parameters_h.inc'
--- madgraph/iolibs/template_files/pythia8_model_parameters_h.inc	2010-09-21 04:20:25 +0000
+++ madgraph/iolibs/template_files/pythia8_model_parameters_h.inc	2011-03-31 16:46:04 +0000
@@ -10,6 +10,7 @@
 
 #include "ParticleData.h"
 #include "StandardModel.h"
+#include "SusyLesHouches.h"
 
 using namespace std;
 
@@ -21,21 +22,19 @@
 
 static Parameters_%(model_name)s* getInstance();
 
-// Define "zero"
-double zero, ZERO;
 %(independent_parameters)s
 %(independent_couplings)s
 %(dependent_parameters)s
 %(dependent_couplings)s
 
 // Set parameters that are unchanged during the run
-void setIndependentParameters(ParticleData*& pd, CoupSM*& csm);
+void setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr);
 // Set couplings that are unchanged during the run
-void setIndependentCouplings(ParticleData*& pd, CoupSM*& csm);
+void setIndependentCouplings();
 // Set parameters that are changed event by event
-void setDependentParameters(ParticleData*& pd, CoupSM*& csm, double alpS);
+void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS);
 // Set couplings that are changed event by event
-void setDependentCouplings(ParticleData*& pd, CoupSM*& csm);
+void setDependentCouplings();
 
 // Print parameters that are unchanged during the run
 void printIndependentParameters();

=== modified file 'madgraph/iolibs/template_files/pythia8_process_cc.inc'
--- madgraph/iolibs/template_files/pythia8_process_cc.inc	2010-08-08 10:22:18 +0000
+++ madgraph/iolibs/template_files/pythia8_process_cc.inc	2011-03-31 16:46:04 +0000
@@ -4,7 +4,7 @@
 //==========================================================================
 
 #include "%(process_file_name)s.h"
-#include "hel_amps_%(model_name)s.h"
+#include "HelAmps_%(model_name)s.h"
 
 using namespace Pythia8_%(model_name)s;
 

=== modified file 'madgraph/iolibs/template_files/pythia8_process_function_definitions.inc'
--- madgraph/iolibs/template_files/pythia8_process_function_definitions.inc	2010-08-08 14:06:25 +0000
+++ madgraph/iolibs/template_files/pythia8_process_function_definitions.inc	2011-03-31 16:46:04 +0000
@@ -8,8 +8,8 @@
 void %(process_class_name)s::initProc() {
 // Instantiate the model class and set parameters that stay fixed during run
     pars = Parameters_%(model_name)s::getInstance();
-    pars->setIndependentParameters(particleDataPtr, coupSMPtr);
-    pars->setIndependentCouplings(particleDataPtr, coupSMPtr);
+    pars->setIndependentParameters(particleDataPtr, couplingsPtr, slhaPtr);
+    pars->setIndependentCouplings();
     %(initProc_lines)s
 } 
 
@@ -18,8 +18,8 @@
 
 void %(process_class_name)s::sigmaKin() { 
     // Set the parameters which change event by event
-    pars->setDependentParameters(particleDataPtr, coupSMPtr, alpS);
-    pars->setDependentCouplings(particleDataPtr, coupSMPtr);
+    pars->setDependentParameters(particleDataPtr, couplingsPtr, slhaPtr, alpS);
+    pars->setDependentCouplings();
     // Reset color flows
     %(reset_jamp_lines)s
     %(sigmaKin_lines)s

=== modified file 'madgraph/iolibs/template_files/pythia8_process_sigmaKin_function.inc'
--- madgraph/iolibs/template_files/pythia8_process_sigmaKin_function.inc	2010-09-21 04:20:25 +0000
+++ madgraph/iolibs/template_files/pythia8_process_sigmaKin_function.inc	2011-03-31 16:46:04 +0000
@@ -4,7 +4,6 @@
 static int ntry = 0, sum_hel = 0, ngood = 0;
 static int igood[ncomb];
 static int jhel;
-std::complex<double> **wfs;
 double t[nprocesses];
 // Helicities for the process
 %(helicity_matrix)s
@@ -16,6 +15,13 @@
 // Reset the matrix elements
 for(int i = 0; i < nprocesses; i++){
     matrix_element[i] = 0.;
+    t[i] = 0.;
+}
+
+// Define permutation
+int perm[nexternal];
+for(int i = 0; i < nexternal; i++){
+  perm[i]=i;
 }
 
 // For now, call setupForME() here
@@ -29,8 +35,9 @@
 // Calculate the matrix element for all helicities
   for(int ihel = 0; ihel < ncomb; ihel ++){
     if (goodhel[ihel] || ntry < 2){
-      calculate_wavefunctions(helicities[ihel]);
+      calculate_wavefunctions(perm, helicities[ihel]);
       %(get_matrix_t_lines)s
+%(get_mirror_matrix_lines)s
       double tsum = 0;
       for(int iproc = 0;iproc < nprocesses; iproc++){
          matrix_element[iproc]+=t[iproc];
@@ -55,8 +62,9 @@
     if (jhel >= ngood) jhel=0;
     double hwgt = double(ngood)/double(sum_hel);
     int ihel = igood[jhel];
-    calculate_wavefunctions(helicities[ihel]);
+    calculate_wavefunctions(perm, helicities[ihel]);
     %(get_matrix_t_lines)s
+%(get_mirror_matrix_lines)s
     for(int iproc = 0;iproc < nprocesses; iproc++){
       matrix_element[iproc]+=t[iproc]*hwgt;
     }

=== modified file 'madgraph/iolibs/template_files/pythia8_process_wavefunctions.inc'
--- madgraph/iolibs/template_files/pythia8_process_wavefunctions.inc	2010-08-23 01:56:08 +0000
+++ madgraph/iolibs/template_files/pythia8_process_wavefunctions.inc	2011-03-31 16:46:04 +0000
@@ -1,5 +1,5 @@
 double p[nexternal][4];
-int i,j;
+int i;
  
 // Convert Pythia 4-vectors to double[]
 for(i=0;i < nexternal;i++){

=== modified file 'madgraph/iolibs/template_files/read_slha.cc'
--- madgraph/iolibs/template_files/read_slha.cc	2010-09-21 04:20:25 +0000
+++ madgraph/iolibs/template_files/read_slha.cc	2011-03-31 16:46:04 +0000
@@ -123,7 +123,7 @@
 }
 
 
-double SLHAReader::set_block_entry(string block_name, vector<int> indices, 
+void SLHAReader::set_block_entry(string block_name, vector<int> indices, 
 				   double value)
 {
   if (_blocks.find(block_name) == _blocks.end()){
@@ -137,7 +137,7 @@
      cout << "to " << _blocks[block_name].get_entry(indices) << endl;*/
 }
 
-double SLHAReader::set_block_entry(string block_name, int index, 
+void SLHAReader::set_block_entry(string block_name, int index, 
 				   double value)
 {
   vector<int> indices;

=== modified file 'madgraph/iolibs/template_files/read_slha.h'
--- madgraph/iolibs/template_files/read_slha.h	2010-09-21 04:20:25 +0000
+++ madgraph/iolibs/template_files/read_slha.h	2011-03-31 16:46:04 +0000
@@ -20,7 +20,7 @@
   private:
     string _name;
     map<vector<int>,double> _entries;
-    int _indices;
+    unsigned int _indices;
 };
 
 class SLHAReader
@@ -34,9 +34,9 @@
 			   double def_val = 0);
     double get_block_entry(string block_name, int index, 
 			   double def_val = 0);
-    double set_block_entry(string block_name, vector<int> indices, 
+    void set_block_entry(string block_name, vector<int> indices, 
 			   double value);
-    double set_block_entry(string block_name, int index, 
+    void set_block_entry(string block_name, int index, 
 			   double value);
   private:
     map<string, SLHABlock> _blocks;

=== modified file 'tests/acceptance_tests/test_cmd.py'
--- tests/acceptance_tests/test_cmd.py	2011-03-24 16:15:56 +0000
+++ tests/acceptance_tests/test_cmd.py	2011-03-31 16:46:04 +0000
@@ -117,7 +117,6 @@
         
     def tearDown(self):
         """ basic destruction after have run """
-        return
         if os.path.exists(self.out_dir):
             shutil.rmtree(self.out_dir)
 
@@ -878,30 +877,24 @@
         if os.path.isdir(self.out_dir):
             shutil.rmdir(self.out_dir)
 
-        os.mkdir(self.out_dir)        
+        # Create out_dir and out_dir/include
+        os.makedirs(os.path.join(self.out_dir,'include'))
+        # Touch the file Pythia.h, which is needed to verify that this is a Pythia dir
+        py_h_file = open(os.path.join(self.out_dir,'include','Pythia.h'), 'w')
+        py_h_file.close()
 
         self.do('import model sm')
-        self.do('output pythia8_model %s ' % self.out_dir)
-        # Check that the needed files are generated
-        files = ['hel_amps_sm.h', 'hel_amps_sm.cc',
-                 'Parameters_sm.h', 'Parameters_sm.cc']
-        for f in files:
-            self.assertTrue(os.path.isfile(os.path.join(self.out_dir, f)), 
-                            '%s file is not in directory' % f)
-        self.do('define p u u~ d d~')
-        self.do('generate p p > e+ e-')
-        self.do('output pythia8 %s ' % self.out_dir)
-        # Check that the needed files are generated
-        files = ['Sigma_sm_pp_epem.h', 'Sigma_sm_pp_epem.cc']
-        for f in files:
-            self.assertTrue(os.path.isfile(os.path.join(self.out_dir, f)), 
-                            '%s file is not in directory' % f)
-        self.do('define j u u~ d d~')
-        self.do('generate g p > w+ j')
-        self.do('add process p g > w+ j')
+        self.do('define p g u d u~ d~')
+        self.do('define j g u d u~ d~')
+        self.do('generate p p > w+ j')
         self.do('output pythia8 %s' % self.out_dir)
         # Check that the needed files are generated
-        files = ['Sigma_sm_gp_wpj.h', 'Sigma_sm_gp_wpj.cc']
+        files = ['Processes_sm/Sigma_sm_gq_wpq.h', 'Processes_sm/Sigma_sm_gq_wpq.cc',
+                 'Processes_sm/Sigma_sm_qq_wpg.h', 'Processes_sm/Sigma_sm_qq_wpg.cc',
+                 'Processes_sm/HelAmps_sm.h', 'Processes_sm/HelAmps_sm.cc',
+                 'Processes_sm/Parameters_sm.h',
+                 'Processes_sm/Parameters_sm.cc', 'Processes_sm/Makefile',
+                 'examples/main_sm_1.cc', 'examples/Makefile_sm_1']
         for f in files:
             self.assertTrue(os.path.isfile(os.path.join(self.out_dir, f)), 
                             '%s file is not in directory' % f)
@@ -917,7 +910,7 @@
         self.do('output standalone_cpp %s' % self.out_dir)
 
         # Check that all needed src files are generated
-        files = ['hel_amps_sm.h', 'hel_amps_sm.cc', 'Makefile',
+        files = ['HelAmps_sm.h', 'HelAmps_sm.cc', 'Makefile',
                  'Parameters_sm.h', 'Parameters_sm.cc',
                  'rambo.h', 'rambo.cc', 'read_slha.h', 'read_slha.cc']
 

=== modified file 'tests/parallel_tests/me_comparator.py'
--- tests/parallel_tests/me_comparator.py	2010-12-19 03:57:07 +0000
+++ tests/parallel_tests/me_comparator.py	2011-03-31 16:46:04 +0000
@@ -323,19 +323,16 @@
     def setup(self, mg5_path, mg4_path, temp_dir=None):
         """Wrapper for the mg4 setup, also initializing the mg5 path variable"""
 
-        super(MG5Runner, self).setup(mg4_path, temp_dir)
-
-        if not os.path.isdir(mg5_path):
-            raise IOError, "Path %s is not valid" % str(mg5_path)
-
-        self.mg5_path = os.path.abspath(mg5_path)
-
-    def check_path(self, mg4_path):
-        """Check the path for necessary directories"""
-
-        if not os.path.isdir(os.path.join(mg4_path, "Template")) or \
-               not os.path.isdir(os.path.join(mg4_path, "HELAS")):
-            raise IOError, "Path %s is not a valid MG4 path" % str(mg4_path)
+        self.mg4_path = os.path.abspath(mg4_path)
+
+        if not temp_dir:
+            i=0
+            while os.path.exists(os.path.join(mg4_path, 
+                                              "test_%s_%s" % (self.type, i))):
+                i += 1
+            temp_dir = "test_%s_%s" % (self.type, i)         
+
+        self.temp_dir_name = temp_dir
 
     def run(self, proc_list, model, orders={}, energy=1000):
         """Execute MG5 on the list of processes mentioned in proc_list, using
@@ -350,10 +347,10 @@
 
         dir_name = os.path.join(self.mg4_path, self.temp_dir_name)
 
-        self.fix_energy_in_check(dir_name, energy)
-
         # Create a proc_card.dat in the v5 format
-        proc_card_file = open(os.path.join(dir_name, 'Cards', 'proc_card_v5.dat'), 'w')
+        proc_card_location = os.path.join(self.mg4_path, 'proc_card_%s.dat' % \
+                                          self.temp_dir_name)
+        proc_card_file = open(proc_card_location, 'w')
         proc_card_file.write(self.format_mg5_proc_card(proc_list, model, orders))
         proc_card_file.close()
 
@@ -362,13 +359,18 @@
 
         # Run mg5
         logging.info("Running mg5")
-        proc_card = open(os.path.join(dir_name, 'Cards', 'proc_card_v5.dat'), 'r').read()
+        proc_card = open(proc_card_location, 'r').read()
         cmd = cmd_interface.MadGraphCmdShell()
         for line in proc_card.split('\n'):
             try:
                 cmd.run_cmd(line)
             except MadGraph5Error:
                 raise Exception
+
+        # Remove the temporary proc_card
+        os.remove(proc_card_location)
+        self.fix_energy_in_check(dir_name, energy)
+
         # Get the ME value
         for i, proc in enumerate(proc_list):
             self.res_list.append(self.get_me_value(proc, i))
@@ -395,12 +397,6 @@
     name = 'UFO-ALOHA-MG5'
     type = 'ufo'
     
-    def check_path(self, mg4_path):
-        """Check the path for necessary directories"""
-
-        if not os.path.isdir(os.path.join(mg4_path, "Template")):
-            raise IOError, "Path %s is not a valid MG4 path" % str(mg4_path)
-
     def format_mg5_proc_card(self, proc_list, model, orders):
         """Create a proc_card.dat string following v5 conventions."""
 
@@ -416,7 +412,7 @@
 
         return v5_string
 
-class MG5_CPP_Runner(MG4Runner):
+class MG5_CPP_Runner(MG5Runner):
     """Runner object for the MG5 C++ Standalone output."""
 
     mg5_path = ""
@@ -425,96 +421,6 @@
     name = 'MG5-C++'
     compilator ='g++'
 
-    def setup(self, mg5_path, mg4_path, temp_dir=None):
-        """Setup routine: create a temporary C++ Standalone
-        directory. the temp_dir variable can be given to specify the
-        name of the process directory, otherwise a temporary one is
-        created."""
-
-        self.proc_list = []
-        self.res_list = []
-
-        self.setup_flag = False
-
-        if not os.path.isdir(mg4_path):
-            raise IOError, "Path %s is not valid" % str(mg4_path)
-
-        self.mg4_path = os.path.abspath(mg4_path)
-
-        if not os.path.isdir(mg5_path):
-            raise IOError, "Path %s is not valid" % str(mg5_path)
-
-        self.mg5_path = os.path.abspath(mg5_path)
-
-        if not temp_dir:
-            i=0
-            while os.path.exists(os.path.join(mg4_path, 
-                                              "test_%s_%s" % (self.type, i))):
-                i += 1
-            temp_dir = "test_%s_%s" % (self.type, i)         
-
-        if os.path.exists(os.path.join(mg4_path, temp_dir)):
-            raise IOError, "Path %s for test already exist" % \
-                                    str(os.path.join(mg4_path, temp_dir))
-
-        try:
-            os.mkdir(os.path.join(mg4_path, temp_dir))
-        except os.error as error:
-            raise IOError, error.strerror + " " + temp_dir
-
-        try:
-            os.mkdir(os.path.join(mg4_path, temp_dir, 'Cards'))
-        except os.error as error:
-            raise IOError, error.strerror + " " + temp_dir + '/Cards'
-
-        self.temp_dir_name = temp_dir
-
-        # Set the setup flag to true to tell other routines everything is OK
-        self.setup_flag = True
-
-        # print some info
-        logging.info("Temporary standalone C++ directory %s successfully created" % \
-                     temp_dir)
-
-    def run(self, proc_list, model, orders={}, energy=1000):
-        """Execute MG5 on the list of processes mentioned in proc_list, using
-        the specified model, the specified maximal coupling orders and a certain
-        energy for incoming particles (for decay, incoming particle is at rest).
-        """
-
-        self.proc_list = proc_list
-        self.model = model
-        self.orders = orders
-        self.energy = energy
-
-        dir_name = os.path.join(self.mg4_path, self.temp_dir_name)
-
-        # Create a proc_card.dat in the v5 format
-        proc_card_file = open(os.path.join(dir_name, 'Cards', 'proc_card_v5.dat'), 'w')
-        proc_card_file.write(self.format_mg5_proc_card(proc_list, model, orders))
-        proc_card_file.close()
-
-        logging.info("proc_card.dat file for %i processes successfully created in %s" % \
-                     (len(proc_list), os.path.join(dir_name, 'Cards')))
-
-        # Run mg5
-        logging.info("Running MG5 Standalone C++ output")
-        proc_card = open(os.path.join(dir_name, 'Cards', 'proc_card_v5.dat'), 'r').read()
-        cmd = cmd_interface.MadGraphCmdShell()
-        for line in proc_card.split('\n'):
-            try:
-                cmd.run_cmd(line)
-            except MadGraph5Error:
-                pass
-
-        self.fix_energy_in_check(dir_name, energy)
-
-        # Get the ME value
-        for i, proc in enumerate(proc_list):
-            self.res_list.append(self.get_me_value(proc, i))
-
-        return self.res_list
-
     def format_mg5_proc_card(self, proc_list, model, orders):
         """Create a proc_card.dat string following v5 conventions."""
 

=== modified file 'tests/parallel_tests/sample_script.py'
--- tests/parallel_tests/sample_script.py	2011-03-03 00:09:21 +0000
+++ tests/parallel_tests/sample_script.py	2011-03-31 16:46:04 +0000
@@ -80,11 +80,11 @@
 
     # Create and setup a comparator
     my_comp = me_comparator.MEComparator()
-    my_comp.set_me_runners(my_mg5, my_mg5_ufo)
+    my_comp.set_me_runners(my_mg4, my_mg5, my_mg5_ufo, my_mg5_cpp)
 
     # Run the actual comparison
     my_comp.run_comparison(my_proc_list,
-                           model=['mssm','MSSM_UFO',],
+                           model='mssm',
                            orders={'QED':4, 'QCD':4}, energy=2000)
 
     # Do some cleanup

=== modified file 'tests/unit_tests/iolibs/test_export_cpp.py'
--- tests/unit_tests/iolibs/test_export_cpp.py	2011-02-15 16:32:30 +0000
+++ tests/unit_tests/iolibs/test_export_cpp.py	2011-03-31 16:46:04 +0000
@@ -240,7 +240,7 @@
         self.cpp_exporter = export_cpp.ProcessExporterCPP(\
             self.mymatrixelement, self.mycppwriter,
             process_string = "q q~ > q q~")
-        
+
     tearDown = test_file_writers.CheckFileCreate.clean_files
 
     def test_pythia8_export_functions(self):
@@ -273,7 +273,7 @@
         goal_string = \
 """//==========================================================================
 // This file has been automatically generated for Pythia 8
-// by MadGraph 5 v. %(version)s, %(date)s
+// MadGraph 5 v. %(version)s, %(date)s
 // By the MadGraph Development Team
 // Please visit us at https://launchpad.net/madgraph5
 //==========================================================================
@@ -333,7 +333,7 @@
 
     // Private functions to calculate the matrix element for all subprocesses
     // Calculate wavefunctions
-    void calculate_wavefunctions(const int hel[]); 
+    void calculate_wavefunctions(const int perm[], const int hel[]); 
     static const int nwavefuncs = 10; 
     std::complex<double> w[nwavefuncs][18]; 
     double matrix_uux_uux(); 
@@ -371,13 +371,13 @@
         goal_string = \
 """//==========================================================================
 // This file has been automatically generated for Pythia 8 by
-// by MadGraph 5 v. %(version)s, %(date)s
+// MadGraph 5 v. %(version)s, %(date)s
 // By the MadGraph Development Team
 // Please visit us at https://launchpad.net/madgraph5
 //==========================================================================
 
 #include "Sigma_sm_qqx_qqx.h"
-#include "hel_amps_sm.h"
+#include "HelAmps_sm.h"
 
 using namespace Pythia8_sm; 
 
@@ -396,8 +396,8 @@
 {
   // Instantiate the model class and set parameters that stay fixed during run
   pars = Parameters_sm::getInstance(); 
-  pars->setIndependentParameters(particleDataPtr, coupSMPtr); 
-  pars->setIndependentCouplings(particleDataPtr, coupSMPtr); 
+  pars->setIndependentParameters(particleDataPtr, couplingsPtr, slhaPtr); 
+  pars->setIndependentCouplings(); 
   // Set massive/massless matrix elements for c/b/mu/tau
   mcME = particleDataPtr->m0(4); 
   mbME = 0.; 
@@ -412,8 +412,8 @@
 void Sigma_sm_qqx_qqx::sigmaKin() 
 {
   // Set the parameters which change event by event
-  pars->setDependentParameters(particleDataPtr, coupSMPtr, alpS); 
-  pars->setDependentCouplings(particleDataPtr, coupSMPtr); 
+  pars->setDependentParameters(particleDataPtr, couplingsPtr, slhaPtr, alpS); 
+  pars->setDependentCouplings(); 
   // Reset color flows
   for(int i = 0; i < 2; i++ )
     jamp2[0][i] = 0.; 
@@ -424,13 +424,13 @@
   static int ntry = 0, sum_hel = 0, ngood = 0; 
   static int igood[ncomb]; 
   static int jhel; 
-  std::complex<double> * * wfs; 
   double t[nprocesses]; 
   // Helicities for the process
-  static const int helicities[ncomb][nexternal] = {-1, -1, -1, -1, -1, -1, -1,
-      1, -1, -1, 1, -1, -1, -1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, -1, 1, 1,
-      -1, -1, 1, 1, 1, 1, -1, -1, -1, 1, -1, -1, 1, 1, -1, 1, -1, 1, -1, 1, 1,
-      1, 1, -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, 1, 1, 1};
+  static const int helicities[ncomb][nexternal] = {{-1, -1, -1, -1}, {-1, -1,
+      -1, 1}, {-1, -1, 1, -1}, {-1, -1, 1, 1}, {-1, 1, -1, -1}, {-1, 1, -1, 1},
+      {-1, 1, 1, -1}, {-1, 1, 1, 1}, {1, -1, -1, -1}, {1, -1, -1, 1}, {1, -1,
+      1, -1}, {1, -1, 1, 1}, {1, 1, -1, -1}, {1, 1, -1, 1}, {1, 1, 1, -1}, {1,
+      1, 1, 1}};
   // Denominators: spins, colors and identical particles
   const int denominators[nprocesses] = {36}; 
 
@@ -440,6 +440,14 @@
   for(int i = 0; i < nprocesses; i++ )
   {
     matrix_element[i] = 0.; 
+    t[i] = 0.; 
+  }
+
+  // Define permutation
+  int perm[nexternal]; 
+  for(int i = 0; i < nexternal; i++ )
+  {
+    perm[i] = i; 
   }
 
   // For now, call setupForME() here
@@ -457,8 +465,9 @@
     {
       if (goodhel[ihel] || ntry < 2)
       {
-        calculate_wavefunctions(helicities[ihel]); 
+        calculate_wavefunctions(perm, helicities[ihel]); 
         t[0] = matrix_uux_uux(); 
+
         double tsum = 0; 
         for(int iproc = 0; iproc < nprocesses; iproc++ )
         {
@@ -487,8 +496,9 @@
         jhel = 0; 
       double hwgt = double(ngood)/double(sum_hel); 
       int ihel = igood[jhel]; 
-      calculate_wavefunctions(helicities[ihel]); 
+      calculate_wavefunctions(perm, helicities[ihel]); 
       t[0] = matrix_uux_uux(); 
+
       for(int iproc = 0; iproc < nprocesses; iproc++ )
       {
         matrix_element[iproc] += t[iproc] * hwgt; 
@@ -534,7 +544,7 @@
   if(id1 == 4 && id2 == -4)
   {
     // Pick one of the flavor combinations (4, -4)
-    int flavors[1][2] = {4, -4}; 
+    int flavors[1][2] = {{4, -4}}; 
     vector<double> probs; 
     double sum = matrix_element[0]; 
     probs.push_back(matrix_element[0]/sum); 
@@ -545,7 +555,7 @@
   else if(id1 == 2 && id2 == -2)
   {
     // Pick one of the flavor combinations (2, -2)
-    int flavors[1][2] = {2, -2}; 
+    int flavors[1][2] = {{2, -2}}; 
     vector<double> probs; 
     double sum = matrix_element[0]; 
     probs.push_back(matrix_element[0]/sum); 
@@ -564,9 +574,10 @@
     for(int i = 0; i < ncolor[0]; i++ )
       probs.push_back(jamp2[0][i]/sum); 
     int ic = rndmPtr->pick(probs); 
-    static int col[2][8] = {1, 0, 0, 1, 2, 0, 0, 2, 2, 0, 0, 1, 2, 0, 0, 1}; 
-    setColAcol(col[ic][0], col[ic][1], col[ic][2], col[ic][3], col[ic][4],
-        col[ic][5], col[ic][6], col[ic][7]);
+    static int colors[2][8] = {{1, 0, 0, 1, 2, 0, 0, 2}, {2, 0, 0, 1, 2, 0, 0,
+        1}};
+    setColAcol(colors[ic][0], colors[ic][1], colors[ic][2], colors[ic][3],
+        colors[ic][4], colors[ic][5], colors[ic][6], colors[ic][7]);
   }
 }
 
@@ -585,11 +596,12 @@
 //--------------------------------------------------------------------------
 // Evaluate |M|^2 for each subprocess
 
-void Sigma_sm_qqx_qqx::calculate_wavefunctions(const int hel[])
+void Sigma_sm_qqx_qqx::calculate_wavefunctions(const int perm[], const int
+    hel[])
 {
   // Calculate wavefunctions for all processes
   double p[nexternal][4]; 
-  int i, j; 
+  int i; 
 
   // Convert Pythia 4-vectors to double[]
   for(i = 0; i < nexternal; i++ )
@@ -601,10 +613,10 @@
   }
 
   // Calculate all wavefunctions
-  ixxxxx(p[0], mME[0], hel[0], +1, w[0]); 
-  oxxxxx(p[1], mME[1], hel[1], -1, w[1]); 
-  oxxxxx(p[2], mME[2], hel[2], +1, w[2]); 
-  ixxxxx(p[3], mME[3], hel[3], -1, w[3]); 
+  ixxxxx(p[perm[0]], mME[0], hel[0], +1, w[0]); 
+  oxxxxx(p[perm[1]], mME[1], hel[1], -1, w[1]); 
+  oxxxxx(p[perm[2]], mME[2], hel[2], +1, w[2]); 
+  ixxxxx(p[perm[3]], mME[3], hel[3], -1, w[3]); 
   FFV1_3(w[0], w[1], pars->GC_10, pars->ZERO, pars->ZERO, w[4]); 
   FFV2_3(w[0], w[1], pars->GC_35, pars->MZ, pars->WZ, w[5]); 
   FFV5_3(w[0], w[1], pars->GC_47, pars->MZ, pars->WZ, w[6]); 
@@ -624,7 +636,7 @@
   std::complex<double> amp[ngraphs], jamp[ncolor]; 
   // The color matrix;
   static const double denom[ncolor] = {1, 1}; 
-  static const double cf[ncolor][ncolor] = {9, 3, 3, 9}; 
+  static const double cf[ncolor][ncolor] = {{9, 3}, {3, 9}}; 
   // Calculate all amplitudes
   // Amplitude(s) for diagram number 1
   FFV1_0(w[3], w[2], w[4], pars->GC_10, amp[0]); 
@@ -677,13 +689,13 @@
         self.assertFileContains('test.cc', goal_string)
 
     def test_write_cpp_go_process_cc_file(self):
-        """Test writing the .cc C++ standalone file for g g > go go"""
+        """Test writing the .cc C++ standalone file for u u~ > go go"""
 
         myleglist = base_objects.LegList()
 
-        myleglist.append(base_objects.Leg({'id':21,
+        myleglist.append(base_objects.Leg({'id':2,
                                          'state':False}))
-        myleglist.append(base_objects.Leg({'id':21,
+        myleglist.append(base_objects.Leg({'id':-2,
                                          'state':False}))
         myleglist.append(base_objects.Leg({'id':1000021,
                                          'state':True}))
@@ -696,23 +708,25 @@
         myamplitude = diagram_generation.Amplitude({'process': myproc})
 
         matrix_element = helas_objects.HelasMultiProcess(myamplitude)
+        matrix_element.get('matrix_elements')[0].set('has_mirror_process',
+                                                     True)
 
         goal_string = \
 """//==========================================================================
-// This file has been automatically generated for Pythia 8 by
-// by MadGraph 5 v. %(version)s, %(date)s
+// This file has been automatically generated for C++ Standalone by
+// MadGraph 5 v. %(version)s, %(date)s
 // By the MadGraph Development Team
 // Please visit us at https://launchpad.net/madgraph5
 //==========================================================================
 
 #include "CPPProcess.h"
-#include "hel_amps_sm.h"
+#include "HelAmps_sm.h"
 
 using namespace MG5_sm; 
 
 //==========================================================================
 // Class member functions for calculating the matrix elements for
-// Process: g g > go go
+// Process: u u~ > go go
 
 //--------------------------------------------------------------------------
 // Initialize process.
@@ -731,7 +745,7 @@
   mME.push_back(pars->ZERO); 
   mME.push_back(pars->MGO); 
   mME.push_back(pars->MGO); 
-  jamp2[0] = new double[6]; 
+  jamp2[0] = new double[2]; 
 }
 
 //--------------------------------------------------------------------------
@@ -751,7 +765,7 @@
   }
 
   // Reset color flows
-  for(int i = 0; i < 6; i++ )
+  for(int i = 0; i < 2; i++ )
     jamp2[0][i] = 0.; 
 
   // Local variables and constants
@@ -763,12 +777,13 @@
   std::complex<double> * * wfs; 
   double t[nprocesses]; 
   // Helicities for the process
-  static const int helicities[ncomb][nexternal] = {-1, -1, -1, -1, -1, -1, -1,
-      1, -1, -1, 1, -1, -1, -1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, -1, 1, 1,
-      -1, -1, 1, 1, 1, 1, -1, -1, -1, 1, -1, -1, 1, 1, -1, 1, -1, 1, -1, 1, 1,
-      1, 1, -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, 1, 1, 1};
+  static const int helicities[ncomb][nexternal] = {{-1, -1, -1, -1}, {-1, -1,
+      -1, 1}, {-1, -1, 1, -1}, {-1, -1, 1, 1}, {-1, 1, -1, -1}, {-1, 1, -1, 1},
+      {-1, 1, 1, -1}, {-1, 1, 1, 1}, {1, -1, -1, -1}, {1, -1, -1, 1}, {1, -1,
+      1, -1}, {1, -1, 1, 1}, {1, 1, -1, -1}, {1, 1, -1, 1}, {1, 1, 1, -1}, {1,
+      1, 1, 1}};
   // Denominators: spins, colors and identical particles
-  const int denominators[nprocesses] = {512}; 
+  const int denominators[nprocesses] = {72, 72}; 
 
   ntry = ntry + 1; 
 
@@ -777,6 +792,12 @@
   {
     matrix_element[i] = 0.; 
   }
+  // Define permutation
+  int perm[nexternal]; 
+  for(int i = 0; i < nexternal; i++ )
+  {
+    perm[i] = i; 
+  }
 
   if (sum_hel == 0 || ntry < 10)
   {
@@ -785,8 +806,18 @@
     {
       if (goodhel[ihel] || ntry < 2)
       {
-        calculate_wavefunctions(helicities[ihel]); 
-        t[0] = matrix_gg_gogo(); 
+        calculate_wavefunctions(perm, helicities[ihel]); 
+        t[0] = matrix_uux_gogo(); 
+        // Mirror initial state momenta for mirror process
+        perm[0] = 1; 
+        perm[1] = 0; 
+        // Calculate wavefunctions
+        calculate_wavefunctions(perm, helicities[ihel]); 
+        // Mirror back
+        perm[0] = 0; 
+        perm[1] = 1; 
+        // Calculate matrix elements
+        t[1] = matrix_uux_gogo(); 
         double tsum = 0; 
         for(int iproc = 0; iproc < nprocesses; iproc++ )
         {
@@ -815,8 +846,18 @@
         jhel = 0; 
       double hwgt = double(ngood)/double(sum_hel); 
       int ihel = igood[jhel]; 
-      calculate_wavefunctions(helicities[ihel]); 
-      t[0] = matrix_gg_gogo(); 
+      calculate_wavefunctions(perm, helicities[ihel]); 
+      t[0] = matrix_uux_gogo(); 
+      // Mirror initial state momenta for mirror process
+      perm[0] = 1; 
+      perm[1] = 0; 
+      // Calculate wavefunctions
+      calculate_wavefunctions(perm, helicities[ihel]); 
+      // Mirror back
+      perm[0] = 0; 
+      perm[1] = 1; 
+      // Calculate matrix elements
+      t[1] = matrix_uux_gogo(); 
       for(int iproc = 0; iproc < nprocesses; iproc++ )
       {
         matrix_element[iproc] += t[iproc] * hwgt; 
@@ -837,11 +878,16 @@
 double CPPProcess::sigmaHat() 
 {
   // Select between the different processes
-  if(id1 == 21 && id2 == 21)
+  if(id1 == 2 && id2 == -2)
   {
-    // Add matrix elements for processes with beams (21, 21)
+    // Add matrix elements for processes with beams (2, -2)
     return matrix_element[0]; 
   }
+  else if(id1 == -2 && id2 == 2)
+  {
+    // Add matrix elements for processes with beams (-2, 2)
+    return matrix_element[1]; 
+  }
   else
   {
     // Return 0 if not correct initial state assignment
@@ -855,47 +901,38 @@
 //--------------------------------------------------------------------------
 // Evaluate |M|^2 for each subprocess
 
-void CPPProcess::calculate_wavefunctions(const int hel[])
+void CPPProcess::calculate_wavefunctions(const int perm[], const int hel[])
 {
   // Calculate wavefunctions for all processes
   int i, j; 
 
   // Calculate all wavefunctions
-  vxxxxx(p[0], mME[0], hel[0], -1, w[0]); 
-  vxxxxx(p[1], mME[1], hel[1], -1, w[1]); 
-  oxxxxx(p[2], mME[2], hel[2], +1, w[2]); 
-  ixxxxx(p[3], mME[3], hel[3], -1, w[3]); 
-  FFV1_1(w[2], w[0], pars->GC_8, pars->MGO, pars->WGO, w[4]); 
-  FFV1_2(w[3], w[0], -pars->GC_8, pars->MGO, pars->WGO, w[5]); 
+  ixxxxx(p[perm[0]], mME[0], hel[0], +1, w[0]); 
+  oxxxxx(p[perm[1]], mME[1], hel[1], -1, w[1]); 
+  ixxxxx(p[perm[2]], mME[2], hel[2], -1, w[2]); 
+  oxxxxx(p[perm[3]], mME[3], hel[3], +1, w[3]); 
+  FFV1_3(w[0], w[1], pars->GC_10, pars->ZERO, pars->ZERO, w[4]); 
 
 
 }
-double CPPProcess::matrix_gg_gogo() 
+double CPPProcess::matrix_uux_gogo() 
 {
   int i, j; 
   // Local variables
-  const int ngraphs = 2; 
-  const int ncolor = 6; 
+  const int ngraphs = 1; 
+  const int ncolor = 2; 
   std::complex<double> ztemp; 
   std::complex<double> amp[ngraphs], jamp[ncolor]; 
   // The color matrix;
-  static const double denom[ncolor] = {6, 6, 6, 6, 6, 6}; 
-  static const double cf[ncolor][ncolor] = {19, -2, -2, -2, -2, 4, -2, 19, -2,
-      4, -2, -2, -2, -2, 19, -2, 4, -2, -2, 4, -2, 19, -2, -2, -2, -2, 4, -2,
-      19, -2, 4, -2, -2, -2, -2, 19};
+  static const double denom[ncolor] = {3, 3}; 
+  static const double cf[ncolor][ncolor] = {{16, -2}, {-2, 16}}; 
   // Calculate all amplitudes
   // Amplitude(s) for diagram number 1
-  FFV1_0(w[3], w[4], w[1], pars->GC_8, amp[0]); 
-  // Amplitude(s) for diagram number 2
-  FFV1_0(w[5], w[2], w[1], pars->GC_8, amp[1]); 
+  FFV1_0(w[2], w[3], w[4], pars->GC_8, amp[0]); 
 
   // Calculate color flows
-  jamp[0] = +2. * (-amp[1]); 
-  jamp[1] = +2. * (+amp[0]); 
-  jamp[2] = +2. * (-amp[0] + amp[1]); 
-  jamp[3] = +2. * (+amp[0]); 
-  jamp[4] = +2. * (-amp[0] + amp[1]); 
-  jamp[5] = +2. * (-amp[1]); 
+  jamp[0] = -std::complex<double> (0, 1) * amp[0]; 
+  jamp[1] = +std::complex<double> (0, 1) * amp[0]; 
 
   // Sum and square the color flows to get the matrix element
   double matrix = 0; 
@@ -939,6 +976,104 @@
         print "cd /tmp; g++ -c -I $PATH_TO_PYTHIA8/include Sigma_sm_qqx_qqx.cc.cc"
 
 
+    def test_write_process_h_file(self):
+        """Test writing the .h Pythia file for a matrix element"""
+
+        goal_string = \
+"""//==========================================================================
+// This file has been automatically generated for Pythia 8
+// MadGraph 5 v. %(version)s, %(date)s
+// By the MadGraph Development Team
+// Please visit us at https://launchpad.net/madgraph5
+//==========================================================================
+
+#ifndef Pythia8_Sigma_sm_qqx_qqx_H
+#define Pythia8_Sigma_sm_qqx_qqx_H
+
+#include <complex> 
+
+#include "SigmaProcess.h"
+#include "Parameters_sm.h"
+
+using namespace std; 
+
+namespace Pythia8 
+{
+//==========================================================================
+// A class for calculating the matrix elements for
+// Process: u u~ > u u~
+// Process: c c~ > c c~
+//--------------------------------------------------------------------------
+
+class Sigma_sm_qqx_qqx : public Sigma2Process 
+{
+  public:
+
+    // Constructor.
+    Sigma_sm_qqx_qqx() {}
+
+    // Initialize process.
+    virtual void initProc(); 
+
+    // Calculate flavour-independent parts of cross section.
+    virtual void sigmaKin(); 
+
+    // Evaluate sigmaHat(sHat).
+    virtual double sigmaHat(); 
+
+    // Select flavour, colour and anticolour.
+    virtual void setIdColAcol(); 
+
+    // Evaluate weight for decay angles.
+    virtual double weightDecay(Event& process, int iResBeg, int iResEnd); 
+
+    // Info on the subprocess.
+    virtual string name() const {return "q q~ > q q~ (sm)";}
+
+    virtual int code() const {return 10000;}
+
+    virtual string inFlux() const {return "qqbarSame";}
+
+    virtual int resonanceA() const {return 23;}
+    // Tell Pythia that sigmaHat returns the ME^2
+    virtual bool convertM2() const {return true;}
+
+  private:
+
+    // Private functions to calculate the matrix element for all subprocesses
+    // Calculate wavefunctions
+    void calculate_wavefunctions(const int perm[], const int hel[]); 
+    static const int nwavefuncs = 10; 
+    std::complex<double> w[nwavefuncs][18]; 
+    double matrix_uux_uux(); 
+
+    // Constants for array limits
+    static const int nexternal = 4; 
+    static const int nprocesses = 1; 
+
+    // Store the matrix element value from sigmaKin
+    double matrix_element[nprocesses]; 
+
+    // Color flows, used when selecting color
+    double * jamp2[nprocesses]; 
+
+    // Pointer to the model parameters
+    Parameters_sm * pars; 
+
+}; 
+
+}  // end namespace Pythia
+
+#endif  // Pythia8_Sigma_sm_qqx_qqx_H
+""" % misc.get_pkg_info()
+
+        self.pythia8_exporter.write_process_h_file(\
+            writers.CPPWriter(self.give_pos('test.h')))
+
+        #print open(self.give_pos('test.h')).read()
+
+        self.assertFileContains('test.h', goal_string)
+
 #===============================================================================
 # ExportUFOModelPythia8Test
 #===============================================================================
@@ -948,7 +1083,7 @@
     created_files = [
                     ]
 
-    def disabled_setUp(self):
+    def setUp(self):
 
         model_pkl = os.path.join(MG5DIR, 'models','sm','model.pkl')
         if os.path.isfile(model_pkl):
@@ -957,156 +1092,564 @@
             sm_path = import_ufo.find_ufo_path('sm')
             self.model = import_ufo.import_model(sm_path)
         self.model_builder = export_cpp.UFOModelConverterPythia8(\
-                                                            self.model, "/tmp")
-        
-        test_file_writers.CheckFileCreate.clean_files
-
-    tearDown = test_file_writers.CheckFileCreate.clean_files
-
-    def disabled_test_read_aloha_template_files(self):
-        """Test reading the ALOHA template .h and .cc files"""
-
-        template_h = self.model_builder.read_aloha_template_files("h")
-        self.assertTrue(template_h)
-        for file_lines in template_h:
-            self.assertFalse(file_lines.find('#include') > -1)
-            self.assertFalse(file_lines.find('namespace') > -1)
-        template_cc = self.model_builder.read_aloha_template_files("cc")
-        self.assertTrue(template_cc)
-        for file_lines in template_cc:
-            self.assertFalse(file_lines.find('#include') > -1)
-            self.assertFalse(file_lines.find('namespace') > -1) 
-       
-    def disabled_test_write_aloha_functions(self):
-        """Test writing function declarations and definitions"""
-
-        template_h_files = []
-        template_cc_files = []
-
-        aloha_model = create_aloha.AbstractALOHAModel(\
-                                         self.model_builder.model.get('name'))
-        aloha_model.compute_all(save=False)
-        for abstracthelas in dict(aloha_model).values():
-            abstracthelas.write('/tmp', 'CPP')
-            #abstracthelas.write('/tmp', 'Fortran')
-
-        print "Please try compiling the files /tmp/*.cc and /tmp/*.f:"
-        print "cd /tmp; g++ -c *.cc; gfortran -c *.f"
-        
-
-    def disabled_test_write_aloha_routines(self):
-        """Test writing the aloha .h and.cc files"""
-
-        self.model_builder.write_aloha_routines()
-        print "Please try compiling the file /tmp/hel_amps_sm.cc:"
-        print "cd /tmp; g++ -c hel_amps_sm.cc"
-
-    def disabled_test_couplings_and_parameters(self):
-        """Test generation of couplings and parameters"""
-
-        self.assertTrue(self.model_builder.params_indep)
-        self.assertTrue(self.model_builder.params_dep)
-        self.assertTrue(self.model_builder.coups_indep)
-        self.assertTrue(self.model_builder.coups_dep)
-
-        g_expr = re.compile("G(?!f)")
-
-        for indep_par in self.model_builder.params_indep:
-            self.assertFalse(g_expr.search(indep_par.expr))
-        for indep_coup in self.model_builder.coups_indep: 
-            self.assertFalse(g_expr.search(indep_coup.expr))
-
-    def disabled_test_write_parameter_files(self):
-        """Test writing the model parameter .h and.cc files"""
-
-        self.model_builder.write_parameter_class_files()        
-        
-        print "Please try compiling the file /tmp/Parameters_sm.cc:"
-        print "cd /tmp; g++ -c -I $PATH_TO_PYTHIA8/include Parameters_sm.cc"
-
-
-#===============================================================================
-# ExportUFOModelCPPTest
-#===============================================================================
-class ExportUFOModelCPPTest(unittest.TestCase,
-                                test_file_writers.CheckFileCreate):
-
-    created_files = [
-                    ]
-
-    def setUp(self):
-
-        model_pkl = os.path.join(MG5DIR, 'models','sm','model.pkl')
-        if os.path.isfile(model_pkl):
-            self.model = save_load_object.load_from_file(model_pkl)
-        else:
-            sm_path = import_ufo.find_ufo_path('sm')
-            self.model = import_ufo.import_model(sm_path)
-        self.model_builder = export_cpp.UFOModelConverterCPP(\
-                                                            self.model, "/tmp")
-        
-        test_file_writers.CheckFileCreate.clean_files
-
-    tearDown = test_file_writers.CheckFileCreate.clean_files
-
-    def disabled_test_read_aloha_template_files(self):
-        """Test reading the ALOHA template .h and .cc files"""
-
-        template_h = self.model_builder.read_aloha_template_files("h")
-        self.assertTrue(template_h)
-        for file_lines in template_h:
-            self.assertFalse(file_lines.find('#include') > -1)
-            self.assertFalse(file_lines.find('namespace') > -1)
-        template_cc = self.model_builder.read_aloha_template_files("cc")
-        self.assertTrue(template_cc)
-        for file_lines in template_cc:
-            self.assertFalse(file_lines.find('#include') > -1)
-            self.assertFalse(file_lines.find('namespace') > -1) 
-       
-    def disabled_test_write_aloha_functions(self):
-        """Test writing function declarations and definitions"""
-
-        template_h_files = []
-        template_cc_files = []
-
-        aloha_model = create_aloha.AbstractALOHAModel(\
-                                         self.model_builder.model.get('name'))
-        aloha_model.compute_all(save=False)
-        for abstracthelas in dict(aloha_model).values():
-            abstracthelas.write('/tmp', 'CPP')
-            #abstracthelas.write('/tmp', 'Fortran')
-
-        print "Please try compiling the files /tmp/*.cc and /tmp/*.f:"
-        print "cd /tmp; g++ -c *.cc; gfortran -c *.f"
-        
-
-    def disabled_test_write_aloha_routines(self):
-        """Test writing the aloha .h and.cc files"""
-
-        self.model_builder.write_aloha_routines()
-        print "Please try compiling the file /tmp/hel_amps_sm.cc:"
-        print "cd /tmp; g++ -c hel_amps_sm.cc"
-
-    def disabled_test_couplings_and_parameters(self):
-        """Test generation of couplings and parameters"""
-
-        self.assertTrue(self.model_builder.params_indep)
-        self.assertTrue(self.model_builder.params_dep)
-        self.assertTrue(self.model_builder.coups_indep)
-        self.assertTrue(self.model_builder.coups_dep)
-
-        g_expr = re.compile("G(?!f)")
-
-        for indep_par in self.model_builder.params_indep:
-            self.assertFalse(g_expr.search(indep_par.expr))
-        for indep_coup in self.model_builder.coups_indep: 
-            self.assertFalse(g_expr.search(indep_coup.expr))
-
-    def disabled_test_write_parameter_files(self):
-        """Test writing the model parameter .h and.cc files"""
-
-        self.model_builder.write_parameter_class_files()        
-        
-        print "Please try compiling the file /tmp/Parameters_sm.cc:"
-        print "cd /tmp; g++ -c Parameters_sm.cc"
+                                             self.model, "/tmp")
+        
+        test_file_writers.CheckFileCreate.clean_files
+
+    tearDown = test_file_writers.CheckFileCreate.clean_files
+
+    def test_write_pythia8_parameter_files(self):
+        """Test writing the Pythia model parameter files"""
+
+        goal_file_h = \
+"""//==========================================================================
+// This file has been automatically generated for Pythia 8
+#  MadGraph 5 v. %(version)s, %(date)s
+#  By the MadGraph Development Team
+#  Please visit us at https://launchpad.net/madgraph5
+//==========================================================================
+
+#ifndef Pythia8_parameters_sm_H
+#define Pythia8_parameters_sm_H
+
+#include <complex>
+
+#include "ParticleData.h"
+#include "StandardModel.h"
+#include "SusyLesHouches.h"
+
+using namespace std;
+
+namespace Pythia8 {
+
+class Parameters_sm
+{
+public:
+
+static Parameters_sm* getInstance();
+
+// Model parameters independent of aS
+double WH,WW,WZ,WT,MH,MZ,MB,MS,MD,MT,MC,MU,MTA,MM,Me,ymtau,ymt,ymb,ymc,Gf,aEWM1,cabi,ZERO,ye,ym,yup,ydo,ys,cos__cabi,sin__cabi,MZ__exp__2,MZ__exp__4,sqrt__2,MH__exp__2,aEW,MW,sqrt__aEW,ee,MW__exp__2,sw2,cw,sqrt__sw2,sw,g1,gw,v,v__exp__2,lam,yb,yc,yt,ytau,muH,ee__exp__2,gw__exp__2,cw__exp__2,sw__exp__2;
+std::complex<double> CKM11,CKM12,CKM13,CKM21,CKM22,CKM23,CKM31,CKM32,CKM33,complexi,conjg__CKM11,conjg__CKM12,conjg__CKM13,conjg__CKM21,conjg__CKM22,conjg__CKM23,conjg__CKM31,conjg__CKM32,conjg__CKM33;
+// Model parameters dependent on aS
+double aS,sqrt__aS,G,G__exp__2;
+// Model couplings independent of aS
+std::complex<double> GC_1,GC_2,GC_3,GC_4,GC_5,GC_6,GC_7,GC_8,GC_12,GC_13,GC_14,GC_15,GC_16,GC_17,GC_18,GC_19,GC_20,GC_21,GC_22,GC_23,GC_24,GC_25,GC_26,GC_27,GC_28,GC_29,GC_30,GC_31,GC_32,GC_33,GC_34,GC_35,GC_36,GC_37,GC_38,GC_39,GC_40,GC_41,GC_42,GC_43,GC_44,GC_45,GC_46,GC_47,GC_48,GC_49,GC_50,GC_51,GC_52,GC_53,GC_54,GC_55,GC_56,GC_57,GC_58,GC_59,GC_60,GC_61,GC_62,GC_63,GC_64,GC_65,GC_66,GC_67,GC_68,GC_69,GC_70,GC_71,GC_72,GC_73,GC_74,GC_75,GC_76,GC_77,GC_96,GC_97,GC_98,GC_99,GC_100,GC_101,GC_102,GC_103,GC_104,GC_110,GC_113,GC_116,GC_117,GC_119,GC_120,GC_122,GC_123,GC_125,GC_126,GC_127,GC_128,GC_130,GC_131,GC_133,GC_134,GC_135,GC_136,GC_78,GC_79,GC_80,GC_81,GC_82,GC_83,GC_84,GC_85,GC_86,GC_87,GC_88,GC_89,GC_90,GC_91,GC_92,GC_93,GC_94,GC_95,GC_105,GC_106,GC_107,GC_108,GC_109,GC_111,GC_112,GC_114,GC_115,GC_118,GC_121,GC_124,GC_129,GC_132;
+// Model couplings dependent on aS
+std::complex<double> GC_9,GC_11,GC_10;
+
+// Set parameters that are unchanged during the run
+void setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr);
+// Set couplings that are unchanged during the run
+void setIndependentCouplings();
+// Set parameters that are changed event by event
+void setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS);
+// Set couplings that are changed event by event
+void setDependentCouplings();
+
+// Print parameters that are unchanged during the run
+void printIndependentParameters();
+// Print couplings that are unchanged during the run
+void printIndependentCouplings();
+// Print parameters that are changed event by event
+void printDependentParameters();
+// Print couplings that are changed event by event
+void printDependentCouplings();
+
+
+  private:
+static Parameters_sm* instance;
+};
+
+} // end namespace Pythia8
+#endif // Pythia8_parameters_sm_H
+""" % misc.get_pkg_info()
+
+        goal_file_cc = \
+"""//==========================================================================
+// This file has been automatically generated for Pythia 8 by
+#  MadGraph 5 v. %(version)s, %(date)s
+#  By the MadGraph Development Team
+#  Please visit us at https://launchpad.net/madgraph5
+//==========================================================================
+
+#include <iostream>
+#include "Parameters_sm.h"
+#include "PythiaStdlib.h"
+
+namespace Pythia8 {
+
+    // Initialize static instance
+    Parameters_sm* Parameters_sm::instance = 0;
+
+    // Function to get static instance - only one instance per program
+    Parameters_sm* Parameters_sm::getInstance(){
+	if (instance == 0)
+	    instance = new Parameters_sm();
+
+	return instance;
+    }
+
+    void Parameters_sm::setIndependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr){
+	WH=pd->mWidth(25);
+WW=pd->mWidth(24);
+WZ=pd->mWidth(23);
+WT=pd->mWidth(6);
+MH=pd->m0(25);
+MZ=pd->m0(23);
+MB=pd->m0(5);
+MS=pd->m0(3);
+MD=pd->m0(1);
+MT=pd->m0(6);
+MC=pd->m0(4);
+MU=pd->m0(2);
+MTA=pd->m0(15);
+MM=pd->m0(13);
+Me=pd->m0(11);
+ymtau=pd->mRun(15, pd->m0(24));
+ymt=pd->mRun(6, pd->m0(24));
+ymb=pd->mRun(5, pd->m0(24));
+ymc=pd->mRun(4, pd->m0(24));
+Gf = 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)));
+aEWM1 = 1./csm->alphaEM(pow(pd->m0(23),2));
+cabi = csm->VCKMgen(1,2);
+ZERO = 0.;
+ye = 0.;
+ym = 0.;
+yup = 0.;
+ydo = 0.;
+ys = 0.;
+cos__cabi = cos(cabi);
+CKM11 = cos__cabi;
+sin__cabi = sin(cabi);
+CKM12 = sin__cabi;
+CKM13 = 0.;
+CKM21 = -sin__cabi;
+CKM22 = cos__cabi;
+CKM23 = 0.;
+CKM31 = 0.;
+CKM32 = 0.;
+CKM33 = 1.;
+MZ__exp__2 = pow(MZ,2.);
+MZ__exp__4 = pow(MZ,4.);
+sqrt__2 = sqrt(2.);
+MH__exp__2 = pow(MH,2.);
+complexi = std::complex<double>(0.,1.);
+conjg__CKM11 = conj(CKM11);
+conjg__CKM12 = conj(CKM12);
+conjg__CKM13 = conj(CKM13);
+conjg__CKM21 = conj(CKM21);
+conjg__CKM22 = conj(CKM22);
+conjg__CKM23 = conj(CKM23);
+conjg__CKM31 = conj(CKM31);
+conjg__CKM32 = conj(CKM32);
+conjg__CKM33 = conj(CKM33);
+aEW = 1./aEWM1;
+MW = sqrt(MZ__exp__2/2.+sqrt(MZ__exp__4/4.-(aEW*M_PI*MZ__exp__2)/(Gf*sqrt__2)));
+sqrt__aEW = sqrt(aEW);
+ee = 2.*sqrt__aEW*sqrt(M_PI);
+MW__exp__2 = pow(MW,2.);
+sw2 = 1.-MW__exp__2/MZ__exp__2;
+cw = sqrt(1.-sw2);
+sqrt__sw2 = sqrt(sw2);
+sw = sqrt__sw2;
+g1 = ee/cw;
+gw = ee/sw;
+v = (2.*MW*sw)/ee;
+v__exp__2 = pow(v,2.);
+lam = MH__exp__2/(2.*v__exp__2);
+yb = (ymb*sqrt__2)/v;
+yc = (ymc*sqrt__2)/v;
+yt = (ymt*sqrt__2)/v;
+ytau = (ymtau*sqrt__2)/v;
+muH = sqrt(lam*v__exp__2);
+ee__exp__2 = pow(ee,2.);
+gw__exp__2 = pow(gw,2.);
+cw__exp__2 = pow(cw,2.);
+sw__exp__2 = pow(sw,2.);
+    }
+    void Parameters_sm::setIndependentCouplings(){
+	GC_1 = -(ee*complexi)/3.;
+GC_2 = (2.*ee*complexi)/3.;
+GC_3 = -(ee*complexi);
+GC_4 = ee*complexi;
+GC_5 = 2.*ee__exp__2*complexi;
+GC_6 = -ee__exp__2/(2.*cw);
+GC_7 = (ee__exp__2*complexi)/(2.*cw);
+GC_8 = ee__exp__2/(2.*cw);
+GC_12 = cw*complexi*gw;
+GC_13 = -(complexi*gw__exp__2);
+GC_14 = cw__exp__2*complexi*gw__exp__2;
+GC_15 = -2.*complexi*lam;
+GC_16 = -4.*complexi*lam;
+GC_17 = -6.*complexi*lam;
+GC_18 = -(ee*MW);
+GC_19 = ee*MW;
+GC_20 = (ee__exp__2*complexi)/(2.*sw__exp__2);
+GC_21 = -(ee*complexi)/(2.*sw);
+GC_22 = (ee*complexi)/(2.*sw);
+GC_23 = ee/(2.*sw);
+GC_24 = (ee*complexi)/(sw*sqrt__2);
+GC_25 = (CKM11*ee*complexi)/(sw*sqrt__2);
+GC_26 = (CKM12*ee*complexi)/(sw*sqrt__2);
+GC_27 = (CKM13*ee*complexi)/(sw*sqrt__2);
+GC_28 = (CKM21*ee*complexi)/(sw*sqrt__2);
+GC_29 = (CKM22*ee*complexi)/(sw*sqrt__2);
+GC_30 = (CKM23*ee*complexi)/(sw*sqrt__2);
+GC_31 = (CKM31*ee*complexi)/(sw*sqrt__2);
+GC_32 = (CKM32*ee*complexi)/(sw*sqrt__2);
+GC_33 = (CKM33*ee*complexi)/(sw*sqrt__2);
+GC_34 = -(cw*ee*complexi)/(2.*sw);
+GC_35 = (cw*ee*complexi)/(2.*sw);
+GC_36 = -((cw*ee*complexi)/sw);
+GC_37 = (cw*ee*complexi)/sw;
+GC_38 = -ee__exp__2/(2.*sw);
+GC_39 = -(ee__exp__2*complexi)/(2.*sw);
+GC_40 = ee__exp__2/(2.*sw);
+GC_41 = -(ee*MW)/(2.*sw);
+GC_42 = -(ee*complexi*MW)/(2.*sw);
+GC_43 = (ee*MW)/(2.*sw);
+GC_44 = -(ee*MZ)/(2.*sw);
+GC_45 = (ee*MZ)/(2.*sw);
+GC_46 = -(ee*complexi*MZ)/(2.*cw*sw);
+GC_47 = -(ee*complexi*sw)/(6.*cw);
+GC_48 = (ee*complexi*sw)/(2.*cw);
+GC_49 = complexi*gw*sw;
+GC_50 = -2.*cw*complexi*gw__exp__2*sw;
+GC_51 = complexi*gw__exp__2*sw__exp__2;
+GC_52 = -(cw*ee*complexi)/(2.*sw)+(ee*complexi*sw)/(2.*cw);
+GC_53 = (cw*ee*complexi)/(2.*sw)+(ee*complexi*sw)/(2.*cw);
+GC_54 = (cw*ee)/(2.*sw)+(ee*sw)/(2.*cw);
+GC_55 = (cw*ee__exp__2*complexi)/sw-(ee__exp__2*complexi*sw)/cw;
+GC_56 = (cw*ee*MW)/(2.*sw)-(ee*MW*sw)/(2.*cw);
+GC_57 = -(cw*ee*MW)/(2.*sw)+(ee*MW*sw)/(2.*cw);
+GC_58 = -(ee__exp__2*complexi)+(cw__exp__2*ee__exp__2*complexi)/(2.*sw__exp__2)+(ee__exp__2*complexi*sw__exp__2)/(2.*cw__exp__2);
+GC_59 = ee__exp__2*complexi+(cw__exp__2*ee__exp__2*complexi)/(2.*sw__exp__2)+(ee__exp__2*complexi*sw__exp__2)/(2.*cw__exp__2);
+GC_60 = -(ee__exp__2*v)/(2.*cw);
+GC_61 = (ee__exp__2*v)/(2.*cw);
+GC_62 = -2.*complexi*lam*v;
+GC_63 = -6.*complexi*lam*v;
+GC_64 = (ee__exp__2*complexi*v)/(2.*sw__exp__2);
+GC_65 = -(ee__exp__2*v)/(2.*sw);
+GC_66 = (ee__exp__2*v)/(2.*sw);
+GC_67 = ee__exp__2*complexi*v+(cw__exp__2*ee__exp__2*complexi*v)/(2.*sw__exp__2)+(ee__exp__2*complexi*sw__exp__2*v)/(2.*cw__exp__2);
+GC_68 = -((complexi*yb)/sqrt__2);
+GC_69 = yb/sqrt__2;
+GC_70 = -(CKM13*yb);
+GC_71 = -(CKM23*yb);
+GC_72 = -(CKM33*yb);
+GC_73 = -(yc/sqrt__2);
+GC_74 = -((complexi*yc)/sqrt__2);
+GC_75 = CKM21*yc;
+GC_76 = CKM22*yc;
+GC_77 = CKM23*yc;
+GC_96 = -(yt/sqrt__2);
+GC_97 = -((complexi*yt)/sqrt__2);
+GC_98 = CKM31*yt;
+GC_99 = CKM32*yt;
+GC_100 = CKM33*yt;
+GC_101 = -ytau;
+GC_102 = ytau;
+GC_103 = -((complexi*ytau)/sqrt__2);
+GC_104 = ytau/sqrt__2;
+GC_110 = (ee*complexi*conjg__CKM11)/(sw*sqrt__2);
+GC_113 = (ee*complexi*conjg__CKM12)/(sw*sqrt__2);
+GC_116 = (ee*complexi*conjg__CKM13)/(sw*sqrt__2);
+GC_117 = yb*conjg__CKM13;
+GC_119 = (ee*complexi*conjg__CKM21)/(sw*sqrt__2);
+GC_120 = -(yc*conjg__CKM21);
+GC_122 = (ee*complexi*conjg__CKM22)/(sw*sqrt__2);
+GC_123 = -(yc*conjg__CKM22);
+GC_125 = (ee*complexi*conjg__CKM23)/(sw*sqrt__2);
+GC_126 = yb*conjg__CKM23;
+GC_127 = -(yc*conjg__CKM23);
+GC_128 = (ee*complexi*conjg__CKM31)/(sw*sqrt__2);
+GC_130 = -(yt*conjg__CKM31);
+GC_131 = (ee*complexi*conjg__CKM32)/(sw*sqrt__2);
+GC_133 = -(yt*conjg__CKM32);
+GC_134 = (ee*complexi*conjg__CKM33)/(sw*sqrt__2);
+GC_135 = yb*conjg__CKM33;
+GC_136 = -(yt*conjg__CKM33);
+GC_78 = -((complexi*ydo)/sqrt__2);
+GC_79 = ydo/sqrt__2;
+GC_80 = -(CKM11*ydo);
+GC_81 = -(CKM21*ydo);
+GC_82 = -(CKM31*ydo);
+GC_83 = -ye;
+GC_84 = ye;
+GC_85 = -((complexi*ye)/sqrt__2);
+GC_86 = ye/sqrt__2;
+GC_87 = -ym;
+GC_88 = ym;
+GC_89 = -((complexi*ym)/sqrt__2);
+GC_90 = ym/sqrt__2;
+GC_91 = -((complexi*ys)/sqrt__2);
+GC_92 = ys/sqrt__2;
+GC_93 = -(CKM12*ys);
+GC_94 = -(CKM22*ys);
+GC_95 = -(CKM32*ys);
+GC_105 = -(yup/sqrt__2);
+GC_106 = -((complexi*yup)/sqrt__2);
+GC_107 = CKM11*yup;
+GC_108 = CKM12*yup;
+GC_109 = CKM13*yup;
+GC_111 = ydo*conjg__CKM11;
+GC_112 = -(yup*conjg__CKM11);
+GC_114 = ys*conjg__CKM12;
+GC_115 = -(yup*conjg__CKM12);
+GC_118 = -(yup*conjg__CKM13);
+GC_121 = ydo*conjg__CKM21;
+GC_124 = ys*conjg__CKM22;
+GC_129 = ydo*conjg__CKM31;
+GC_132 = ys*conjg__CKM32;
+    }
+    void Parameters_sm::setDependentParameters(ParticleData*& pd, Couplings*& csm, SusyLesHouches*& slhaPtr, double alpS){
+	aS = alpS;
+sqrt__aS = sqrt(aS);
+G = 2.*sqrt__aS*sqrt(M_PI);
+G__exp__2 = pow(G,2.);
+    }
+    void Parameters_sm::setDependentCouplings(){
+	GC_9 = -G;
+GC_11 = complexi*G__exp__2;
+GC_10 = complexi*G;
+    }
+
+    // Routines for printing out parameters
+    void Parameters_sm::printIndependentParameters(){
+	cout << "sm model parameters independent of event kinematics:" << endl;
+	cout << setw(20) << "WH " << "= " << setiosflags(ios::scientific) << setw(10) << WH << endl;
+cout << setw(20) << "WW " << "= " << setiosflags(ios::scientific) << setw(10) << WW << endl;
+cout << setw(20) << "WZ " << "= " << setiosflags(ios::scientific) << setw(10) << WZ << endl;
+cout << setw(20) << "WT " << "= " << setiosflags(ios::scientific) << setw(10) << WT << endl;
+cout << setw(20) << "MH " << "= " << setiosflags(ios::scientific) << setw(10) << MH << endl;
+cout << setw(20) << "MZ " << "= " << setiosflags(ios::scientific) << setw(10) << MZ << endl;
+cout << setw(20) << "MB " << "= " << setiosflags(ios::scientific) << setw(10) << MB << endl;
+cout << setw(20) << "MS " << "= " << setiosflags(ios::scientific) << setw(10) << MS << endl;
+cout << setw(20) << "MD " << "= " << setiosflags(ios::scientific) << setw(10) << MD << endl;
+cout << setw(20) << "MT " << "= " << setiosflags(ios::scientific) << setw(10) << MT << endl;
+cout << setw(20) << "MC " << "= " << setiosflags(ios::scientific) << setw(10) << MC << endl;
+cout << setw(20) << "MU " << "= " << setiosflags(ios::scientific) << setw(10) << MU << endl;
+cout << setw(20) << "MTA " << "= " << setiosflags(ios::scientific) << setw(10) << MTA << endl;
+cout << setw(20) << "MM " << "= " << setiosflags(ios::scientific) << setw(10) << MM << endl;
+cout << setw(20) << "Me " << "= " << setiosflags(ios::scientific) << setw(10) << Me << endl;
+cout << setw(20) << "ymtau " << "= " << setiosflags(ios::scientific) << setw(10) << ymtau << endl;
+cout << setw(20) << "ymt " << "= " << setiosflags(ios::scientific) << setw(10) << ymt << endl;
+cout << setw(20) << "ymb " << "= " << setiosflags(ios::scientific) << setw(10) << ymb << endl;
+cout << setw(20) << "ymc " << "= " << setiosflags(ios::scientific) << setw(10) << ymc << endl;
+cout << setw(20) << "Gf " << "= " << setiosflags(ios::scientific) << setw(10) << Gf << endl;
+cout << setw(20) << "aEWM1 " << "= " << setiosflags(ios::scientific) << setw(10) << aEWM1 << endl;
+cout << setw(20) << "cabi " << "= " << setiosflags(ios::scientific) << setw(10) << cabi << endl;
+cout << setw(20) << "ZERO " << "= " << setiosflags(ios::scientific) << setw(10) << ZERO << endl;
+cout << setw(20) << "ye " << "= " << setiosflags(ios::scientific) << setw(10) << ye << endl;
+cout << setw(20) << "ym " << "= " << setiosflags(ios::scientific) << setw(10) << ym << endl;
+cout << setw(20) << "yup " << "= " << setiosflags(ios::scientific) << setw(10) << yup << endl;
+cout << setw(20) << "ydo " << "= " << setiosflags(ios::scientific) << setw(10) << ydo << endl;
+cout << setw(20) << "ys " << "= " << setiosflags(ios::scientific) << setw(10) << ys << endl;
+cout << setw(20) << "cos__cabi " << "= " << setiosflags(ios::scientific) << setw(10) << cos__cabi << endl;
+cout << setw(20) << "CKM11 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM11 << endl;
+cout << setw(20) << "sin__cabi " << "= " << setiosflags(ios::scientific) << setw(10) << sin__cabi << endl;
+cout << setw(20) << "CKM12 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM12 << endl;
+cout << setw(20) << "CKM13 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM13 << endl;
+cout << setw(20) << "CKM21 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM21 << endl;
+cout << setw(20) << "CKM22 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM22 << endl;
+cout << setw(20) << "CKM23 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM23 << endl;
+cout << setw(20) << "CKM31 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM31 << endl;
+cout << setw(20) << "CKM32 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM32 << endl;
+cout << setw(20) << "CKM33 " << "= " << setiosflags(ios::scientific) << setw(10) << CKM33 << endl;
+cout << setw(20) << "MZ__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << MZ__exp__2 << endl;
+cout << setw(20) << "MZ__exp__4 " << "= " << setiosflags(ios::scientific) << setw(10) << MZ__exp__4 << endl;
+cout << setw(20) << "sqrt__2 " << "= " << setiosflags(ios::scientific) << setw(10) << sqrt__2 << endl;
+cout << setw(20) << "MH__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << MH__exp__2 << endl;
+cout << setw(20) << "complexi " << "= " << setiosflags(ios::scientific) << setw(10) << complexi << endl;
+cout << setw(20) << "conjg__CKM11 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM11 << endl;
+cout << setw(20) << "conjg__CKM12 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM12 << endl;
+cout << setw(20) << "conjg__CKM13 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM13 << endl;
+cout << setw(20) << "conjg__CKM21 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM21 << endl;
+cout << setw(20) << "conjg__CKM22 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM22 << endl;
+cout << setw(20) << "conjg__CKM23 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM23 << endl;
+cout << setw(20) << "conjg__CKM31 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM31 << endl;
+cout << setw(20) << "conjg__CKM32 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM32 << endl;
+cout << setw(20) << "conjg__CKM33 " << "= " << setiosflags(ios::scientific) << setw(10) << conjg__CKM33 << endl;
+cout << setw(20) << "aEW " << "= " << setiosflags(ios::scientific) << setw(10) << aEW << endl;
+cout << setw(20) << "MW " << "= " << setiosflags(ios::scientific) << setw(10) << MW << endl;
+cout << setw(20) << "sqrt__aEW " << "= " << setiosflags(ios::scientific) << setw(10) << sqrt__aEW << endl;
+cout << setw(20) << "ee " << "= " << setiosflags(ios::scientific) << setw(10) << ee << endl;
+cout << setw(20) << "MW__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << MW__exp__2 << endl;
+cout << setw(20) << "sw2 " << "= " << setiosflags(ios::scientific) << setw(10) << sw2 << endl;
+cout << setw(20) << "cw " << "= " << setiosflags(ios::scientific) << setw(10) << cw << endl;
+cout << setw(20) << "sqrt__sw2 " << "= " << setiosflags(ios::scientific) << setw(10) << sqrt__sw2 << endl;
+cout << setw(20) << "sw " << "= " << setiosflags(ios::scientific) << setw(10) << sw << endl;
+cout << setw(20) << "g1 " << "= " << setiosflags(ios::scientific) << setw(10) << g1 << endl;
+cout << setw(20) << "gw " << "= " << setiosflags(ios::scientific) << setw(10) << gw << endl;
+cout << setw(20) << "v " << "= " << setiosflags(ios::scientific) << setw(10) << v << endl;
+cout << setw(20) << "v__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << v__exp__2 << endl;
+cout << setw(20) << "lam " << "= " << setiosflags(ios::scientific) << setw(10) << lam << endl;
+cout << setw(20) << "yb " << "= " << setiosflags(ios::scientific) << setw(10) << yb << endl;
+cout << setw(20) << "yc " << "= " << setiosflags(ios::scientific) << setw(10) << yc << endl;
+cout << setw(20) << "yt " << "= " << setiosflags(ios::scientific) << setw(10) << yt << endl;
+cout << setw(20) << "ytau " << "= " << setiosflags(ios::scientific) << setw(10) << ytau << endl;
+cout << setw(20) << "muH " << "= " << setiosflags(ios::scientific) << setw(10) << muH << endl;
+cout << setw(20) << "ee__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << ee__exp__2 << endl;
+cout << setw(20) << "gw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << gw__exp__2 << endl;
+cout << setw(20) << "cw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << cw__exp__2 << endl;
+cout << setw(20) << "sw__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << sw__exp__2 << endl;
+    }
+    void Parameters_sm::printIndependentCouplings(){
+	cout << "sm model couplings independent of event kinematics:" << endl;
+	cout << setw(20) << "GC_1 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_1 << endl;
+cout << setw(20) << "GC_2 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_2 << endl;
+cout << setw(20) << "GC_3 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_3 << endl;
+cout << setw(20) << "GC_4 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_4 << endl;
+cout << setw(20) << "GC_5 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_5 << endl;
+cout << setw(20) << "GC_6 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_6 << endl;
+cout << setw(20) << "GC_7 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_7 << endl;
+cout << setw(20) << "GC_8 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_8 << endl;
+cout << setw(20) << "GC_12 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_12 << endl;
+cout << setw(20) << "GC_13 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_13 << endl;
+cout << setw(20) << "GC_14 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_14 << endl;
+cout << setw(20) << "GC_15 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_15 << endl;
+cout << setw(20) << "GC_16 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_16 << endl;
+cout << setw(20) << "GC_17 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_17 << endl;
+cout << setw(20) << "GC_18 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_18 << endl;
+cout << setw(20) << "GC_19 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_19 << endl;
+cout << setw(20) << "GC_20 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_20 << endl;
+cout << setw(20) << "GC_21 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_21 << endl;
+cout << setw(20) << "GC_22 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_22 << endl;
+cout << setw(20) << "GC_23 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_23 << endl;
+cout << setw(20) << "GC_24 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_24 << endl;
+cout << setw(20) << "GC_25 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_25 << endl;
+cout << setw(20) << "GC_26 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_26 << endl;
+cout << setw(20) << "GC_27 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_27 << endl;
+cout << setw(20) << "GC_28 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_28 << endl;
+cout << setw(20) << "GC_29 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_29 << endl;
+cout << setw(20) << "GC_30 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_30 << endl;
+cout << setw(20) << "GC_31 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_31 << endl;
+cout << setw(20) << "GC_32 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_32 << endl;
+cout << setw(20) << "GC_33 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_33 << endl;
+cout << setw(20) << "GC_34 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_34 << endl;
+cout << setw(20) << "GC_35 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_35 << endl;
+cout << setw(20) << "GC_36 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_36 << endl;
+cout << setw(20) << "GC_37 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_37 << endl;
+cout << setw(20) << "GC_38 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_38 << endl;
+cout << setw(20) << "GC_39 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_39 << endl;
+cout << setw(20) << "GC_40 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_40 << endl;
+cout << setw(20) << "GC_41 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_41 << endl;
+cout << setw(20) << "GC_42 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_42 << endl;
+cout << setw(20) << "GC_43 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_43 << endl;
+cout << setw(20) << "GC_44 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_44 << endl;
+cout << setw(20) << "GC_45 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_45 << endl;
+cout << setw(20) << "GC_46 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_46 << endl;
+cout << setw(20) << "GC_47 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_47 << endl;
+cout << setw(20) << "GC_48 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_48 << endl;
+cout << setw(20) << "GC_49 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_49 << endl;
+cout << setw(20) << "GC_50 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_50 << endl;
+cout << setw(20) << "GC_51 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_51 << endl;
+cout << setw(20) << "GC_52 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_52 << endl;
+cout << setw(20) << "GC_53 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_53 << endl;
+cout << setw(20) << "GC_54 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_54 << endl;
+cout << setw(20) << "GC_55 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_55 << endl;
+cout << setw(20) << "GC_56 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_56 << endl;
+cout << setw(20) << "GC_57 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_57 << endl;
+cout << setw(20) << "GC_58 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_58 << endl;
+cout << setw(20) << "GC_59 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_59 << endl;
+cout << setw(20) << "GC_60 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_60 << endl;
+cout << setw(20) << "GC_61 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_61 << endl;
+cout << setw(20) << "GC_62 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_62 << endl;
+cout << setw(20) << "GC_63 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_63 << endl;
+cout << setw(20) << "GC_64 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_64 << endl;
+cout << setw(20) << "GC_65 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_65 << endl;
+cout << setw(20) << "GC_66 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_66 << endl;
+cout << setw(20) << "GC_67 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_67 << endl;
+cout << setw(20) << "GC_68 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_68 << endl;
+cout << setw(20) << "GC_69 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_69 << endl;
+cout << setw(20) << "GC_70 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_70 << endl;
+cout << setw(20) << "GC_71 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_71 << endl;
+cout << setw(20) << "GC_72 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_72 << endl;
+cout << setw(20) << "GC_73 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_73 << endl;
+cout << setw(20) << "GC_74 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_74 << endl;
+cout << setw(20) << "GC_75 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_75 << endl;
+cout << setw(20) << "GC_76 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_76 << endl;
+cout << setw(20) << "GC_77 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_77 << endl;
+cout << setw(20) << "GC_96 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_96 << endl;
+cout << setw(20) << "GC_97 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_97 << endl;
+cout << setw(20) << "GC_98 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_98 << endl;
+cout << setw(20) << "GC_99 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_99 << endl;
+cout << setw(20) << "GC_100 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_100 << endl;
+cout << setw(20) << "GC_101 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_101 << endl;
+cout << setw(20) << "GC_102 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_102 << endl;
+cout << setw(20) << "GC_103 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_103 << endl;
+cout << setw(20) << "GC_104 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_104 << endl;
+cout << setw(20) << "GC_110 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_110 << endl;
+cout << setw(20) << "GC_113 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_113 << endl;
+cout << setw(20) << "GC_116 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_116 << endl;
+cout << setw(20) << "GC_117 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_117 << endl;
+cout << setw(20) << "GC_119 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_119 << endl;
+cout << setw(20) << "GC_120 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_120 << endl;
+cout << setw(20) << "GC_122 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_122 << endl;
+cout << setw(20) << "GC_123 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_123 << endl;
+cout << setw(20) << "GC_125 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_125 << endl;
+cout << setw(20) << "GC_126 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_126 << endl;
+cout << setw(20) << "GC_127 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_127 << endl;
+cout << setw(20) << "GC_128 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_128 << endl;
+cout << setw(20) << "GC_130 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_130 << endl;
+cout << setw(20) << "GC_131 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_131 << endl;
+cout << setw(20) << "GC_133 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_133 << endl;
+cout << setw(20) << "GC_134 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_134 << endl;
+cout << setw(20) << "GC_135 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_135 << endl;
+cout << setw(20) << "GC_136 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_136 << endl;
+cout << setw(20) << "GC_78 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_78 << endl;
+cout << setw(20) << "GC_79 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_79 << endl;
+cout << setw(20) << "GC_80 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_80 << endl;
+cout << setw(20) << "GC_81 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_81 << endl;
+cout << setw(20) << "GC_82 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_82 << endl;
+cout << setw(20) << "GC_83 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_83 << endl;
+cout << setw(20) << "GC_84 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_84 << endl;
+cout << setw(20) << "GC_85 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_85 << endl;
+cout << setw(20) << "GC_86 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_86 << endl;
+cout << setw(20) << "GC_87 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_87 << endl;
+cout << setw(20) << "GC_88 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_88 << endl;
+cout << setw(20) << "GC_89 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_89 << endl;
+cout << setw(20) << "GC_90 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_90 << endl;
+cout << setw(20) << "GC_91 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_91 << endl;
+cout << setw(20) << "GC_92 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_92 << endl;
+cout << setw(20) << "GC_93 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_93 << endl;
+cout << setw(20) << "GC_94 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_94 << endl;
+cout << setw(20) << "GC_95 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_95 << endl;
+cout << setw(20) << "GC_105 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_105 << endl;
+cout << setw(20) << "GC_106 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_106 << endl;
+cout << setw(20) << "GC_107 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_107 << endl;
+cout << setw(20) << "GC_108 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_108 << endl;
+cout << setw(20) << "GC_109 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_109 << endl;
+cout << setw(20) << "GC_111 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_111 << endl;
+cout << setw(20) << "GC_112 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_112 << endl;
+cout << setw(20) << "GC_114 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_114 << endl;
+cout << setw(20) << "GC_115 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_115 << endl;
+cout << setw(20) << "GC_118 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_118 << endl;
+cout << setw(20) << "GC_121 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_121 << endl;
+cout << setw(20) << "GC_124 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_124 << endl;
+cout << setw(20) << "GC_129 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_129 << endl;
+cout << setw(20) << "GC_132 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_132 << endl;
+    }
+    void Parameters_sm::printDependentParameters(){
+	cout << "sm model parameters dependent on event kinematics:" << endl;
+	cout << setw(20) << "aS " << "= " << setiosflags(ios::scientific) << setw(10) << aS << endl;
+cout << setw(20) << "sqrt__aS " << "= " << setiosflags(ios::scientific) << setw(10) << sqrt__aS << endl;
+cout << setw(20) << "G " << "= " << setiosflags(ios::scientific) << setw(10) << G << endl;
+cout << setw(20) << "G__exp__2 " << "= " << setiosflags(ios::scientific) << setw(10) << G__exp__2 << endl;
+    }
+    void Parameters_sm::printDependentCouplings(){
+	cout << "sm model couplings dependent on event kinematics:" << endl;
+	cout << setw(20) << "GC_9 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_9 << endl;
+cout << setw(20) << "GC_11 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_11 << endl;
+cout << setw(20) << "GC_10 " << "= " << setiosflags(ios::scientific) << setw(10) << GC_10 << endl;
+    }
+
+} // end namespace Pythia8
+""" % misc.get_pkg_info()
+
+        file_h, file_cc = self.model_builder.generate_parameters_class_files()
+
+        self.assertEqual(file_h, goal_file_h)
+        self.assertEqual(file_cc, goal_file_cc)
 

=== modified file 'tests/unit_tests/iolibs/test_helas_call_writers.py'
--- tests/unit_tests/iolibs/test_helas_call_writers.py	2010-12-17 18:31:51 +0000
+++ tests/unit_tests/iolibs/test_helas_call_writers.py	2011-03-31 16:46:04 +0000
@@ -902,11 +902,11 @@
             self.mybasemodel)
         
         result = cpp_model.get_matrix_element_calls(self.mymatrixelement)
-        solution =['vxxxxx(p[0],mME[0],hel[0],-1,w[0]);',
-                   'vxxxxx(p[1],mME[1],hel[1],-1,w[1]);',
-                   'vxxxxx(p[2],mME[2],hel[2],+1,w[2]);',
-                   'vxxxxx(p[3],mME[3],hel[3],+1,w[3]);',
-                   'vxxxxx(p[4],mME[4],hel[4],+1,w[4]);',
+        solution =['vxxxxx(p[perm[0]],mME[0],hel[0],-1,w[0]);',
+                   'vxxxxx(p[perm[1]],mME[1],hel[1],-1,w[1]);',
+                   'vxxxxx(p[perm[2]],mME[2],hel[2],+1,w[2]);',
+                   'vxxxxx(p[perm[3]],mME[3],hel[3],+1,w[3]);',
+                   'vxxxxx(p[perm[4]],mME[4],hel[4],+1,w[4]);',
                    'VVVV1_4(w[0],w[2],w[1],pars->GC_51,pars->wmas, pars->wwid, w[5]);',
                    '# Amplitude(s) for diagram number 1',
                    'VVV1_0(w[5],w[3],w[4],pars->GC_12,amp[0]);',

=== modified file 'tests/unit_tests/various/test_process_checks.py'
--- tests/unit_tests/various/test_process_checks.py	2011-03-24 16:15:56 +0000
+++ tests/unit_tests/various/test_process_checks.py	2011-03-31 16:46:04 +0000
@@ -323,7 +323,6 @@
         for i in range(len(invariant_mass_boost)):
             self.assertAlmostEqual(invariant_mass_boost[i], 
                                    invariant_mass_result[i])    
-    
 
     def test_boost_momenta_gluino(self):
         """check if the momenta are boosted correctly by checking invariant mass