Merge lp:~mg5core2/mg5amcnlo/2.6.3 into lp:mg5amcnlo/lts

[Olivier Mattelaer]

[Rikkert Frederix (frederix)]

Hi Olivier,

Should we also release 3.0.1 together with this?

Cheers,
Rik

[Olivier Mattelaer (olivier-mattelaer)]

Hi,

I do not know what is the status of 3.0.1 (in term of merging with 2.6.3, test, ...)
I'm kind of disconnected of 3.0.1.
I'm obviously fine to release 3.0.1

Cheers,

Olivier

> On 12 Jun 2018, at 11:13, Rikkert Frederix <email address hidden> wrote:
>
> Hi Olivier,
>
> Should we also release 3.0.1 together with this?
>
> Cheers,
> Rik
>
> --
> https://code.launchpad.net/~mg5core2/mg5amcnlo/2.6.3/+merge/347781
> Your team mg5core2 is subscribed to branch lp:~mg5core2/mg5amcnlo/2.6.3.

[lp:~mg5core2/mg5amcnlo/2.6.3]

314. By olivier-mattelaer on 2018-06-13

improvment in the model to optimise the creation of aloha routine

315. By olivier-mattelaer on 2018-06-13

fixing IOTest linked to HuaSheng change

[Olivier Mattelaer (olivier-mattelaer)]

Hi,

I have freezed this branch.

Concerning 3.0.1, I have started the merge of 2.6.3 within 3.0.1 but this was a tricky one
(I need some input from Paolo) and would need some additional test for the loop_qcd_qed model.
since even the tests were in conflicts...
So this will require at least a week before we can release 3.0.1

Olivier

[marco zaro (marco-zaro)]

H olivier,
If you want I can also have a look at the merge
What are the problematic files?
Cheers,
Marco

On Wed, Jun 13, 2018, 17:44 Olivier Mattelaer <
<email address hidden>> wrote:

> Hi,
>
> I have freezed this branch.
>
> Concerning 3.0.1, I have started the merge of 2.6.3 within 3.0.1 but this
> was a tricky one
> (I need some input from Paolo) and would need some additional test for the
> loop_qcd_qed model.
> since even the tests were in conflicts...
> So this will require at least a week before we can release 3.0.1
>
> Olivier
>
>
> --
> https://code.launchpad.net/~mg5core2/mg5amcnlo/2.6.3/+merge/347781
> Your team MadTeam is requested to review the proposed merge of
> lp:~mg5core2/mg5amcnlo/2.6.3 into lp:mg5amcnlo.
>

[lp:~mg5core2/mg5amcnlo/2.6.3]

316. By olivier-mattelaer on 2018-06-14

avoid two coupling with different coupling order to be merged when restricting model

317. By olivier-mattelaer on 2018-06-14

fix an issue with the latest change for loop_sm

318. By olivier-mattelaer on 2018-06-14

small fix for MA5@NLO

319. By olivier-mattelaer on 2018-06-14

change linked to the tests.

320. By olivier-mattelaer on 2018-06-15

avoid side effects on the test by modifying configuration file. + fix an issue with aloha model with restriction file

=== modified file 'MadSpin/interface_madspin.py'
--- MadSpin/interface_madspin.py	2018-03-11 12:10:19 +0000
+++ MadSpin/interface_madspin.py	2018-06-15 08:18:50 +0000
@@ -35,6 +35,7 @@
 import madgraph.interface.madgraph_interface as mg_interface
 import madgraph.interface.master_interface as master_interface
 import madgraph.interface.madevent_interface as madevent_interface
+import madgraph.interface.common_run_interface as common_run_interface
 import madgraph.interface.reweight_interface as rwgt_interface
 import madgraph.various.misc as misc
 import madgraph.iolibs.files as files
@@ -53,6 +54,68 @@
 cmd_logger = logging.getLogger('cmdprint2') # -> print
 
 
+class MadSpinOptions(banner.ConfigFile):
+    
+    def default_setup(self):
+
+        self.add_param("max_weight", -1)
+        self.add_param('curr_dir', os.path.realpath(os.getcwd()))
+        self.add_param('Nevents_for_max_weigth', 0)
+        self.add_param("max_weight_ps_point", 400)
+        self.add_param('BW_cut', -1)
+        self.add_param('nb_sigma', 0.)
+        self.add_param('ms_dir', '')
+        self.add_param('max_running_process', 100)
+        self.add_param('onlyhelicity', False)
+        self.add_param('spinmode', "madspin", allowed=['madspin','none','onshell'])
+        self.add_param('use_old_dir', False, comment='should be use only for faster debugging')
+        self.add_param('run_card', '' , comment='define cut for spinmode==none. Path to run_card to use')
+        self.add_param('fixed_order', False, comment='to activate fixed order handling of counter-event')
+        self.add_param('seed', 0, comment='control the seed of madspin')
+        self.add_param('cross_section', {'__type__':0.}, comment="forcing normalization of cross-section after MS (for none/onshell)" )
+        self.add_param('new_wgt', 'cross-section' ,allowed=['cross-section', 'BR'], comment="if not consistent number of particles, choose what to do for the weight. (BR: means local according to number of part, cross use the force cross-section")
+        self.add_param('input_format', 'auto', allowed=['auto','lhe', 'hepmc', 'lhe_no_banner'])
+        
+        
+    ############################################################################
+    ##  Special post-processing of the options                                ## 
+    ############################################################################
+    def post_set_ms_dir(self, value, change_userdefine, raiseerror):
+        """ special handling for set ms_dir """
+        
+        self.__setitem__('curr_dir', value, change_userdefine=change_userdefine)
+        
+    ############################################################################
+    def post_set_seed(self, value, change_userdefine, raiseerror):
+        """ special handling for set seed """
+        
+        random.seed(value)
+
+    ############################################################################        
+    def post_set_run_card(self, value, change_userdefine, raiseerror):
+        """ special handling for set run_card """
+        
+        if value == 'default':
+            self.run_card = None
+        elif os.path.isfile(value):
+            self.run_card = banner.RunCard(value)
+            
+        args = value.split()
+        if  len(args) >2:
+            if not self.options['run_card']:
+                self.run_card =  banner.RunCardLO()
+                self.run_card.remove_all_cut()
+            self.run_card[args[0]] = ' '.join(args[1:])
+            
+        
+    ############################################################################
+    def post_fixed_order(self, value, change_userdefine, raiseerror):
+        """ special handling for set fixed_order """
+        
+        if value:
+            logger.warning('Fix order madspin fails to have the correct scale information. This can bias the results!')
+            logger.warning('Not all functionalities of MadSpin handle this mode correctly (only onshell mode so far).')
+
 
 class MadSpinInterface(extended_cmd.Cmd):
     """Basic interface for madspin"""
@@ -77,22 +140,7 @@
         self.mode = "madspin" # can be flat/bridge change the way the decay is done.
                               # note amc@nlo does not support bridge.
         
-        self.options = {'max_weight': -1, 
-                        'curr_dir': os.path.realpath(os.getcwd()),
-                        'Nevents_for_max_weigth': 0,
-                        'max_weight_ps_point': 400,
-                        'BW_cut':-1,
-                        'nb_sigma':0,
-                        'ms_dir':None,
-                        'max_running_process':100,
-                        'onlyhelicity': False,
-                        'spinmode': "madspin",
-                        'use_old_dir': False, #should be use only for faster debugging
-                        'run_card': None, # define cut for spinmode==none.
-                        'fixed_order': False # to activate fixed order handling of counter-event
-                        }
-        
-
+        self.options = MadSpinOptions()
         
         self.events_file = None
         self.decay_processes = {}
@@ -107,7 +155,21 @@
             logger.info("Extracting the banner ...")
             self.do_import(event_path)
             
-            
+    
+    def setup_for_pure_decay(self):
+        """this is for spinmode=None -> simple decay
+           We go here if they are no banner.
+           -> this requires that a command import model appears in the card!
+        """
+        
+        logger.info("Setup the code for pure decay mode")
+        self.proc_option = []
+        self.final_state_full = ''
+        self.final_state_compact = ''
+        self.prod_branches = ''
+        self.final_state = set()
+        
+     
     def do_import(self, inputfile):
         """import the event file"""
         
@@ -126,6 +188,7 @@
         if not os.path.exists(inputfile):
             if inputfile.endswith('.gz'):
                 if not os.path.exists(inputfile[:-3]):
+                    misc.sprint(os.getcwd(), os.listdir('.'), inputfile, os.path.exists(inputfile), os.path.exists(inputfile[:-3]))
                     raise self.InvalidCmd('No such file or directory : %s' % inputfile)
                 else: 
                     inputfile = inputfile[:-3]
@@ -134,14 +197,21 @@
             else: 
                 raise self.InvalidCmd('No such file or directory : %s' % inputfile)
 
+        self.inputfile = inputfile
+        if self.options['spinmode'] == 'none' and \
+           (self.options['input_format'] != 'lhe' or (self.options['input_format'] == 'auto' and '.lhe' in inputfile[:-5])):  
+            self.banner = banner.Banner()
+            self.setup_for_pure_decay()
+            return   
+        
         if inputfile.endswith('.gz'):
             misc.gunzip(inputfile)
             inputfile = inputfile[:-3]
-
         # Read the banner of the inputfile
         self.events_file = open(os.path.realpath(inputfile))
         self.banner = banner.Banner(self.events_file)
         
+
         # Check the validity of the banner:
         if 'slha' not in self.banner:
             self.events_file = None
@@ -163,7 +233,6 @@
                 self.options['nb_sigma'] = N_sigma
             if self.options['BW_cut'] == -1:
                 self.options['BW_cut'] = float(self.banner.get_detail('run_card', 'bwcutoff'))
-
         else:
             if not self.options['Nevents_for_max_weigth']:
                 self.options['Nevents_for_max_weigth'] = 75
@@ -273,7 +342,7 @@
         
 
         #Check the param_card
-        if not bypass_check:
+        if not (bypass_check or self.options['input_format'] in ['hepmc', 'lhe_no_banner']):
             if not hasattr(self.banner, 'param_card'):
                 self.banner.charge_card('slha')
             param_card = check_param_card.ParamCard(card)
@@ -395,42 +464,10 @@
         
         args = self.split_arg(line)
         self.check_set(args)
-        
-        if args[0] not in ['ms_dir', 'run_card']:
-            args[1] = args[1].lower()
-        
-        if args[0] in  ['max_weight', 'BW_effect','ms_dir', 'spinmode']:
-            self.options[args[0]] = args[1]
-            if args[0] == 'ms_dir':
-                self.options['curr_dir'] = self.options['ms_dir']
-        elif args[0] == 'seed':
-            random.seed(int(args[1]))
-            self.seed = int(args[1])
-        elif args[0] == 'BW_cut':
-            self.options[args[0]] = float(args[1])
-        elif args[0] in ['onlyhelicity', 'use_old_dir']:
-            self.options[args[0]] = banner.ConfigFile.format_variable(args[1], bool, args[0])
-        elif args[0] in ['run_card']:
-            if args[1] == 'default':
-                self.options['run_card'] = None
-            elif os.path.isfile(args[1]):
-                self.options['run_card'] = banner.RunCard(args[1])
-            elif  len(args) >2:
-                if not self.options['run_card']:
-                    self.options['run_card'] =  banner.RunCardLO()
-                    self.options['run_card'].remove_all_cut()
-                self.options['run_card'][args[1]] = args[2]
-        elif args[0] in 'fixed_order':
-            if args[1].lower() in ['t', 'true']:
-                self.options['fixed_order'] = True
-                logger.warning('Fix order madspin fails to have the correct scale information. This can bias the results!')
-                logger.warning('Not all functionality of MadSpin handle this mode correctly (only onshell mode so far).')
-            else:
-                self.options['fixed_order'] = False
-            logger.info('fixed_order options set to %s', self.options['fixed_order'])
-        else:
-            self.options[args[0]] = int(args[1])
-    
+
+        self.options[args[0]] = ' '.join(args[1:])
+        
+
     def complete_set(self,  text, line, begidx, endidx):
         
 
@@ -559,17 +596,17 @@
 
         model_line = self.banner.get('proc_card', 'full_model_line')
 
-        if not self.seed:
-            self.seed = random.randint(0, int(30081*30081))
-            self.do_set('seed %s' % self.seed)
-            logger.info('Will use seed %s' % self.seed)
-            self.history.insert(0, 'set seed %s' % self.seed)
+        if not self.options['seed']:
+            self.options['seed'] = random.randint(0, int(30081*30081))
+            #self.do_set('seed %s' % self.seed)
+            logger.info('Will use seed %s' % self.options['seed'])
+            self.history.insert(0, 'set seed %s' % self.options['seed'])
 
-        if self.seed > 30081*30081: # can't use too big random number
-            msg = 'Random seed too large ' + str(self.seed) + ' > 30081*30081'
+        if self.options['seed'] > 30081*30081: # can't use too big random number
+            msg = 'Random seed too large ' + str(self.options['seed']) + ' > 30081*30081'
             raise Exception, msg
 
-        self.options['seed'] = self.seed
+        #self.options['seed'] = self.seed
         text = '%s\n' % '\n'.join([ line for line in self.history if line])
         self.banner.add_text('madspin' , text)
         
@@ -678,9 +715,9 @@
         
         # NOW we have all the information available for RUNNING
         
-        if self.seed:
+        if self.options['seed']:
             #seed is specified need to use that one:
-            open(pjoin(self.options['ms_dir'],'seeds.dat'),'w').write('%s\n'%self.seed)
+            open(pjoin(self.options['ms_dir'],'seeds.dat'),'w').write('%s\n'%self.options['seed'])
             #remove all ranmar_state
             for name in misc.glob(pjoin('*', 'SubProcesses','*','ranmar_state.dat'), 
                                                         self.options['ms_dir']):
@@ -741,30 +778,58 @@
             for name in misc.glob("decay_*_*", self.path_me):
                 shutil.rmtree(name)
 
-        self.events_file.close()
-        orig_lhe = lhe_parser.EventFile(self.events_file.name)
-        
+        if self.events_file:
+            self.events_file.close()
+            filename = self.events_file.name
+        else:
+            filename = self.inputfile
+
+        if self.options['input_format'] == 'auto':
+            if '.lhe' in filename :
+                self.options['input_format']  = 'lhe'
+            elif '.hepmc' in filename:
+                self.options['input_format']  = 'hepmc'
+            else:
+                raise Exception, "fail to recognized input format automatically"
+                
+        if self.options['input_format'] in ['lhe', 'lhe_no_banner']:
+            orig_lhe = lhe_parser.EventFile(filename)
+            if self.options['input_format'] == 'lhe_no_banner':
+                orig_lhe.allow_empty_event = True
+                
+        elif self.options['input_format'] in ['hepmc']:
+            import madgraph.various.hepmc_parser as hepmc_parser
+            orig_lhe = hepmc_parser.HEPMC_EventFile(filename)
+            logger.info("Parsing input event to know how many decay to generate. This can takes few minuts.")
+        else:
+            raise Exception
+            
         to_decay = collections.defaultdict(int)
         nb_event = 0
+ 
         for event in orig_lhe:
             nb_event +=1
             for particle in event:
                 if particle.status == 1 and particle.pdg in asked_to_decay:
                     # final state and tag as to decay
                     to_decay[particle.pdg] += 1
+            if self.options['input_format'] == 'hepmc' and nb_event == 250:
+                for key in to_decay:
+                    to_decay[key] *= 50.013 # to avoid accidental coincidence with nevents
+                break
 
         # Handle the banner of the output file
-        if not self.seed:
-            self.seed = random.randint(0, int(30081*30081))
-            self.do_set('seed %s' % self.seed)
-            logger.info('Will use seed %s' % self.seed)
-            self.history.insert(0, 'set seed %s' % self.seed)
+        if not self.options['seed']:
+            self.options['seed'] = random.randint(0, int(30081*30081))
+            #self.do_set('seed %s' % self.seed)
+            logger.info('Will use seed %s' % self.options['seed'])
+            self.history.insert(0, 'set seed %s' % self.options['seed'])
 
-        if self.seed > 30081*30081: # can't use too big random number
-            msg = 'Random seed too large ' + str(self.seed) + ' > 30081*30081'
+        if self.options['seed'] > 30081*30081: # can't use too big random number
+            msg = 'Random seed too large ' + str(self.options['seed']) + ' > 30081*30081'
             raise Exception, msg
 
-        self.options['seed'] = self.seed
+        #self.options['seed'] = self.options['seed']
         
         text = '%s\n' % '\n'.join([ line for line in self.history if line])
         self.banner.add_text('madspin' , text)
@@ -791,61 +856,104 @@
                         evt_decayfile[pdg] = self.generate_events(pdg, nb_event, mg5)
                     else:
                         evt_decayfile[pdg] = self.generate_events(pdg, nb_needed, mg5, cumul=True)
+                elif self.options['cross_section']:
+                    #cross-section hard-coded -> allow 
+                    part = self.model.get_particle(pdg)
+                    name = part.get_name()
+                    
+                    if name not in self.list_branches:
+                        continue
+                    else:
+                        try:
+                            evt_decayfile[pdg] = self.generate_events(pdg, nb_needed, mg5, cumul=True)
+                        except common_run_interface.ZeroResult:
+                            logger.warning("Branching ratio is zero for this particle. Not decaying it")
+                            del to_decay[pdg]                    
                 else:
                     part = self.model.get_particle(pdg)
                     name = part.get_name()
                     if name not in self.list_branches or len(self.list_branches[name]) == 0:
                         continue
-                    raise self.InvalidCmd("The bridge mode of MadSpin does not support event files where events do not *all* share the same set of final state particles to be decayed.")
+                    raise self.InvalidCmd("The bridge mode of MadSpin does not support event files where events do not *all* share the same set of final state particles to be decayed. One workaround is to force the final cross-section manually.")
                     
                      
-                
-        
         # Compute the branching ratio.
-        br = 1
-        for (pdg, event_files) in evt_decayfile.items():
-            if not event_files:
-                continue
-            totwidth = float(self.banner.get('param', 'decay', abs(pdg)).value)
-            if to_decay[pdg] == nb_event:
-                # Exactly one particle of this type to decay by event
-                pwidth = sum([event_files[k].cross for k in event_files])
-                if pwidth > 1.01 * totwidth:
-                    logger.critical("Branching ratio larger than one for %s " % pdg) 
-                br *= pwidth / totwidth
-            elif to_decay[pdg] % nb_event == 0:
-                # More than one particle of this type to decay by event
-                # Need to check the number of event file to check if we have to 
-                # make separate type of decay or not.
-                nb_mult = to_decay[pdg] // nb_event
-                if nb_mult == len(event_files):
-                    for k in event_files:
-                        pwidth = event_files[k].cross
-                        if pwidth > 1.01 * totwidth:
-                            logger.critical("Branching ratio larger than one for %s " % pdg)                       
-                        br *= pwidth / totwidth
-                    br *= math.factorial(nb_mult)
-                else:
-                    pwidth = sum(event_files[k].cross for k in event_files)
+        if not self.options['cross_section']:
+            br = 1
+            for (pdg, event_files) in evt_decayfile.items():
+                if not event_files:
+                    continue
+                totwidth = float(self.banner.get('param', 'decay', abs(pdg)).value)
+                if to_decay[pdg] == nb_event:
+                    # Exactly one particle of this type to decay by event
+                    pwidth = sum([event_files[k].cross for k in event_files])
                     if pwidth > 1.01 * totwidth:
                         logger.critical("Branching ratio larger than one for %s " % pdg) 
-                    br *= (pwidth / totwidth)**nb_mult
-            else:
-                raise self.InvalidCmd("The bridge mode of MadSpin does not support event files where events do not *all* share the same set of final state particles to be decayed.")
+                    br *= pwidth / totwidth
+                elif to_decay[pdg] % nb_event == 0:
+                    # More than one particle of this type to decay by event
+                    # Need to check the number of event file to check if we have to 
+                    # make separate type of decay or not.
+                    nb_mult = to_decay[pdg] // nb_event
+                    if nb_mult == len(event_files):
+                        for k in event_files:
+                            pwidth = event_files[k].cross
+                            if pwidth > 1.01 * totwidth:
+                                logger.critical("Branching ratio larger than one for %s " % pdg)                       
+                            br *= pwidth / totwidth
+                        br *= math.factorial(nb_mult)
+                    else:
+                        pwidth = sum(event_files[k].cross for k in event_files)
+                        if pwidth > 1.01 * totwidth:
+                            logger.critical("Branching ratio larger than one for %s " % pdg) 
+                        br *= (pwidth / totwidth)**nb_mult
+                else:
+                    raise self.InvalidCmd("The bridge mode of MadSpin does not support event files where events do not *all* share the same set of final state particles to be decayed.")
+        else:
+            br = 1
         self.branching_ratio = br
         self.efficiency = 1
-        self.cross, self.error = self.banner.get_cross(witherror=True)
+        try:
+            self.cross, self.error = self.banner.get_cross(witherror=True)
+        except:
+            if self.options['input_format'] != 'lhe':
+                self.cross, self.error = 0, 0
         self.cross *= br
         self.error *= br
         
-        
         # modify the cross-section in the init block of the banner
-        self.banner.scale_init_cross(self.branching_ratio)
-                    
-        
+        if not self.options['cross_section']:
+            self.banner.scale_init_cross(self.branching_ratio)
+        else:
+            
+            if self.options['input_format'] in ['lhe_no_banner','hepmc'] and 'init' not in self.banner:
+                self.cross = sum(self.options['cross_section'].values())
+                self.error = 0
+                self.branching_ratio = 1
+            else:  
+                self.banner.modify_init_cross(self.options['cross_section'])
+                new_cross, new_error =   self.banner.get_cross(witherror=True)
+                self.branching_ratio = new_cross / self.cross
+                self.cross = new_cross   
+                self.error = new_error
+
         # 3. Merge the various file together.
-        output_lhe = lhe_parser.EventFile(orig_lhe.name.replace('.lhe', '_decayed.lhe.gz'), 'w')
-        self.banner.write(output_lhe, close_tag=False)
+        if self.options['input_format'] == 'hepmc':
+            name = orig_lhe.name.replace('.hepmc', '_decayed.lhe')
+            if not name.endswith('.gz'):
+                name = '%s.gz' % name
+            
+            output_lhe = lhe_parser.EventFile(name, 'w')
+        else:
+            name = orig_lhe.name.replace('.lhe', '_decayed.lhe')
+            if not name.endswith('.gz'):
+                name = '%s.gz' % name
+            output_lhe = lhe_parser.EventFile(name, 'w')
+        try:
+            self.banner.write(output_lhe, close_tag=False)
+        except Exception:
+            if self.options['input_format'] == 'lhe':
+                raise
         
         # initialise object which store not use event due to wrong helicity
         bufferedEvents_decay = {}
@@ -856,8 +964,9 @@
         start = time.time()
         counter = 0
         orig_lhe.seek(0)
+
         for event in orig_lhe:
-            if counter and counter % 1000 == 0 and float(str(counter)[1:]) ==0:
+            if counter and counter % 100 == 0 and float(str(counter)[1:]) ==0:
                 print "decaying event number %s [%s s]" % (counter, time.time()-start)
             counter +=1
             
@@ -866,9 +975,13 @@
             particles = [p for p in event if int(p.status) == 1.0]
             random.shuffle(particles)
             ids = [particle.pid for particle in particles]
+            br = 1 #br for that particular events (for special/weighted case)
+            hepmc_output = lhe_parser.Event() #for hepmc case: collect the decay particle
             for i,particle in enumerate(particles):
+                #misc.sprint(i, particle.pdg, particle.pid)
+                #misc.sprint(self.final_state, evt_decayfile)
                 # check if we need to decay the particle 
-                if particle.pdg not in self.final_state or particle.pdg not in evt_decayfile:
+                if not (particle.pdg in self.final_state or particle.pdg in evt_decayfile):
                     continue # nothing to do for this particle
                 # check how the decay need to be done
                 nb_decay = len(evt_decayfile[particle.pdg])
@@ -893,9 +1006,16 @@
                             decay_file_nb = j
                         else:
                             break
-                        
+                
+                if self.options['new_wgt'] == 'BR':
+                    tot_width = float(self.banner.get('param', 'decay', abs(pdg)).value)
+                    if tot_width:
+                        br = decay_file.cross / tot_width
                 # ok start the procedure
-                helicity = particle.helicity
+                if hasattr(particle,'helicity'):
+                    helicity = particle.helicity
+                else:
+                    helicity = 9
                 bufferedEvents = bufferedEvents_decay[particle.pdg][decay_file_nb]
                 
                 # now that we have the file to read. find the associate event
@@ -927,14 +1047,36 @@
                             # only add to the buffering if the buffer is not too large
                             bufferedEvents[helicity].append(decay)
                 # now that we have the event make the merge
-                particle.add_decay(decay)
+                if self.options['input_format'] != 'hepmc':
+                    particle.add_decay(decay)
+                else:
+                    if len(hepmc_output) == 0:
+                        hepmc_output.append(lhe_parser.Particle(event=hepmc_output))
+                        hepmc_output[0].color2 = 0
+                    decayed_particle = lhe_parser.Particle(particle, hepmc_output)
+                    hepmc_output.append(decayed_particle)
+                    decayed_particle.add_decay(decay)
             # change the weight associate to the event
-            event.wgt *= self.branching_ratio
-            wgts = event.parse_reweight()
-            for key in wgts:
-                wgts[key] *= self.branching_ratio
-            # all particle have been decay if needed
-            output_lhe.write(str(event))
+            if self.options['new_wgt'] == 'cross-section':
+                event.wgt *= self.branching_ratio
+                br = self.branching_ratio
+            else:
+                event.wgt *= br
+                
+            if self.options['input_format'] != 'hepmc':
+                wgts = event.parse_reweight()
+                for key in wgts:
+                    wgts[key] *= br
+                # all particle have been decay if needed
+                output_lhe.write(str(event))
+            else:
+                hepmc_output.wgt = event.wgt
+                hepmc_output.nexternal = len(hepmc_output) # the append does not update nexternal
+                hepmc_output.assign_mother()
+                output_lhe.write(str(hepmc_output))
+        else:
+            if counter==0:
+                raise Exception
         output_lhe.write('</LesHouchesEvents>\n')        
                     
     
@@ -971,7 +1113,7 @@
            cumul allow to merge all the definition in one run (add process)
                  to generate events according to cross-section
         """
-        
+        nb_event = int(nb_event) # in case of hepmc request the nb_event is not an integer
         if cumul:
             width = 0.
         else:   
@@ -1016,18 +1158,18 @@
                         logger.debug(error)
                         pass            
                     if self.options["run_card"]:
-                        run_card = self.options["run_card"]
+                        run_card = self.run_card
                     else:
                         run_card = banner.RunCard(pjoin(decay_dir, "Cards", "run_card.dat"))                        
                     
-                    run_card["iseed"] = self.seed
+                    run_card["iseed"] = self.options['seed']
                     run_card['gridpack'] = True
                     run_card['systematics_program'] = 'False'
                     run_card['use_syst'] = False
                     run_card.write(pjoin(decay_dir, "Cards", "run_card.dat"))
                     param_card = self.banner['slha']
                     open(pjoin(decay_dir, "Cards", "param_card.dat"),"w").write(param_card)
-                    self.seed += 1
+                    self.options['seed'] += 1
                     # actually creation
                     me5_cmd.exec_cmd("generate_events run_01 -f")
                     if output_width:
@@ -1057,10 +1199,16 @@
                     logger.debug(error)
                     pass                    
                 if self.options["run_card"]:
-                    run_card = self.options["run_card"]
+                    run_card = self.run_card
                 else:
                     run_card = banner.RunCard(pjoin(decay_dir, "Cards", "run_card.dat"))
                 run_card["nevents"] = int(1.2*nb_event)
+                # Handle the banner of the output file
+                if not self.seed:
+                    self.seed = random.randint(0, int(30081*30081))
+                    self.do_set('seed %s' % self.seed)
+                    logger.info('Will use seed %s' % self.seed)
+                    self.history.insert(0, 'set seed %s' % self.seed)
                 run_card["iseed"] = self.seed
                 run_card["systematics_program"] = 'None'
                 run_card.write(pjoin(decay_dir, "Cards", "run_card.dat"))
@@ -1140,8 +1288,7 @@
                 if particle.status == 1 and particle.pdg in asked_to_decay:
                     # final state and tag as to decay
                     to_decay[particle.pdg] += 1
-        #misc.sprint(to_decay)
-        #misc.sprint("import the mode -> temporary with logging")   
+
         with misc.MuteLogger(["madgraph", "madevent", "ALOHA", "cmdprint"], [50,50,50,50]):
             mg5 = self.mg5cmd
             if not self.model:
@@ -1436,10 +1583,6 @@
         full_event = lhe_parser.Event(str(production))
         full_event = full_event.add_decays(decays)
         full_me = self.calculate_matrix_element(full_event)
-        #misc.sprint(full_event)
-        #misc.sprint([p.pdg for p in production])
-        #misc.sprint([p.pdg for p in full_event])
-        #misc.sprint(full_me, production_me, decay_me)
         return full_event, full_me/(production_me*decay_me)
         
         
@@ -1457,7 +1600,6 @@
             init = (-init[0],)
             final = tuple(-i for i in final)
             tag = (init, final)
-            misc.sprint([k for k in  self.all_me.keys() if len(k[0])==1])
             orig_order = self.all_me[tag]['order']
             
         pdir = self.all_me[tag]['pdir']
@@ -1520,7 +1662,6 @@
                 
             rwgt_interface.ReweightInterface.get_LO_definition_from_NLO()        
         
-        
 
 
 if __name__ == '__main__':
 
=== modified file 'MadSpin/madspin'
--- MadSpin/madspin	2013-11-12 23:52:05 +0000
+++ MadSpin/madspin	2018-06-15 08:18:50 +0000
@@ -49,6 +49,7 @@
 if len(args) == 0:
     args = ''
 
+
 import subprocess
 
 # Check if optimize mode is (and should be) activated
@@ -114,23 +115,6 @@
     pass
 import MadSpin.interface_madspin as interface
 
-try:
-    cmd_line = interface.MadSpinInterface()
-    cmd_line.use_rawinput = True
-    cmd_line.cmdloop()
-except:
-    pass
-try:
-    cmd_line.exec_cmd('quit all', printcmd=False)
-    readline.set_history_length(100)
-    if not os.path.exists(os.path.join(os.environ['HOME'], '.mg5')):
-        os.mkdir(os.path.join(os.environ['HOME'], '.mg5'))
-    readline.write_history_file(history_file)
-except Exception, error:
-    pass
-
-sys.exit(0)
-
 # Call the cmd interface main loop
 try:
     if options.file or args:
@@ -143,12 +127,14 @@
             cmd_line = interface.MasterCmdWeb()
             cmd_line.debug_output = os.path.join(os.path.dirname(input_file),'generation.log')
             cmd_line.use_rawinput = False
-            cmd_line.run_cmd('import ' + input_file)
+            cmd_line.import_command_file(input_file)
             cmd_line.run_cmd('quit')
         else:
+            print "using input+file", input_file
             cmd_line = interface.MadSpinInterface()
             cmd_line.use_rawinput = False
-            cmd_line.run_cmd('import ' + input_file)
+            cmd_line.haspiping = False
+            cmd_line.import_command_file(input_file)
             cmd_line.run_cmd('quit')
     else:
         # Interactive mode
@@ -160,8 +146,20 @@
             cmd_line = interface.MasterCmdWeb()
             cmd_line.cmdloop()
         else:
-            cmd_line = interface.MasterCmd(mgme_dir = options.mgme_dir)
-            cmd_line.cmdloop()
+            try:
+                cmd_line = interface.MadSpinInterface()
+                cmd_line.use_rawinput = True
+                cmd_line.cmdloop()
+            except:
+                pass
+        try:
+            cmd_line.exec_cmd('quit all', printcmd=False)
+            readline.set_history_length(100)
+            if not os.path.exists(os.path.join(os.environ['HOME'], '.mg5')):
+                os.mkdir(os.path.join(os.environ['HOME'], '.mg5'))
+            readline.write_history_file(history_file)
+        except Exception, error:
+            pass
 except KeyboardInterrupt:
     print 'writting history and quit on KeyboardInterrupt' 
     pass
 
=== modified file 'Template/LO/Cards/run_card.dat'
--- Template/LO/Cards/run_card.dat	2018-04-25 21:20:23 +0000
+++ Template/LO/Cards/run_card.dat	2018-06-15 08:18:50 +0000
@@ -12,7 +12,7 @@
 #   mind the format:   value    = variable     ! comment             *
 #                                                                    *
 #   To display more options, you can type the command:               *
-*      update full_run_card                                          *
+#      update full_run_card                                          *
 #*********************************************************************
 #
 #*******************                                                 
 
=== modified file 'Template/LO/SubProcesses/genps.f'
--- Template/LO/SubProcesses/genps.f	2018-04-20 08:38:20 +0000
+++ Template/LO/SubProcesses/genps.f	2018-06-15 08:18:50 +0000
@@ -104,7 +104,7 @@
 c
       integer iconfig,mincfig,maxcfig,invar
       double precision p1(0:3,nexternal+1)
-      double precision x(maxinvar)
+      double precision x(*)
       double precision wgt
 c
 c     Local
@@ -279,19 +279,18 @@
          cm_rap=.5d0*dlog((p0+p3)/(p0-p3))
          set_cm_rap=.true.
 c        Set shat
-         s(-nbranch) = m2**2+2*xbk(1)*ebeam(1) *
-     $                 (ebeam(2)+sqrt(ebeam(2)**2-m2**2))
+         s(-nbranch) = x(ndim)*stot         
       elseif (abs(lpp(2)) .ge. 1) then
          call sample_get_x(sjac,x(ndim),ndim,mincfig,0d0,1d0)
          xbk(2) = x(ndim)
+
 c        Set CM rapidity for use in the rap() function
          p0=ebeam(1)+xbk(2)*ebeam(2)
          p3=sqrt(ebeam(1)**2-m1**2)-xbk(2)*ebeam(2)
          cm_rap=.5d0*dlog((p0+p3)/(p0-p3))
          set_cm_rap=.true.
 c        Set shat
-         s(-nbranch) = m1**2+2*(ebeam(1)+sqrt(ebeam(1)**2-m1**2))
-     $                 * xbk(2)*ebeam(2)
+         s(-nbranch) =  x(ndim)*stot         
       else
 c        Set CM rapidity for use in the rap() function
          p0=ebeam(1) + ebeam(2)
@@ -663,7 +662,7 @@
 c      double precision spole(-max_branch:0),swidth(-max_branch:0)
       double precision jac,pswgt
       integer nbranch
-      double precision x(40) ! ja 3/2/11 21->40 after strange segfault
+      double precision x(*) ! ja 3/2/11 21->40 after strange segfault
 c
 c     Local
 c
 
=== modified file 'Template/LO/SubProcesses/reweight.f'
--- Template/LO/SubProcesses/reweight.f	2018-03-11 12:29:51 +0000
+++ Template/LO/SubProcesses/reweight.f	2018-06-15 08:18:50 +0000
@@ -1,3 +1,20 @@
+c     for cross-checking change in this file. 
+c     here is a minimal list of process that we have to 
+c     test
+c    
+c     SM
+c     ----
+c     p p > t t~ (up to 2jet)
+c     p p > w+ (up to 3 jet)
+c     p p > z t t~ j j  (no MLM needed)
+c
+c
+c     HEFT
+c     ----
+c     p p > h j b b~
+c     q q > a a g q q
+c     g g > h g q q
+
       double precision function gamma(q0)
 c**************************************************
 c   calculates the branching probability
@@ -522,7 +539,8 @@
       common/to_stot/stot,m1,m2
 
 C   local variables
-      integer i, j, idi, idj, k
+      integer i, j, idi, idj, k,m
+      integer get_color
       real*8 PI
       parameter( PI = 3.14159265358979323846d0 )
       integer iforest(2,-max_branch:-1,lmaxconfigs)
@@ -545,6 +563,7 @@
       logical chclusold,fail,increasecode
       save chclusold
       integer tmpindex
+      integer pdgm, pdgid1, pdgid2
 
       logical isqcd,isjet,isparton,cluster,isjetvx,is_octet
       integer ifsno
@@ -746,8 +765,17 @@
 c          The ishft gives the FS particle corresponding to imocl
               if(.not.is_octet(ipdgcl(ishft(1,ipart(1,imocl(n))-1),igraphs(1),iproc)))then
                  ! split case for q a > q and for g > g h (with the gluon splitting into quark)
-                 if (ipart(2,imocl(n)).eq.0) then ! q a > q case
-                    iqjets(ipart(1,imocl(n)))=0
+                 ! also check for case of three scalar interaction (then do nothing)
+                 pdgm   = ipdgcl(imocl(n),igraphs(1),iproc)
+                 pdgid1 = ipdgcl(idacl(n,1),igraphs(1),iproc)
+                 pdgid2 = ipdgcl(idacl(n,2),igraphs(1),iproc)
+
+                 if (.not.isqcd(pdgm).and..not.isqcd(pdgid1).and..not.isqcd(pdgid2)) then
+                    ! this is to avoid to do weird stuff for w+ w- z (or h h h) 
+                    ! this fix an issue for qq_zttxqq G1594.08
+                     continue
+                 elseif (ipart(2,imocl(n)).eq.0) then ! q a > q case
+                       iqjets(ipart(1,imocl(n)))=0
                  else ! octet. want to be sure that both are tagged as jet before removing one
                     ! this prevent that both are removed in case of g > g h , g > q1 q2, q1 > a q1.
                     ! at least one of the two should be kept as jet
@@ -791,7 +819,57 @@
            goodjet(imocl(n))=
      $          (isjet(ipdgcl(imocl(n),igraphs(1),iproc)).and.
      $          goodjet(idacl(n,1)).and.goodjet(idacl(n,2)))
-        endif
+            
+c       check case with g > g g
+c       where the hardest gluon is not goodjet but the other is.
+c       in that case change ipart(1,) of the mother gluon
+c             pure QCD jet
+c             need to take care of the following case:
+c                                      tttttttttt
+c                      gggggggggggggggg  
+c             ggggggggg                tttttttttt 
+c                      gggggggg
+c                        
+c             in that case the up gluon can be tag as the hardest one
+c             but this one is also lead to no QCD one.
+c             so in that case we have to change ipart(1) to the sofest gluon
+           pdgm   = ipdgcl(imocl(n),igraphs(1),iproc)
+           pdgid1 = ipdgcl(idacl(n,1),igraphs(1),iproc)
+           pdgid2 = ipdgcl(idacl(n,2),igraphs(1),iproc)
+           if (is_octet(pdgm).and.is_octet(pdgid1).and.is_octet(pdgid2))then
+c              write(*,*) 'pure QCD vertex (2)'
+c              write(*,*) pdgm , '>', pdgid1,' ', pdgid2
+c              write(*,*) 'ipart', ipart(1,imocl(n)), ipart(2,imocl(n))
+c              write(*,*) 'id', imocl(n), idacl(n,1),idacl(n,2)
+c              write(*,*) 'ipart',ipart(1,imocl(n)),'/', ipart(2,imocl(n)), ipart(1,idacl(n,1)),'/', ipart(2,idacl(n,1)),
+c     $             ipart(1,idacl(n,2)),'/', ipart(2,idacl(n,2))
+c              write(*,*) 'googjet', goodjet(idacl(n,1)),goodjet(idacl(n,2))
+              if (ipart(1,imocl(n)).eq.ipart(1, idacl(n,1))) then
+                  if (.not.goodjet(idacl(n,1)).and.goodjet(idacl(n,2))) then
+c                     write(*,*) 'ggg with hard jet set a QED the second jet lead to', ipart(1,idacl(n,2)), ipart(2,idacl(n,2))
+                     do m =n_max_cl,n,-1
+                        if(ipart(1,m).eq.ipart(1,imocl(n)).and.ipart(2,m).eq.ipart(2,imocl(n)))then
+                           ipart(1,m) = ipart(1,idacl(n,2))
+                           ipart(2,m) = ipart(2,idacl(n,2))
+                        endif
+                     enddo
+                  endif
+               else
+                  if (.not.goodjet(idacl(n,2)).and.goodjet(idacl(n,1))) then
+c                     write(*,*) 'ggg with hard jet set a QED the second jet lead to', ipart(1,idacl(n,1)), ipart(2,idacl(n,1))
+                     do m =n_max_cl,n,-1
+                        if(ipart(1,m).eq.ipart(1,imocl(n)).and.ipart(2,m).eq.ipart(2,imocl(n)))then
+                           ipart(1,m) = ipart(1,idacl(n,1))
+                           ipart(2,m) = ipart(2,idacl(n,1))
+                        endif
+                     enddo
+                  endif
+               endif
+            endif
+
+
+
+       endif
       enddo
 
       if (btest(mlevel,4))then
 
=== modified file 'Template/NLO/SubProcesses/montecarlocounter.f'
--- Template/NLO/SubProcesses/montecarlocounter.f	2017-12-16 08:06:58 +0000
+++ Template/NLO/SubProcesses/montecarlocounter.f	2018-06-15 08:18:50 +0000
@@ -19,7 +19,7 @@
       logical notagluon,found
       common/cnotagluon/notagluon
       integer nglu,nsngl
-      logical isspecial,isspecial0
+      logical isspecial(max_bcol)
       common/cisspecial/isspecial
       logical spec_case
 c
@@ -68,9 +68,9 @@
 
       fksfather=min(i_fks,j_fks)
 
-c isspecial will be set equal to .true. only if the father is a gluon,
-c and another gluon will be found which is connected to it by both
-c colour and anticolour
+c isspecial will be set equal to .true. colour flow by colour flow only
+c if the father is a gluon, and another gluon will be found which is
+c connected to it by both colour and anticolour
       isspecial=.false.
 c
 c consider only leading colour flows
@@ -89,7 +89,6 @@
       do i=1,max_bcol
          if(.not.is_leading_cflow(i))cycle
 c Loop over Born-level colour flows
-         isspecial0=.false.
 c nglu and nsngl are the number of gluons (except for the father) and of 
 c colour singlets in the Born process, according to the information 
 c stored in ICOLUP
@@ -178,19 +177,18 @@
                             stop
                          endif
                          colorflow(k0,colorflow(k0,0))=i
-                         isspecial0=.true.
+                         isspecial(i)=.true.
                      endif
                   endif
                enddo
             endif
          enddo
          if( ((nglu+nsngl).gt.(nexternal-2)) .or.
-     #       (isspecial0.and.(nglu+nsngl).ne.(nexternal-2)) )then
+     #       (isspecial(i).and.(nglu+nsngl).ne.(nexternal-2)) )then
            write(*,*)'Error #4 in set_matrices'
-           write(*,*)isspecial0,nglu,nsngl
+           write(*,*)isspecial(i),nglu,nsngl
            stop
          endif
-         isspecial=isspecial.or.isspecial0
       enddo
       call check_mc_matrices
       return
@@ -213,7 +211,7 @@
       common/cfksfather/fksfather
       logical notagluon
       common/cnotagluon/notagluon
-      logical isspecial
+      logical isspecial(max_bcol)
       common/cisspecial/isspecial
       logical is_leading_cflow(max_bcol)
       integer num_leading_cflows
@@ -275,8 +273,8 @@
 c
       if( (notagluon.and.ntot.ne.num_leading_cflows) .or.
      #    ( (.not.notagluon).and.
-     #      ( (.not.isspecial).and.ntot.ne.(2*num_leading_cflows) .or.
-     #        (isspecial.and.ntot.ne.num_leading_cflows) ) ) )then
+     #      ( (.not.isspecial(1)).and.ntot.ne.(2*num_leading_cflows) .or.
+     #        (isspecial(1).and.ntot.ne.num_leading_cflows) ) ) )then
          write(*,*)'Error #6 in check_mc_matrices',
      #     notagluon,ntot,num_leading_cflows,max_bcol
          stop
@@ -429,7 +427,7 @@
 
       integer ipartners(0:nexternal-1),colorflow(nexternal-1,0:max_bcol)
       common /MC_info/ ipartners,colorflow
-      logical isspecial
+      logical isspecial(max_bcol)
       common/cisspecial/isspecial
 
       integer fksfather
@@ -633,7 +631,6 @@
 c go --> go g
                   if(ileg.le.2)then
                      N_p=2
-                     if(isspecial)N_p=1
                      if(limit)then
                         xkern(1)=(g**2/N_p)*8*vca*(1-x*(1-x))**2/(s*x**2)
                         xkernazi(1)=-(g**2/N_p)*16*vca*(1-x)**2/(s*x**2)
@@ -650,7 +647,6 @@
 c
                   elseif(ileg.eq.3)then
                      N_p=2
-                     if(isspecial)N_p=1
                      if(non_limit)then
                         xfact=(2-(1-x)*(1-(kn0/kn)*yj))/kn*knbar*(1-x)*(1-yj)
                         prefact=2/(s*N_p)
@@ -661,7 +657,6 @@
 c
                   elseif(ileg.eq.4)then
                      N_p=2
-                     if(isspecial)N_p=1
                      if(limit)then
                         xkern(1)=(g**2/N_p)*( 8*vca*
      &                       (s**2*(1-(1-x)*x)-s*(1+x)*xm12+xm12**2)**2 )/
@@ -697,7 +692,6 @@
 c
                   elseif(ileg.eq.4)then
                      N_p=2
-                     if(isspecial)N_p=1
                      if(limit)then
                         xkern(1)=(g**2/N_p)*( 4*vtf*(1-x)*
      &                        (s**2*(1-2*(1-x)*x)-2*s*x*xm12+xm12**2) )/
@@ -730,7 +724,6 @@
 c a --> a q
                   if(ileg.le.2)then
                      N_p=2
-                     if(isspecial)N_p=1
                      if(limit)then
                         xkern(1)=(g**2/N_p)*4*vcf*(1-x)*((1-x)**2+1)/(s*x**2)
                         xkern(2)=xkern(1)*(g_ew**2/g**2)*(qi2/vcf)
@@ -925,8 +918,10 @@
            xkernazi(i)=xkernazi(i)*gfactazi*gfactsf*wcc
         enddo
         do cflows=1,colorflow(npartner,0)
-           born_red=born_red+bornbars(colorflow(npartner,cflows))
-           born_red_tilde=born_red_tilde+bornbarstilde(colorflow(npartner,cflows))
+           N_p=1
+           if(isspecial(cflows))N_p=2d0
+           born_red=born_red+N_p*bornbars(colorflow(npartner,cflows))
+           born_red_tilde=born_red_tilde+N_p*bornbarstilde(colorflow(npartner,cflows))
         enddo
 c Change here, to include also xkern(2)!
         xmcxsec(npartner)=xkern(1)*born_red+xkernazi(1)*born_red_tilde
@@ -1207,26 +1202,58 @@
 
 
       function gfunction(w,alpha,beta,delta)
-c Gets smoothly to 0 as w goes to 1
+c Gets smoothly to 0 as w goes to 1.
+c Call with
+c   alpha > 1, or alpha < 0; if alpha < 0, gfunction = 1;
+c   0 < |beta| <= 1;
+c   0 < delta <= 2.
       implicit none
+      double precision tiny
+      parameter (tiny=1.d-5)
       double precision gfunction,alpha,beta,delta,w,wmin,wg,tt,tmp
-
-      if(beta.lt.0d0)then
-         wmin=0d0
-      else
-         wmin=max(0d0,1d0-delta)
-      endif
-      wg=min(1d0-(1-wmin)*abs(beta),0.99d0)
-      tt=(abs(w)-wg)/(1d0-wg)
-      if(tt.gt.1d0)then
-         write(*,*)'Fatal error in gfunction',tt
-         stop
-      endif
+      logical firsttime
+      save firsttime
+      data firsttime /.true./
+      double precision cutoff,cutoff2
+      parameter(cutoff=1d0)
+      parameter(cutoff2=0.99d0)
+c
+c     set cutoff < 1 and cutoff2 = cutoff in the final version
+c
+      if(firsttime)then
+        firsttime=.false.
+        if(alpha.ge.0d0.and.alpha.lt.1d0)then
+          write(*,*)'Incorrect alpha in gfunction',alpha
+          stop
+        endif
+        if(abs(beta).gt.1d0)then
+          write(*,*)'Incorrect beta in gfunction',beta
+          stop
+        endif
+        if(delta.gt.2d0.or.delta.le.0d0)then
+          write(*,*)'Incorrect delta in gfunction',delta
+          stop
+        endif
+      endif
+c
       tmp=1d0
       if(alpha.gt.0d0)then
-         if(tt.gt.0d0.and.abs(w).lt.0.99d0)
-     &   tmp=(1-tt)**(2*alpha)/(tt**(2*alpha)+(1-tt)**(2*alpha))
-         if(abs(w).ge.0.99d0)tmp=0d0
+        if(beta.lt.0d0)then
+          wmin=0d0
+        else
+          wmin=max(0d0,1d0-delta)
+        endif
+        wg=min(1d0-(1-wmin)*abs(beta),cutoff-tiny)
+        if(abs(w).gt.wg.and.abs(w).lt.cutoff2)then
+          tt=(abs(w)-wg)/(cutoff-wg)
+          if(tt.gt.1d0)then
+            write(*,*)'Fatal error in gfunction',tt
+            stop
+          endif
+          tmp=(1-tt)**(2*alpha)/(tt**(2*alpha)+(1-tt)**(2*alpha))
+        elseif(abs(w).ge.cutoff2)then
+          tmp=0d0
+        endif
       endif
       gfunction=tmp
       return
@@ -2600,6 +2627,7 @@
       subroutine assign_ref_scale(p,xii,sh,ref_sc)
       implicit none
       include "nexternal.inc"
+      include "madfks_mcatnlo.inc"
       double precision p(0:3,nexternal-1),xii,sh,ref_sc
       integer i_scale,i
       parameter(i_scale=1)
@@ -2619,7 +2647,7 @@
          stop
       endif
 c Safety threshold for the reference scale
-      ref_sc=max(ref_sc,30d0)
+      ref_sc=max(ref_sc,scaleMClow+scaleMCdelta)
 
       return
       end
 
=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2018-04-29 13:58:31 +0000
+++ UpdateNotes.txt	2018-06-15 08:18:50 +0000
@@ -1,5 +1,33 @@
 Update notes for MadGraph5_aMC@NLO (in reverse time order)
 
+2.6.3 (13/06/18)
+      OM: When importing model, we now run one additional layer of optimisation:
+           - if a vertex as two identical coupling for the same color structure then the associated lorentz 
+             structure are merged in a single one and the vertex is modified accordingly
+      OM: When restricting a model, we also run one additional layer of optimisation
+           - Opposite sign coupling are now identified and merged into a single one
+           - if a vertex as two identical coupling (up to the sign) for the same color structure
+             then the associated lorentz structure are merged in a single one and the 
+             vertex is modified accordingly 
+      VH+OM: changing the ALOHA naming scheme for combine routine when the function name starts to be too long. 
+      OM: adding a hidden parameter to the run_card (python_seed) to allow to control the randon number 
+          generated within python and be able to have full reproducibility of the events
+      OM: Fixing some issue with the default dynamical scale choice for 
+            - non minimal QED sample
+            - heft model when multiple radiation coming from the higgs decay/scattering
+          This can also impact MLM since it use the same definition for the dynamical scale
+      OM: Fix some issue for DIS scattering where the shat was wrongly defined for low energy scattering.
+          Low energy scattering are not adviced since they break the factorization theorem.
+          In particular the z-boost of the events are quite ill defined in that scenario.
+      OM: changing the format of the param_card for NLO model to match expectation from the latest PY8
+      OM: Update of MadSpin to allow special input file for the case of spinmode=none. 
+          With that very simple mode of decay, you can now decay hepmc file or wrongly formatted leshouches event
+          (in that mode we do not have spin correlation and width effect)
+      PT: in montecarlocounter.f: improved colour-flow treatment in the case gluons are twice colour-connected to each other
+          new gfunction(w) to get smoothly to 0 as w -> 1. (for NLO+PS run)
+      OM: Fix some issue for the new QED model (including one in the handling of complex mass scheme of such model)
+      OM: Fixing an issue of the param_card out of sync when running compute-widths
+      OM: Adding Qnumbers block for ghost (the latest version of py8 was crashing due to their absence)
 
 2.6.2 (29/04/18)
 
 
=== modified file 'VERSION'
--- VERSION	2018-04-29 13:58:31 +0000
+++ VERSION	2018-06-15 08:18:50 +0000
@@ -1,5 +1,5 @@
-version = 2.6.2
-date = 2018-04-29
+version = 2.6.3
+date = 2018-06-13
 
 
 
 
=== modified file 'aloha/aloha_writers.py'
--- aloha/aloha_writers.py	2018-04-11 15:28:05 +0000
+++ aloha/aloha_writers.py	2018-06-15 08:18:50 +0000
@@ -1177,7 +1177,7 @@
 
 def get_routine_name(name=None, outgoing=None, tag=None, abstract=None):
     """ build the name of the aloha function """
-    
+
     assert (name and outgoing is not None) or abstract
 
     if tag is None:
@@ -1205,6 +1205,14 @@
 def combine_name(name, other_names, outgoing, tag=None, unknown_propa=False):
     """ build the name for combined aloha function """
 
+    def myHash(target_string):
+        if len(target_string)<50:
+            return target_string
+        if '%(propa)s' in target_string:
+            return 'ALOHA_'+(str(hash(target_string.lower()))).replace('-','m')+'%(propa)s'
+        else:
+            return 'ALOHA_'+(str(hash(target_string.lower()))).replace('-','m')
+
     if tag and any(t.startswith('P') for t in tag[:-1]):
         # propagator need to be the last entry for the tag
         for i,t  in enumerate(tag):
@@ -1238,9 +1246,11 @@
         if unknown_propa and outgoing:
             routine += '%(propa)s'
         if outgoing is not None:
-            return routine +'_%s' % outgoing
+            return myHash(routine)+'_%s' % outgoing
+#            return routine +'_%s' % outgoing
         else:
-            return routine
+            return myHash(routine)
+#            return routine
 
     if tag is not None:
         addon = ''.join(tag)
@@ -1257,10 +1267,15 @@
     if unknown_propa:
         addon += '%(propa)s'
 
+#    if outgoing is not None:
+#        return '_'.join((name,) + tuple(other_names)) + addon + '_%s' % outgoing
+#    else:
+#        return '_'.join((name,) + tuple(other_names)) + addon
+
     if outgoing is not None:
-        return '_'.join((name,) + tuple(other_names)) + addon + '_%s' % outgoing
+        return myHash('_'.join((name,) + tuple(other_names))) + addon + '_%s' % outgoing
     else:
-        return '_'.join((name,) + tuple(other_names)) + addon
+        return myHash('_'.join((name,) + tuple(other_names))) + addon
 
 class ALOHAWriterForCPP(WriteALOHA): 
     """Routines for writing out helicity amplitudes as C++ .h and .cc files."""
@@ -1736,7 +1751,7 @@
             # added to another file
             self.mode = 'no_include'
         
-        #name = combine_name(self.name, lor_names, offshell, self.tag)
+
         
         #h_text = self.write_combined_h(lor_names, offshell, **opt)
         cc_text, h_text = StringIO() , StringIO() 
 
=== modified file 'aloha/create_aloha.py'
--- aloha/create_aloha.py	2018-04-26 18:04:25 +0000
+++ aloha/create_aloha.py	2018-06-15 08:18:50 +0000
@@ -470,8 +470,8 @@
                 propaR = deltaL('pr1',id) * deltaL('pr2', 'I2') * delta('pr2', spin_id) * delta('pr1', 'I3')
             #numerator += "*deltaL('pr_1',id) * deltaL('pr_2', 'I2') * delta('pr_1', spin_id) * delta('pr_2', 'I3')"
         elif spin == 5 :
-            tag = {'1': _spin2_mult + id, '2': 2 * _spin2_mult + id, 
-                   '51': 'I2', '52': 'I3', 'id':id}
+            tag = {'1': _spin2_mult + id, '2': 'I2', 
+                   '51': 2 * _spin2_mult + id, '52': 'I3', 'id':id}
         
         numerator = self.mod_propagator_expression(tag, numerator)
         if denominator:
@@ -938,7 +938,7 @@
                 if self.has_key((lorentzname, outgoing)):
                     self[(lorentzname, outgoing)].add_combine(list_l_name[1:])
                 else:
-                    lorentz = eval('self.model.lorentz.%s' % lorentzname)
+                    lorentz = eval('self.model.lorentz.%s' % list_l_name[0])
                     assert lorentz.structure == 'external'
             else:
                 l_lorentz = []
@@ -1240,7 +1240,6 @@
     
     # avoid to add tag in global
     old_tag = set(aloha_lib.KERNEL.use_tag)
-    print 'create lib',tag
     name, i = tag
     if name == "Spin2Prop":
         lib[('Spin2Prop',i)] = create( Spin2Propagator(_spin2_mult + i, \
 
=== modified file 'madgraph/interface/amcatnlo_interface.py'
--- madgraph/interface/amcatnlo_interface.py	2016-09-01 09:44:05 +0000
+++ madgraph/interface/amcatnlo_interface.py	2018-06-15 08:18:50 +0000
@@ -384,7 +384,7 @@
                 else:
                     for diag_type, get_amps in get_amps_dict.items():
                         self._curr_amps = get_amps()
-                        self.draw(' '.join(args[1:]), type=diag_type)
+                        self.draw(' '.join(args[1:]), Dtype=diag_type)
                 # set _curr_amps back to empty
                 self._curr_amps = diagram_generation.AmplitudeList()
 
@@ -402,7 +402,7 @@
                     text += '\n\nReal diagrams:'
                     text += '\n'.join(amp.nice_string() for amp in get_amps_dict['real']())
                     text += '\n\nLoop diagrams:\n'
-                    text += '\n'.join(amp.nice_string() for amp in get_amps_dict['virt']())
+                    text += '\n'.join(amp.nice_string() for amp in get_amps_dict['loop']())
                 pydoc.pager(text)
 
                 # set _curr_amps back to empty
 
=== modified file 'madgraph/interface/amcatnlo_run_interface.py'
--- madgraph/interface/amcatnlo_run_interface.py	2018-03-22 14:00:54 +0000
+++ madgraph/interface/amcatnlo_run_interface.py	2018-06-15 08:18:50 +0000
@@ -2058,7 +2058,7 @@
 """-1 12      ! points, iterations
 %(accuracy)s       ! desired fractional accuracy
 1 -0.1     ! alpha, beta for Gsoft
- 1 -0.1    ! alpha, beta for Gazi
+-1 -0.1    ! alpha, beta for Gazi
 1          ! Suppress amplitude (0 no, 1 yes)?
 1          ! Exact helicity sum (0 yes, n = number/event)?
 %(channel)s          ! Enter Configuration Number:
@@ -5325,7 +5325,7 @@
                 cards.append('madspin_card.dat')
             if switch['reweight'] != 'OFF':
                 cards.append('reweight_card.dat')
-            if switch['madanalysis'] == 'HADRON':
+            if switch['madanalysis'] in ['HADRON', 'ON']:
                 cards.append('madanalysis5_hadron_card.dat')                
         if 'aMC@' in mode:
             cards.append('shower_card.dat')
 
=== modified file 'madgraph/interface/common_run_interface.py'
--- madgraph/interface/common_run_interface.py	2018-04-28 21:38:38 +0000
+++ madgraph/interface/common_run_interface.py	2018-06-15 08:18:50 +0000
@@ -3338,11 +3338,12 @@
             line = 'compute_widths %s --path=%s' % (line, path)
             cmd.exec_cmd(line, model=model)
             interface.child = None
-            
-            
-            
-            
-            raise Exception, 'fail to find a way to handle Auto width'
+            del cmd
+            return 
+            
+            
+            
+        raise Exception, 'fail to find a way to handle Auto width'
         
         
     def store_scan_result(self):
@@ -3388,6 +3389,7 @@
                 os.remove(pjoin(self.me_dir,'RunWeb'))
             except Exception:
                 pass
+
         try:
             self.store_result()
         except Exception:
@@ -3686,6 +3688,7 @@
             self.results.add_detail('cross', madspin_cmd.cross)#cross * madspin_cmd.branching_ratio)
             self.results.add_detail('error', madspin_cmd.error+ cross * madspin_cmd.err_branching_ratio)
             self.results.add_detail('run_mode', current['run_mode'])
+            self.to_store.append("event")
 
         self.run_name = new_run
         self.banner = madspin_cmd.banner
@@ -5739,8 +5742,12 @@
     
     fail_due_to_format = 0 #parameter to avoid infinite loop
     def postcmd(self, stop, line):
-        ending_question = cmd.OneLinePathCompletion.postcmd(self,stop,line)
 
+        if line not in [None, '0', 'done', '']:
+            ending_question = cmd.OneLinePathCompletion.postcmd(self,stop,line)
+        else:
+            ending_question = True
+        
         if ending_question:
             self.check_card_consistency()
             if self.param_consistency:
@@ -6140,6 +6147,12 @@
 
     def do_compute_widths(self, line):
         signal.alarm(0) # avoid timer if any
+        
+        # ensure that the card is in sync
+        if 'param' in self.modified_card:
+            self.write_card('param')
+            self.modified_card.discard('param')
+            
         path = self.paths['param']
         pattern = re.compile(r'''decay\s+(\+?\-?\d+)\s+auto(@NLO|)''',re.I)
         text = open(path).read()
@@ -6257,7 +6270,7 @@
             logger.info("add in the pythia8_card the parameter \"%s\" with value \"%s\"" % (name, value), '$MG:BOLD')
         elif len(args) > 0:
             if args[0] in self.cards:
-                card = args[0]
+                card = args[0]                
             elif "%s.dat" % args[0] in self.cards:
                 card = "%s.dat" % args[0]
             elif "%s_card.dat" % args[0] in self.cards: 
@@ -6267,7 +6280,11 @@
             else:
                 logger.error("unknow card %s. Please retry." % args[0])
                 return
-            
+            # ensure that the card is in sync
+            if card in self.modified_card:
+                self.write_card(card)
+                self.modified_card.discard(card)
+                
             if card in self.paths:
                 path = self.paths[card]
             elif os.path.exists(card):
@@ -6431,6 +6448,12 @@
         """Running ASperGe"""
         signal.alarm(0) # avoid timer if any
 
+        # ensure that the card is in sync
+        if 'param' in self.modified_card:
+            self.write_card('param')
+            self.modified_card.discard('param')
+
+
         path = pjoin(self.me_dir,'bin','internal','ufomodel','ASperGE')
         if not os.path.exists(path):
             logger.error('ASperge has not been detected in the current model, therefore it will not be run.')
@@ -6541,8 +6564,8 @@
 
         if answer in self.modified_card:
             self.write_card(answer)
-        elif answer.replace('_card.dat','') in self.modified_card:
-            self.write_card(answer.replace('_card.dat',''))
+        elif os.path.basename(answer.replace('_card.dat','')) in self.modified_card:
+            self.write_card(os.path.basename(answer.replace('_card.dat','')))
 
         try:
             self.mother_interface.exec_cmd('open %s' % path)
@@ -6613,7 +6636,7 @@
     """ This is a decorator for customizing/using scan over the param_card (or technically other)
     This should be use like this:
     
-    @scanhandling(arguments)
+    @scanparamcardhandling(arguments)
     def run_launch(self, *args, **opts)
 
     possible arguments are listed above and should be function who takes a single
@@ -6715,7 +6738,7 @@
                 #param_card_iterator.write(card_path) #-> this is done by the with statement
                 name = misc.get_scan_name(orig_name, next_name)
                 path = result_path(obj) % name 
-                logger.info("write all cross-section results in %s" % path ,'$MG:BOLD')
+                logger.info("write scan results in %s" % path ,'$MG:BOLD')
                 order = summaryorder(obj)()
                 param_card_iterator.write_summary(path, order=order)
         return new_fct
 
=== modified file 'madgraph/interface/extended_cmd.py'
--- madgraph/interface/extended_cmd.py	2018-03-23 16:46:49 +0000
+++ madgraph/interface/extended_cmd.py	2018-06-15 08:18:50 +0000
@@ -2350,6 +2350,8 @@
        color_for_XXXX(value)   -> return the representation on the screen for value
        get_cardcmd_for_XXXX(value)> return the command to run to customize the cards to 
                                   match the status
+       print_options_XXXX()    -> return the text to disply below "other options"
+                                  default is other possible value (ordered correctly)
 
        consistency_XX_YY(val_XX, val_YY)
            -> XX is the new key set by the user to a new value val_XX
@@ -2553,6 +2555,12 @@
                     value = self.get_allowed(base)[cur+1]
                 except IndexError:
                     value = self.get_allowed(base)[0]
+                    if value == "OFF" and  cur == 0:
+                        logger.warning("Invalid action: %s" % self.print_options(base))
+                    elif cur == 0: 
+                        logger.warning("Can not change value for this parameter")
+                        
+                        
         elif line in ['', 'done', 'EOF', 'eof','0']:
             super(ControlSwitch, self).default(line)
             return self.answer
@@ -2823,10 +2831,10 @@
             else:
                 return self.red % switch_value
 
-    def print_info(self,key):
+    def print_options(self,key, keep_default=False):
     
-        if hasattr(self, 'print_info_%s' % key):
-            return getattr(self, 'print_info_%s' % key)
+        if hasattr(self, 'print_options_%s' % key) and not keep_default:
+            return getattr(self, 'print_options_%s' % key)()
 
         #re-order the options in order to have those in cycling order    
         try:
@@ -3087,7 +3095,7 @@
                 to_display = self.switch[key]
             if len(to_display) > max_len_switch: max_len_switch=len(to_display)
             
-            info = self.print_info(key)
+            info = self.print_options(key)
             if len(info)> max_len_add_info: max_len_add_info = len(info)
 
             if self.get_allowed(key):
@@ -3115,7 +3123,7 @@
                            'descrip': descrip,
                            'name': key,
                            'switch': self.color_for_value(key,self.switch[key]),
-                           'add_info': self.print_info(key),
+                           'add_info': self.print_options(key),
                            'switch_nc': self.switch[key],
                            'strike_switch': u'\u0336'.join(' %s ' %self.switch[key].upper()) + u'\u0336',
                            }
 
=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2018-04-26 14:24:04 +0000
+++ madgraph/interface/madevent_interface.py	2018-06-15 08:18:50 +0000
@@ -530,6 +530,8 @@
         if options['delphes_path']:
             if 'PY6' in self.available_module or 'PY8' in self.available_module:
                 self.available_module.add('Delphes')
+            else:
+                logger.warning("Delphes program installed but no parton shower module detected.\n    Please install pythia8")
         if not MADEVENT or ('mg5_path' in options and options['mg5_path']):
             self.available_module.add('MadSpin')
             if misc.has_f2py() or options['f2py_compiler']:
@@ -658,7 +660,7 @@
             self.switch['detector'] = 'Delphes'
         elif self.get_allowed_detector():
             self.switch['detector'] = 'OFF'
-        else: 
+        else:
             self.switch['detector'] =  'Not Avail.'
                 
 #   old mode to activate pgs            
@@ -850,7 +852,7 @@
         if 'reweight' not in self.available_module:
             self.allowed_reweight = []
             return
-        self.allowed_reweight = ['ON', 'OFF']
+        self.allowed_reweight = ['OFF', 'ON']
         
         # check for plugin mode
         plugin_path = self.mother_interface.plugin_path
@@ -5573,6 +5575,14 @@
                 break
         else:
             self.random = random.randint(1, 30107)
+        
+        #set random seed for python part of the code
+        if self.run_card['python_seed'] == -2: #-2 means same as run_card
+            import random
+            random.seed(self.random)
+        elif self.run_card['python_seed'] >= 0:
+            import random
+            random.seed(self.run_card['python_seed'])
                                                                
         if self.run_card['ickkw'] == 2:
             logger.info('Running with CKKW matching')
@@ -5812,7 +5822,10 @@
         if self.random > 30081*30081: # can't use too big random number
             raise MadGraph5Error,\
                   'Random seed too large ' + str(self.random) + ' > 30081*30081'
-
+        if self.run_card['python_seed'] == -2: 
+            import random
+            random.seed(self.random)
+            
     ############################################################################
     def save_random(self):
         """save random number in appropirate file"""
 
=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2018-04-29 12:51:30 +0000
+++ madgraph/interface/madgraph_interface.py	2018-06-15 08:18:50 +0000
@@ -2782,11 +2782,11 @@
                    'gauge','lorentz', 'brs', 'cms']
     _import_formats = ['model_v4', 'model', 'proc_v4', 'command', 'banner']
     _install_opts = ['Delphes', 'MadAnalysis4', 'ExRootAnalysis',
-                     'update', 'Golem95', 'PJFry', 'QCDLoop', 'maddm']
+                     'update', 'Golem95', 'PJFry', 'QCDLoop', 'maddm', 'maddump']
     
     # The targets below are installed using the HEPToolsInstaller.py script
     _advanced_install_opts = ['pythia8','zlib','boost','lhapdf6','lhapdf5','collier',
-                              'hepmc','mg5amc_py8_interface','ninja','oneloop','MadAnalysis5','MadAnalysis']
+                              'hepmc','mg5amc_py8_interface','ninja','oneloop','MadAnalysis5']
 
     _install_opts.extend(_advanced_install_opts)
 
@@ -5801,7 +5801,7 @@
          # Return true for successful installation
         return True
 
-    install_plugin = ['maddm']
+    install_plugin = ['maddm', 'maddump']
     install_ad = {'pythia-pgs':['arXiv:0603175'],
                           'Delphes':['arXiv:1307.6346'],
                           'Delphes2':['arXiv:0903.2225'],
@@ -5819,7 +5819,9 @@
                           'MadAnalysis':['arXiv:1206.1599'],
                           'collier':['arXiv:1604.06792'],
                           'oneloop':['arXiv:1007.4716'],
-                          'maddm':['arXiv:1505.04190']}
+                          'maddm':['arXiv:1505.04190'],
+                          'maddump':['arXiv:1806.xxxxx']}
+    
     install_server = ['http://madgraph.phys.ucl.ac.be/package_info.dat',
                          'http://madgraph.physics.illinois.edu/package_info.dat']
     install_name = {'td_mac': 'td', 'td_linux':'td', 'Delphes2':'Delphes',
@@ -5869,6 +5871,7 @@
 #            logger.info('{:^80}'.format("-"*70), '$MG:BOLD')
             logger.info("   You are installing '%s', please cite ref(s): \033[92m%s\033[0m. " % (args[0], ', '.join(advertisements[args[0]])), '$MG:BOLD')
 
+        source = None
         # Load file with path of the different program:
         import urllib
         if paths:
@@ -5916,15 +5919,16 @@
 
         if args[0] == 'Delphes':
             args[0] = 'Delphes3'
-        if args[0] == 'MadAnalysis4':
-            args[0] = 'MadAnalysis'
+
 
         try:
             name = self.install_name
             name = name[args[0]]
         except KeyError:
             name = args[0]
-
+        if args[0] == 'MadAnalysis4':
+            args[0] = 'MadAnalysis'
+        
         if args[0] in self._advanced_install_opts:
             # Now launch the advanced installation of the tool args[0]
             # path['HEPToolsInstaller'] is the online adress where to downlaod
@@ -5962,6 +5966,23 @@
         except Exception:
             pass
 
+        if args[0] not in path:
+            if not source:
+                if index ==1:
+                    othersource = 'ucl'
+                else:
+                    othersource = 'uiuc'
+                # try with the mirror
+                misc.sprint('try other mirror', othersource, ' '.join(args))
+                return self.do_install('%s --source=%s' % (' '.join(args), othersource), 
+                                       paths, additional_options) 
+            else:
+                if 'xxx' in advertisements[name][0]:
+                    logger.warning("Program not yet released. Please try later")
+                else:
+                    raise Exception, "Online server are corrupted. No tarball available for %s" % name
+                return
+            
         # Load that path
         logger.info('Downloading %s' % path[args[0]])
         misc.wget(path[args[0]], '%s.tgz' % name, cwd=MG5DIR)
@@ -6127,7 +6148,7 @@
                 ff.close()
                 import stat
                 os.chmod(pjoin(MG5DIR, 'bin', '%s.py' % name), stat.S_IRWXU)
-                logger.info('To use this module, you need to quite MG5aMC and run the executable bin/%s.py' % name)
+                logger.info('To use this module, you need to quit MG5aMC and run the executable bin/%s.py' % name)
             status=0
                 
         elif logger.level <= logging.INFO:
@@ -6193,7 +6214,7 @@
             if sys.platform == "darwin":
                 logger.info('Downloading TD for Mac')
                 target = 'http://madgraph.phys.ucl.ac.be/Downloads/td_mac_intel.tar.gz'
-                misc.wget(target, 'tg.tgz', cwd=pjoin(MG5DIR,'td'))
+                misc.wget(target, 'td.tgz', cwd=pjoin(MG5DIR,'td'))
                 misc.call(['tar', '-xzpvf', 'td.tgz'],
                                                   cwd=pjoin(MG5DIR,'td'))
                 files.mv(MG5DIR + '/td/td_mac_intel',MG5DIR+'/td/td')
@@ -6235,6 +6256,8 @@
             files.cp(pjoin(card_dir,'delphes_card_ATLAS.tcl'),
                      pjoin(MG5DIR,'Template', 'Common', 'Cards', 'delphes_card_ATLAS.dat'))
             
+            if not self.options['pythia-pgs_path'] and not self.options['pythia8_path']:
+                logger.warning("We noticed that no parton-shower module are installed/linked. \n In order to use Delphes from MG5aMC please install/link pythia8.")
 
         #reset the position of the executable
         options_name = {'Delphes': 'delphes_path',
 
=== modified file 'madgraph/interface/reweight_interface.py'
--- madgraph/interface/reweight_interface.py	2018-04-20 08:32:29 +0000
+++ madgraph/interface/reweight_interface.py	2018-06-15 08:18:50 +0000
@@ -467,6 +467,8 @@
         if not self.has_standalone_dir:                           
             if self.rwgt_dir and os.path.exists(pjoin(self.rwgt_dir,'rw_me','rwgt.pkl')):
                 self.load_from_pickle()
+                if opts['rwgt_name']:
+                    self.options['rwgt_name'] = opts['rwgt_name']
                 if not self.rwgt_dir:
                     self.me_dir = self.rwgt_dir
                 self.load_module()       # load the fortran information from the f2py module
 
=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2018-04-24 10:26:54 +0000
+++ madgraph/iolibs/export_v4.py	2018-06-15 08:18:50 +0000
@@ -1952,6 +1952,18 @@
         self.make_model_symbolic_link()
 
     #===========================================================================
+    # write a procdef_mg5 (an equivalent of the MG4 proc_card.dat)
+    #===========================================================================
+    def write_procdef_mg5(self, file_pos, modelname, process_str):
+        """ write an equivalent of the MG4 proc_card in order that all the Madevent
+        Perl script of MadEvent4 are still working properly for pure MG5 run.
+        Not needed for StandAlone so just return
+        """
+        
+        return
+
+
+    #===========================================================================
     # Make the Helas and Model directories for Standalone directory
     #===========================================================================
     def make(self):
@@ -5395,8 +5407,8 @@
         self.params_dep = []   # (name, expression, type)
         self.params_indep = [] # (name, expression, type)
         self.params_ext = []   # external parameter
-        self.p_to_f = parsers.UFOExpressionParserFortran()
-        self.mp_p_to_f = parsers.UFOExpressionParserMPFortran()            
+        self.p_to_f = parsers.UFOExpressionParserFortran(self.model)
+        self.mp_p_to_f = parsers.UFOExpressionParserMPFortran(self.model)            
     
     def pass_parameter_to_case_insensitive(self):
         """modify the parameter if some of them are identical up to the case"""
@@ -6173,7 +6185,8 @@
                 # already handle by default
                 if fct.name not in ["complexconjugate", "re", "im", "sec", 
                        "csc", "asec", "acsc", "theta_function", "cond", 
-                       "condif", "reglogp", "reglogm", "reglog", "recms", "arg", "cot"]:
+                       "condif", "reglogp", "reglogm", "reglog", "recms", "arg", "cot",
+                                    "grreglog","regsqrt"]:
                     additional_fct.append(fct.name)
 
         
@@ -6185,6 +6198,8 @@
           double complex reglogm
           double complex recms
           double complex arg
+          double complex grreglog
+          double complex regsqrt
           %s
           """ % "\n".join(["          double complex %s" % i for i in additional_fct]))
 
@@ -6197,6 +6212,8 @@
           %(complex_mp_format)s mp_reglogm
           %(complex_mp_format)s mp_recms
           %(complex_mp_format)s mp_arg
+          %(complex_mp_format)s mp_grreglog
+          %(complex_mp_format)s mp_regsqrt
           %(additional)s
           """ %\
           {"additional": "\n".join(["          %s mp_%s" % (self.mp_complex_format, i) for i in additional_fct]),
@@ -6285,6 +6302,62 @@
              endif
           endif
           end
+
+          double complex function regsqrt(arg_in)
+          implicit none
+          double complex arg_in
+          double complex arg
+          arg=arg_in
+          if(dabs(dimag(arg)).eq.0.0d0)then
+             arg=dcmplx(dble(arg),0.0d0)
+          endif
+          if(dabs(dble(arg)).eq.0.0d0)then
+             arg=dcmplx(0.0d0,dimag(arg))
+          endif
+          regsqrt=sqrt(arg)
+          end
+
+          double complex function grreglog(logsw,expr1_in,expr2_in)
+          implicit none
+          double complex TWOPII
+          parameter (TWOPII=2.0d0*3.1415926535897932d0*(0.0d0,1.0d0))
+          double complex expr1_in,expr2_in
+          double complex expr1,expr2
+          double precision logsw
+          double precision imagexpr
+          logical firstsheet
+          expr1=expr1_in
+          expr2=expr2_in
+          if(dabs(dimag(expr1)).eq.0.0d0)then
+             expr1=dcmplx(dble(expr1),0.0d0)
+          endif
+          if(dabs(dble(expr1)).eq.0.0d0)then
+             expr1=dcmplx(0.0d0,dimag(expr1))
+          endif
+          if(dabs(dimag(expr2)).eq.0.0d0)then
+             expr2=dcmplx(dble(expr2),0.0d0)
+          endif
+          if(dabs(dble(expr2)).eq.0.0d0)then
+             expr2=dcmplx(0.0d0,dimag(expr2))
+          endif
+          if(expr1.eq.(0.0d0,0.0d0))then
+             grreglog=(0.0d0,0.0d0)
+          else
+             imagexpr=dimag(expr1)*dimag(expr2)
+             firstsheet=imagexpr.ge.0.0d0
+             firstsheet=firstsheet.or.dble(expr1).ge.0.0d0
+             firstsheet=firstsheet.or.dble(expr2).ge.0.0d0
+             if(firstsheet)then
+                grreglog=log(expr1)
+             else
+                if(dimag(expr1).gt.0.0d0)then
+                   grreglog=log(expr1) - logsw*TWOPII
+                else
+                   grreglog=log(expr1) + logsw*TWOPII
+                endif
+             endif
+          endif
+          end
           
           double complex function arg(comnum)
           implicit none
@@ -6375,6 +6448,63 @@
                  endif 
               endif
               end
+
+              %(complex_mp_format)s function mp_regsqrt(arg_in)
+              implicit none
+              %(complex_mp_format)s arg_in
+              %(complex_mp_format)s arg
+              arg=arg_in
+              if(abs(imagpart(arg)).eq.0.0e0_16)then
+                 arg=cmplx(real(arg,kind=16),0.0e0_16)
+              endif
+              if(abs(real(arg,kind=16)).eq.0.0e0_16)then
+                 arg=cmplx(0.0e0_16,imagpart(arg))
+              endif
+              mp_regsqrt=sqrt(arg)
+              end
+
+
+              %(complex_mp_format)s function mp_grreglog(logsw,expr1_in,expr2_in)
+              implicit none
+              %(complex_mp_format)s TWOPII
+              parameter (TWOPII=2.0e0_16*3.14169258478796109557151794433593750e0_16*(0.0e0_16,1.0e0_16))
+              %(complex_mp_format)s expr1_in,expr2_in
+              %(complex_mp_format)s expr1,expr2
+              %(real_mp_format)s logsw
+              %(real_mp_format)s imagexpr
+              logical firstsheet
+              expr1=expr1_in
+              expr2=expr2_in
+              if(abs(imagpart(expr1)).eq.0.0e0_16)then
+                 expr1=cmplx(real(expr1,kind=16),0.0e0_16)
+              endif
+              if(abs(real(expr1,kind=16)).eq.0.0e0_16)then
+                 expr1=cmplx(0.0e0_16,imagpart(expr1))
+              endif
+              if(abs(imagpart(expr2)).eq.0.0e0_16)then
+                 expr2=cmplx(real(expr2,kind=16),0.0e0_16)
+              endif
+              if(abs(real(expr2,kind=16)).eq.0.0e0_16)then
+                 expr2=cmplx(0.0e0_16,imagpart(expr2))
+              endif
+              if(expr1.eq.(0.0e0_16,0.0e0_16))then
+                 mp_grreglog=(0.0e0_16,0.0e0_16)
+              else
+                 imagexpr=imagpart(expr1)*imagpart(expr2)
+                 firstsheet=imagexpr.ge.0.0e0_16
+                 firstsheet=firstsheet.or.real(expr1,kind=16).ge.0.0e0_16
+                 firstsheet=firstsheet.or.real(expr2,kind=16).ge.0.0e0_16
+                 if(firstsheet)then
+                    mp_grreglog=log(expr1)
+                 else
+                    if(imagpart(expr1).gt.0.0e0_16)then
+                       mp_grreglog=log(expr1) - logsw*TWOPII
+                    else
+                       mp_grreglog=log(expr1) + logsw*TWOPII
+                    endif
+                 endif
+              endif
+              end
               
               %(complex_mp_format)s function mp_arg(comnum)
               implicit none
@@ -6386,7 +6516,7 @@
               else
                  mp_arg=log(comnum/abs(comnum))/imm
               endif
-              end"""%{'complex_mp_format':self.mp_complex_format})
+              end"""%{'complex_mp_format':self.mp_complex_format,'real_mp_format':self.mp_real_format})
 
 
         #check for the file functions.f
@@ -6404,7 +6534,8 @@
             for fct in ufo_fct:
                 # already handle by default
                 if fct.name not in ["complexconjugate", "re", "im", "sec", "csc", "asec", "acsc", "condif",
-                                    "theta_function", "cond", "reglog", "reglogp", "reglogm", "recms","arg"]:
+                                    "theta_function", "cond", "reglog", "reglogp", "reglogm", "recms","arg",
+                                    "grreglog","regsqrt"]:
                     ufo_fct_template = """
           double complex function %(name)s(%(args)s)
           implicit none
@@ -6440,7 +6571,8 @@
                 for fct in ufo_fct:
                     # already handle by default
                     if fct.name not in ["complexconjugate", "re", "im", "sec", "csc", "asec", "acsc","condif",
-                                        "theta_function", "cond", "reglog", "reglogp","reglogm", "recms","arg"]:
+                                        "theta_function", "cond", "reglog", "reglogp","reglogm", "recms","arg",
+                                        "grreglog","regsqrt"]:
                         ufo_fct_template = """
           %(complex_mp_format)s function mp_%(name)s(mp__%(args)s)
           implicit none
 
=== modified file 'madgraph/iolibs/file_writers.py'
--- madgraph/iolibs/file_writers.py	2018-01-18 15:06:40 +0000
+++ madgraph/iolibs/file_writers.py	2018-06-15 08:18:50 +0000
@@ -393,11 +393,11 @@
         splitline = line.split('\'')
         i = 0
         while i < len(splitline):
-           if i % 2 == 1:
+            if i % 2 == 1:
                 # This is a quote - check for escaped \'s
                 while  splitline[i] and splitline[i][-1] == '\\':
                     splitline[i] = splitline[i] + '\'' + splitline.pop(i + 1)
-           i = i + 1
+            i = i + 1
         return len(splitline)-1
 
 #===============================================================================
@@ -411,7 +411,7 @@
            fct_names should be a list of functions to remove
         """
 
-        f77_type = ['real*8', 'integer', 'double precision']
+        f77_type = ['real*8', 'integer', 'double precision', 'logical']
         pattern = re.compile('^\s+(?:SUBROUTINE|(?:%(type)s)\s+function)\s+([a-zA-Z]\w*)' \
                              % {'type':'|'.join(f77_type)}, re.I)
         
 
=== modified file 'madgraph/iolibs/files.py'
--- madgraph/iolibs/files.py	2018-03-17 00:04:34 +0000
+++ madgraph/iolibs/files.py	2018-06-15 08:18:50 +0000
@@ -137,6 +137,7 @@
     try:
         shutil.copy(path1, path2)
     except IOError, why:
+        import madgraph.various.misc as misc
         try: 
             if os.path.exists(path2):
                 path2 = os.path.join(path2, os.path.split(path1)[1])
@@ -146,6 +147,8 @@
                 raise
             if log:
                 logger.warning(why)
+            else:
+                misc.sprint("fail to cp", why)
     except shutil.Error:
         # idetical file
         pass
 
=== modified file 'madgraph/iolibs/template_files/matrix_standalone_splitOrders_v4.inc'
--- madgraph/iolibs/template_files/matrix_standalone_splitOrders_v4.inc	2017-07-31 22:08:40 +0000
+++ madgraph/iolibs/template_files/matrix_standalone_splitOrders_v4.inc	2018-06-15 08:18:50 +0000
@@ -109,7 +109,7 @@
 C
       INTEGER NHEL(NEXTERNAL,NCOMB)
 %(helicity_lines)s
-      COMMON/%(proc_prefix)sBORN_HEL_CONFIGS/NHEL
+      COMMON/%(proc_prefix)sPROCESS_NHEL/NHEL
       
       INTEGER USERHEL
 	  DATA USERHEL/-1/	  	  
@@ -357,7 +357,7 @@
 C     GLOBALS
 C
       INTEGER HELC(NEXTERNAL,NCOMB)
-      COMMON/%(proc_prefix)sBORN_HEL_CONFIGS/HELC
+      COMMON/%(proc_prefix)sPROCESS_NHEL/HELC
 
       INTEGER POLARIZATIONS(0:NEXTERNAL,0:5)
       COMMON/%(proc_prefix)sBORN_BEAM_POL/POLARIZATIONS
 
=== modified file 'madgraph/iolibs/template_files/matrix_standalone_v4.inc'
--- madgraph/iolibs/template_files/matrix_standalone_v4.inc	2017-07-31 22:08:40 +0000
+++ madgraph/iolibs/template_files/matrix_standalone_v4.inc	2018-06-15 08:18:50 +0000
@@ -275,7 +275,7 @@
 C     GLOBALS
 C
       INTEGER HELC(NEXTERNAL,NCOMB)
-      COMMON/%(proc_prefix)sBORN_HEL_CONFIGS/HELC
+      COMMON/%(proc_prefix)sPROCESS_NHEL/HELC
 
       INTEGER POLARIZATIONS(0:NEXTERNAL,0:5)
       COMMON/%(proc_prefix)sBORN_BEAM_POL/POLARIZATIONS
 
=== modified file 'madgraph/iolibs/ufo_expression_parsers.py'
--- madgraph/iolibs/ufo_expression_parsers.py	2018-04-24 19:44:41 +0000
+++ madgraph/iolibs/ufo_expression_parsers.py	2018-06-15 08:18:50 +0000
@@ -65,7 +65,7 @@
     # List of tokens and literals
     tokens = (
         'LOGICAL','LOGICALCOMB','POWER', 'CSC', 'SEC', 'ACSC', 'ASEC', 'TAN', 'ATAN',
-        'SQRT', 'CONJ', 'RE', 'RE2', 'IM', 'PI', 'COMPLEX', 'FUNCTION', 'IF','ELSE',
+        'SQRT', 'BUILTIN', 'CONJ', 'RE', 'RE2', 'IM', 'PI', 'COMPLEX', 'FUNCTION', 'IF','ELSE',
         'VARIABLE', 'NUMBER','COND','REGLOG', 'REGLOGP', 'REGLOGM','RECMS','ARG'
         )
     literals = "=+-*/(),"
@@ -129,6 +129,9 @@
     def t_CONJ(self, t):
         r'complexconjugate'
         return t
+    def t_BUILTIN(self, t):
+        r'(?<!\w)abs|bool|float|int|min|max(?=\()'
+        return t
     def t_IM(self, t):
         r'(?<!\w)im(?=\()'
         return t
@@ -200,6 +203,7 @@
         ('right','CONJ'),
         ('right','RE'),
         ('right','IM'),
+        ('right', 'BUILTIN'),
         ('right','FUNCTION'),
         ('right','COMPLEX'),
         ('right','COND'),
@@ -293,6 +297,14 @@
     Fortran-style code."""
 
 
+    builtin_equiv = {'abs': 'ABS',
+                     'bool': 'LOGICAL',
+                     'float': 'REAL',
+                     #'complex': 'COMPLEX', handle separatly
+                     'int': 'INTEGER',
+                     'min': 'MIN',
+                     'max': 'MAX'
+    } 
 
     # The following parser expressions need to be defined for each
     # output language/framework
@@ -305,9 +317,15 @@
                      '<':'.LT.',
                      'or':'.OR.',
                      'and':'.AND.'}
+    
+    types_def = {   bool: lambda v: v ,
+                    int :lambda v: 'INT(%s)' % v ,
+                    float: lambda v: 'DBLE(%s)' % v, 
+                    complex: lambda v: 'DCMPLX(%s)' % v }
 
-    def __init__(self, *args, **opts):
+    def __init__(self, model, *args, **opts):
         """ """
+        self.model = model
         out = super(UFOExpressionParserFortran,self).__init__(*args, **opts)
         self.to_define = set()
         
@@ -321,6 +339,7 @@
 
     def p_expression_number(self, p):
         "expression : NUMBER"
+    
         if p[1].endswith('j'):
             p[0] = ('DCMPLX(0d0, %e)' % float(p[1][:-1])).replace('e', 'd')
         else:
@@ -382,7 +401,8 @@
                       | REGLOGP group
                       | REGLOGM group
                       | TAN group
-                      | ATAN group'''
+                      | ATAN group
+                      | BUILTIN group'''
 
         if p[1] == 'csc': p[0] = '1d0/sin' + p[2]
         elif p[1] == 'sec': p[0] = '1d0/cos' + p[2]
@@ -398,9 +418,96 @@
         elif p[1] == 'reglog': p[0] = 'reglog(DCMPLX' + p[2] +')'
         elif p[1] == 'reglogp': p[0] = 'reglogp(DCMPLX' + p[2] + ')'
         elif p[1] == 'reglogm': p[0] = 'reglogm(DCMPLX' + p[2] + ')'
+        elif p[1] in self.builtin_equiv: p[0] = self.builtin_equiv[p[1]] + p[2]
 
         if p[1] in ['reglog', 'reglogp', 'reglogm']:
             self.to_define.add(p[1])
+            
+    def create_modelfct(self):
+        self.modelfct = dict([(f.name,f) for f in self.model.get('functions')])
+    
+    def p_expression_function1(self, p):
+        "expression : FUNCTION '(' expression ')'"
+        p1 = p[1]
+        re_groups = self.re_cmath_function.match(p1)
+        if re_groups:
+            p1 = re_groups.group("name")
+            p[0] = p1 + '(' + p[3] + ')'
+        else:
+            if not hasattr(self, 'modelfct'):
+                self.create_modelfct()
+            if p1 in self.modelfct:
+                if not hasattr(self.modelfct[p1], 'argstype') or not self.modelfct[p1].argstype:
+                    types = [self.types_def[complex] for _ in self.modelfct[p1].arguments]
+                else:
+                    types = [self.types_def[t] for t in self.modelfct[p1].argstype]
+                    
+                p[0] = p1 + '(' + types[0](p[3]) + ')'
+            else:    
+                p[0] = p1 + '(' + p[3] + ')'
+
+
+    def p_expression_function2(self, p):
+        '''expression : FUNCTION '(' expression ',' expression ')' 
+                      | FUNCTION '(' boolexpression ',' expression ')' '''
+        
+        p1 = p[1]
+        re_groups = self.re_cmath_function.match(p1)
+        if re_groups:
+            p1 = re_groups.group("name")
+            p[0] = p1 + '(' + p[3] + ',' + p[5] + ')'
+        else:
+            if not hasattr(self, 'modelfct'):
+                self.create_modelfct()
+            if p1 in self.modelfct:
+                if not hasattr(self.modelfct[p1], 'argstype') or not self.modelfct[p1].argstype:
+                    p[0] = p1 + '(' + p[3] + ',' + p[5] + ')'
+                else:
+                    types = [self.types_def[t] for t in self.modelfct[p1].argstype]
+                    
+                    p[0] = p1 + '(' + types[0](p[3]) + ',' + types[1](p[5]) + ')'
+            else:
+                p[0] = p1 + '(' + p[3] + ',' + p[5] + ')'
+            
+    def p_expression_function3(self, p):
+        "expression : FUNCTION '(' expression ',' expression ',' expression ')'"
+        p1 = p[1]
+        re_groups = self.re_cmath_function.match(p1)
+        if re_groups:
+            p1 = re_groups.group("name")
+            p[0] = p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ')'
+        else:
+            if not hasattr(self, 'modelfct'):
+                self.create_modelfct()
+            if p1 in self.modelfct:
+                if not hasattr(self.modelfct[p1], 'argstype') or not self.modelfct[p1].argstype:
+                    p[0] = p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ')'
+                else:
+                    types = [self.types_def[t] for t in self.modelfct[p1].argstype]
+                    
+                    p[0] = p1 + '(' + types[0](p[3]) + ',' + types[1](p[5]) + ' , ' + types[2](p[7]) + ')'
+            else:
+                p[0] = p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ')'
+            
+    def p_expression_function4(self, p):
+        "expression : FUNCTION '(' expression ',' expression ',' expression ',' expression ')'"
+        p1 = p[1]
+        re_groups = self.re_cmath_function.match(p1)
+        if re_groups:
+            p1 = re_groups.group("name")
+            p[0] = p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ' , ' + p[9] + ')'
+        else:
+            if not hasattr(self, 'modelfct'):
+                self.create_modelfct()
+            if p1 in self.modelfct:
+                if not hasattr(self.modelfct[p1], 'argstype') or not self.modelfct[p1].argstype:
+                    p[0] = p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ' , ' + p[9] + ')'
+                else:
+                    types = [self.types_def[t] for t in self.modelfct[p1].argstype]
+                    p[0] = p1 + '(' + types[0](p[3]) + ',' + types[1](p[5]) + ' , ' + types[2](p[7]) + ' , ' + types[3](p[9]) + ')'
+                    
+            else:
+                p[0] = p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ' , ' + p[9] + ')'
 
     def p_expression_real(self, p):
         ''' expression : expression RE2 '''
@@ -432,6 +539,19 @@
     Fortran-style code for quadruple precision computation."""
 
     mp_prefix = check_param_card.ParamCard.mp_prefix
+    types_def = {   bool: lambda v: v ,
+                    int :lambda v: 'mp__%s' % v if not v.startswith(('(','mp__','1','2','3','4','5','6','7','8','9','0','-')) else v,
+                    float: lambda v: 'mp__%s' % v if not v.startswith(('(','mp__','1','2','3','4','5','6','7','8','9','0','-')) else v, 
+                    complex: lambda v: 'CMPLX(mp__%s, KIND=16)' % v if not v.startswith(('(','mp__','1','2','3','4','5','6','7','8','9','0','-' )) else 'CMPLX(%s, KIND=16)' % v}
+
+    builtin_equiv = {'abs': lambda v: 'ABS' +v,
+                     'bool': lambda v: 'LOGICAL' +v ,
+                     'float': lambda v: 'REAL(' +v+", KIND=16)",
+                     'complex': lambda v: 'COMPLEX(' +v+", KIND=16)",
+                     'int': lambda v: 'INTEGER' +v ,
+                     'min': lambda v: 'MIN' +v ,
+                     'max': lambda v: 'MAX' +v 
+    } 
 
     # The following parser expressions need to be defined for each
     # output language/framework
@@ -462,6 +582,92 @@
         except Exception:
             p[0] = p[1] + "**" + p[3]
 
+    def p_expression_function1(self, p):
+        "expression : FUNCTION '(' expression ')'"
+        p1 = p[1]
+        re_groups = self.re_cmath_function.match(p1)
+        if re_groups:
+            p1 = re_groups.group("name")
+            p[0] = p1 + '(' + p[3] + ')'
+        else:
+            if not hasattr(self, 'modelfct'):
+                self.create_modelfct()
+            if p1 in self.modelfct:
+                if not hasattr(self.modelfct[p1], 'argstype') or not self.modelfct[p1].argstype:
+                    types = [self.types_def[complex] for _ in self.modelfct[p1].arguments]
+                else:
+                    types = [self.types_def[t] for t in self.modelfct[p1].argstype]
+                    
+                p[0] = 'MP_' + p1 + '(' + types[0](p[3]) + ')'
+            else:    
+                p[0] = 'MP_' + p1 + '(' + p[3] + ')'
+
+
+    def p_expression_function2(self, p):
+        '''expression : FUNCTION '(' expression ',' expression ')' 
+                      | FUNCTION '(' boolexpression ',' expression ')' '''
+        
+        p1 = p[1]
+        re_groups = self.re_cmath_function.match(p1)
+        if re_groups:
+            p1 = re_groups.group("name")
+            p[0] = p1 + '(' + p[3] + ',' + p[5] + ')'
+        else:
+            if not hasattr(self, 'modelfct'):
+                self.create_modelfct()
+            if p1 in self.modelfct:
+                if not hasattr(self.modelfct[p1], 'argstype') or not self.modelfct[p1].argstype:
+                    p[0] = p1 + '(' + p[3] + ',' + p[5] + ')'
+                else:
+                    types = [self.types_def[t] for t in self.modelfct[p1].argstype]
+                    
+                    p[0] = 'MP_' + p1 + '(' + types[0](p[3]) + ',' + types[1](p[5]) + ')'
+            else:
+                p[0] = 'MP_' + p1 + '(' + p[3] + ',' + p[5] + ')'
+            
+    def p_expression_function3(self, p):
+        "expression : FUNCTION '(' expression ',' expression ',' expression ')'"
+        p1 = p[1]
+        re_groups = self.re_cmath_function.match(p1)
+        if re_groups:
+            p1 = re_groups.group("name")
+            p[0] = p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ')'
+        else:
+            if not hasattr(self, 'modelfct'):
+                self.create_modelfct()
+            if p1 in self.modelfct:
+                if not hasattr(self.modelfct[p1], 'argstype') or not self.modelfct[p1].argstype:
+                    p[0] = 'MP_' + p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ')'
+                else:
+                    types = [self.types_def[t] for t in self.modelfct[p1].argstype]
+                    
+                    p[0] = 'MP_' + p1 + '(' + types[0](p[3]) + ',' + types[1](p[5]) + ' , ' + types[2](p[7]) + ')'
+            else:
+                p[0] = 'MP_' + p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ')'
+            
+    def p_expression_function4(self, p):
+        "expression : FUNCTION '(' expression ',' expression ',' expression ',' expression ')'"
+        p1 = p[1]
+        re_groups = self.re_cmath_function.match(p1)
+        if re_groups:
+            p1 = re_groups.group("name")
+            p[0] = p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ' , ' + p[9] + ')'
+        else:
+            if not hasattr(self, 'modelfct'):
+                self.create_modelfct()
+            if p1 in self.modelfct:
+                if not hasattr(self.modelfct[p1], 'argstype') or not self.modelfct[p1].argstype:
+                    p[0] = 'MP_' + p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ' , ' + p[9] + ')'
+                else:
+                    types = [self.types_def[t] for t in self.modelfct[p1].argstype]
+                    misc.sprint(types)
+                    p[0] = 'MP_' + p1 + '(' + types[0](p[3]) + ',' + types[1](p[5]) + ' , ' + types[2](p[7]) + ' , ' + types[3](p[9]) + ')'
+                    
+            else:
+                p[0] = 'MP_' + p1 + '(' + p[3] + ',' + p[5] + ' , ' + p[7] + ' , ' + p[9] + ')'
+
+
+
     def p_expression_if(self,p):
         "expression :   expression IF boolexpression ELSE expression "
         p[0] = 'MP_CONDIF(%s,CMPLX(%s,KIND=16),CMPLX(%s,KIND=16))' % (p[3], p[1], p[5])
@@ -502,7 +708,8 @@
                       | REGLOGP group
                       | REGLOGM group
                       | TAN group
-                      | ATAN group'''
+                      | ATAN group
+                      | BUILTIN group'''
         
         if p[1] == 'csc': p[0] = '1e0_16/cos' + p[2]
         elif p[1] == 'sec': p[0] = '1e0_16/sin' + p[2]
@@ -518,6 +725,7 @@
         elif p[1] == 'reglog': p[0] = 'mp_reglog(CMPLX(' + p[2] +',KIND=16))'
         elif p[1] == 'reglogp': p[0] = 'mp_reglogp(CMPLX(' + p[2] + ',KIND=16))'
         elif p[1] == 'reglogm': p[0] = 'mp_reglogm(CMPLX(' + p[2] + ',KIND=16))'
+        elif p[1] in self.builtin_equiv: p[0] = self.builtin_equiv[p[1]](p[2])
 
         if p[1] in ['reglog', 'reglogp', 'reglogm']:
             self.to_define.add(p[1])
@@ -557,6 +765,15 @@
                      '<':'<',
                      'or':'||',
                      'and':'&&'}
+    
+    builtin_equiv = {'abs': 'ABS',
+                     'bool': 'bool',
+                     'float': 'float',
+                     #'complex': 'COMPLEX', handle separatly
+                     'int': 'int',
+                     'min': 'min',
+                     'max': 'max'
+    } 
 
     # The following parser expressions need to be defined for each
     # output language/framework
@@ -634,7 +851,8 @@
                       | CONJ group
                       | REGLOG group 
                       | REGLOGP group
-                      | REGLOGM group'''
+                      | REGLOGM group
+                      | BUILTIN group '''
         if p[1] == 'csc': p[0] = '1./cos' + p[2]
         elif p[1] == 'sec': p[0] = '1./sin' + p[2]
         elif p[1] == 'acsc': p[0] = 'asin(1./' + p[2] + ')'
@@ -649,6 +867,8 @@
         elif p[1] == 'reglog': p[0] = 'reglog' + p[2]
         elif p[1] == 'reglogp': p[0] = 'reglogp' + p[2]
         elif p[1] == 'reglogm': p[0] = 'reglogm' + p[2]
+        elif p[1] in self.buitin_equiv: p[0] = self.builtin_equiv[p[1]] + p[2]
+        
 
     def p_expression_real(self, p):
         ''' expression : expression RE2 '''
@@ -682,6 +902,15 @@
                      '<':'<',
                      'or':' or ',
                      'and':' and '}
+    
+    builtin_equiv = {'abs': 'abs',
+                     'bool': 'bool',
+                     'float': 'float',
+                     #'complex': 'COMPLEX', handle separatly
+                     'int': 'int',
+                     'min': 'min',
+                     'max': 'max'
+    } 
 
     def __init__(self, *args,**kw):
         """Initialize the lex and yacc"""
@@ -790,7 +1019,8 @@
                       | CONJ group
                       | REGLOG group
                       | REGLOGP group
-                      | REGLOGM group'''
+                      | REGLOGM group
+                      | BUILTIN group'''
         if p[1] == 'csc': p[0] = 'csc' + p[2]
         elif p[1] == 'sec': p[0] = 'sec' + p[2]
         elif p[1] == 'acsc': p[0] = 'acsc' + p[2]
@@ -805,6 +1035,7 @@
         elif p[1] == 'reglog': p[0] = 'reglog' + p[2]
         elif p[1] == 'reglogp': p[0] = 'reglogp' + p[2]
         elif p[1] == 'reglogm': p[0] = 'reglogm' + p[2]
+        elif p[1] in self.builtin_equiv: p[0] = self.builtin_equiv[p[1]] + p[2]
 
     def p_expression_real(self, p):
         ''' expression : expression RE2 '''
 
=== modified file 'madgraph/loop/loop_exporters.py'
--- madgraph/loop/loop_exporters.py	2018-04-27 10:54:08 +0000
+++ madgraph/loop/loop_exporters.py	2018-06-15 08:18:50 +0000
@@ -411,6 +411,9 @@
             shutil.copy(os.path.join(self.loop_dir,'StandAlone/', file),
                         os.path.join(self.dir_path, file))
 
+        cp(pjoin(self.loop_dir,'StandAlone/Cards/MadLoopParams.dat'),
+           pjoin(self.dir_path, 'Cards/MadLoopParams_default.dat'))
+
         ln(pjoin(self.dir_path, 'Cards','MadLoopParams.dat'), pjoin(self.dir_path,'SubProcesses'))
 
         # We might need to give a different name to the MadLoop makefile
@@ -3041,7 +3044,18 @@
         context['MadEventOutput'] = True
         return context
         
-    
+    #===========================================================================
+    # write a procdef_mg5 (an equivalent of the MG4 proc_card.dat)
+    #===========================================================================
+    def write_procdef_mg5(self, file_pos, modelname, process_str):
+        """ write an equivalent of the MG4 proc_card in order that all the Madevent
+        Perl script of MadEvent4 are still working properly for pure MG5 run.
+        Not needed for StandAlone so we need to call the correct one 
+        """
+        
+        return export_v4.ProcessExporterFortranMEGroup.write_procdef_mg5(
+            self, file_pos, modelname, process_str)
+
     def get_source_libraries_list(self):
         """ Returns the list of libraries to be compiling when compiling the
         SOURCE directory. It is different for loop_induced processes and 
 
=== modified file 'madgraph/loop/loop_helas_objects.py'
--- madgraph/loop/loop_helas_objects.py	2017-07-13 10:33:37 +0000
+++ madgraph/loop/loop_helas_objects.py	2018-06-15 08:18:50 +0000
@@ -22,6 +22,7 @@
 import logging
 import itertools
 import math
+import os
 
 import aloha
 import aloha.create_aloha as create_aloha
@@ -2316,11 +2317,10 @@
         already created and can be specified here instead of being generated.
         This can make a difference for very complicated models."""
         
-        
-        if alohaModel is None:
+        if not alohaModel:# is None:
             # Generate it here
             model = self.get('processes')[0].get('model')
-            myAlohaModel = create_aloha.AbstractALOHAModel(model.get('name'))
+            myAlohaModel = create_aloha.AbstractALOHAModel(os.path.basename(model.get('modelpath')))
             myAlohaModel.add_Lorentz_object(model.get('lorentz'))
         else:
             # Use the one provided
 
=== modified file 'madgraph/madevent/gen_crossxhtml.py'
--- madgraph/madevent/gen_crossxhtml.py	2018-04-26 14:24:04 +0000
+++ madgraph/madevent/gen_crossxhtml.py	2018-06-15 08:18:50 +0000
@@ -394,7 +394,7 @@
     
     def output(self):
         """ write the output file """
-        
+            
         # 1) Create the text for the status directory        
         if self.status and self.current:
             if isinstance(self.status, str):
@@ -1319,10 +1319,14 @@
     def get_nb_line(self):
         
         nb_line = 0
+        self.nb_line = nb_line
         for key in ['parton', 'reweight', 'pythia', 'pythia8', 'pgs', 
                     'delphes', 'shower', 'madanalysis5_hadron']:
             if len(getattr(self, key)):
                 nb_line += 1
+        if nb_line ==0 and not os.path.exists(pjoin(self.me_dir, "Events", self["run_name"], "%(run)s_%(tag)s_banner.txt)" % \
+                                    {"run":self["run_name"], 'tag': self["tag"]})):
+            return 0
         return max([nb_line,1])
     
     
@@ -1344,6 +1348,13 @@
         <td> %(links)s</td>
         <td> %(action)s</td>
         </tr>"""
+        sub_part_template_parton_no_results = """
+        <td rowspan=%(cross_span)s><center><a> %(cross).4g <font face=symbol>&#177;</font> %(err).2g %(bias)s</a> %(syst)s </center></td>
+        <td rowspan=%(cross_span)s><center> %(nb_event)s<center></td><td> %(type)s </td>
+        <td> %(links)s</td>
+        <td> %(action)s</td>
+        </tr>"""
+
 
         sub_part_template_py8 = """
         <td rowspan=%(cross_span)s><center><a href="./Events/%(run)s/%(tag)s_merged_xsecs.txt"> merged xsection</a> %(syst)s </center></td>
@@ -1373,6 +1384,8 @@
         
         # Compute the HTMl output for subpart
         nb_line = self.get_nb_line()
+        if nb_line == 0:
+            return ""
         # Check that cross/nb_event/error are define
         if self.pythia and not self['nb_event']:
             try:
@@ -1429,7 +1442,10 @@
                 elif ttype=='pythia8' and self['cross_pythia'] == -1:
                     template = sub_part_template_py8
                 else:
-                    template = sub_part_template_parton
+                    if os.path.exists(pjoin(self.me_dir,'HTML', self['run_name'],'results.html')):
+                        template = sub_part_template_parton
+                    else:
+                        template = sub_part_template_parton_no_results
                 first = ttype
                 if ttype=='parton' and self['cross_pythia']:
                     local_dico['cross_span'] = 1
 
=== modified file 'madgraph/madevent/sum_html.py'
--- madgraph/madevent/sum_html.py	2018-04-26 14:41:07 +0000
+++ madgraph/madevent/sum_html.py	2018-06-15 08:18:50 +0000
@@ -575,6 +575,12 @@
                     mod_link = '../../SubProcesses/%(P)s/%(G)s/log.txt' % \
                                             {'P': os.path.basename(self.name),
                                              'G': oneresult.name}
+                    if not os.path.exists(link) and not os.path.exists(mod_link):
+                        P = os.path.basename(self.name)
+                        base = pjoin(me_dir, 'SubProcesses', P, os.path.dirname(link))
+                        pos = [pjoin(base,c) for c in os.listdir(base) if c.endswith('.log')]
+                        if len(pos) == 1:
+                            link = pos[0]
             else:
                 link = '#%s' % oneresult.name
                 mod_link = link
 
=== modified file 'madgraph/various/banner.py'
--- madgraph/various/banner.py	2018-04-26 09:15:05 +0000
+++ madgraph/various/banner.py	2018-06-15 08:18:50 +0000
@@ -188,7 +188,6 @@
         """return the cross-section of the file"""
 
         if "init" not in self:
-            misc.sprint(self.keys())
             raise Exception
         
         text = self["init"].split('\n')
@@ -339,6 +338,12 @@
 #        assert "all" in cross
         assert "init" in self
         
+        cross = dict(cross)
+        for key in cross.keys():
+            if isinstance(key, str) and key.isdigit() and int(key) not in cross:
+                cross[int(key)] = cross[key]
+        
+        
         all_lines = self["init"].split('\n')
         new_data = []
         new_data.append(all_lines[0])
@@ -353,7 +358,10 @@
             if int(pid) not in cross:
                 raise Exception
             pid = int(pid)
-            ratio = cross[pid]/float(xsec)
+            if float(xsec):
+                ratio = cross[pid]/float(xsec)
+            else:
+                ratio = 0
             line = "   %+13.7e %+13.7e %+13.7e %i" % \
                 (float(cross[pid]), ratio* float(xerr), ratio*float(xmax), pid)
             new_data.append(line)
@@ -1003,17 +1011,23 @@
         
         return log(text)
 
+    def post_set(self, name, value, change_userdefine, raiseerror):
+        
+        if value is None:
+            value = self[name]
+
+        if hasattr(self, 'post_set_%s' % name):
+            return getattr(self, 'post_set_%s' % name)(value, change_userdefine, raiseerror)
     
     def __setitem__(self, name, value, change_userdefine=False,raiseerror=False):
         """set the attribute and set correctly the type if the value is a string.
            change_userdefine on True if we have to add the parameter in user_set
         """
-                        
+                       
         if  not len(self):
             #Should never happen but when deepcopy/pickle
             self.__init__()
-        
-        
+                
         name = name.strip()
         lower_name = name.lower() 
 
@@ -1031,13 +1045,17 @@
                 if lower_name in self.user_set:
                     self.user_set.remove(lower_name)
                 #keep old value.
+                self.post_set(lower_name, 'auto', change_userdefine, raiseerror)
                 return 
             elif lower_name in self.auto_set:
                 self.auto_set.remove(lower_name)
             
         # 2. Find the type of the attribute that we want
         if lower_name in self.list_parameter:
-            targettype = self.list_parameter[lower_name] 
+            targettype = self.list_parameter[lower_name]
+            
+            
+            
             if isinstance(value, str):
                 # split for each comma/space
                 value = value.strip()
@@ -1058,8 +1076,6 @@
                         i+=2
                     new_value += current
  
-                            
-                           
                 value = new_value                           
                 
             elif not hasattr(value, '__iter__'):
@@ -1111,7 +1127,8 @@
             dict.__setitem__(self, lower_name, values) 
             if change_userdefine:
                 self.user_set.add(lower_name)
-            return  
+            #check for specific action
+            return self.post_set(lower_name, None, change_userdefine, raiseerror) 
         elif lower_name in self.dict_parameter:
             targettype = self.dict_parameter[lower_name] 
             full_reset = True #check if we just update the current dict or not
@@ -1161,7 +1178,7 @@
                 raise Exception, '%s should be of dict type'% lower_name
             if change_userdefine:
                 self.user_set.add(lower_name)
-            return
+            return self.post_set(lower_name, None, change_userdefine, raiseerror)
         elif name in self:            
             targettype = type(self[name])
         else:
@@ -1175,7 +1192,7 @@
             self.lower_to_case[lower_name] = name
             if change_userdefine:
                 self.user_set.add(lower_name)
-            return
+            return self.post_set(lower_name, None, change_userdefine, raiseerror)
     
         value = self.format_variable(value, targettype, name=name)
         #check that the value is allowed:
@@ -1206,6 +1223,7 @@
         dict.__setitem__(self, lower_name, value)
         if change_userdefine:
             self.user_set.add(lower_name)
+        self.post_set(lower_name, None, change_userdefine, raiseerror)
 
 
     def add_param(self, name, value, system=False, comment=False, typelist=None,
@@ -2368,7 +2386,10 @@
                     name = nline[1].strip().lower()
                     value = self[name]
                     if name in self.list_parameter:
-                        value = ', '.join([str(v) for v in value])
+                        if self.list_parameter[name] != str:
+                            value = ', '.join([str(v) for v in value])
+                        else:
+                            value =  "['%s']" % "', '".join(str(v) for v in value)
                     if python_template:
                         text += line % {nline[1].strip():value, name:value}
                         written.add(name)
@@ -2732,6 +2753,7 @@
         self.add_param("time_of_flight", -1.0, include=False)
         self.add_param("nevents", 10000)        
         self.add_param("iseed", 0)
+        self.add_param("python_seed", -1, include=False, hidden=True, comment="controlling python seed [handling in particular the final unweighting].\n -1 means use default from random module.\n -2 means set to same value as iseed")
         self.add_param("lpp1", 1, fortran_name="lpp(1)", allowed=[-1,1,0,2,3,9, -2,-3],
                         comment='first beam energy distribution:\n 0: fixed energy\n 1: PDF from proton\n -1: PDF from anti-proton\n 2:photon from proton, 3:photon from electron, 9: PLUGIN MODE')
         self.add_param("lpp2", 1, fortran_name="lpp(2)", allowed=[-1,1,0,2,3,9],
 
=== added file 'madgraph/various/hepmc_parser.py'
--- madgraph/various/hepmc_parser.py	1970-01-01 00:00:00 +0000
+++ madgraph/various/hepmc_parser.py	2018-06-15 08:18:50 +0000
@@ -0,0 +1,342 @@
+from __future__ import division
+
+import gzip
+
+if '__main__' == __name__:
+    import sys
+    sys.path.append('../../')
+import misc
+import os
+import logging
+
+class HEPMC_Particle(object):
+    
+    def __init__(self, text=None, event=None):
+        
+        self.barcode = 0
+        self.pdg = 0
+        self.px =  0
+        self.py = 0
+        self.pz = 0
+        self.E = 0
+        self.mass = 0
+        self.status = 0
+        self.polarization_theta = 0
+        self.polarization_phi = 0
+        self.vertex_barcode = 0 #vertex on which this particle is incoming
+        self.nb_flow_list = 0
+        self.flows = []
+        
+        if text:
+            self.parse(text, event)
+    
+    @property
+    def pdg_code(self):
+        return self.pdg
+    
+    pid = pdg_code
+
+    @property
+    def helicity(self):
+        return 9
+    
+    def parse(self,line=None, event=None):
+        """ P 3 -2 0 0 3.0332529367341937e+01 3.0332529367341937e+01 0 21 0 0 -3 1 2 501"""
+
+        data = line.split()
+        
+        self.barcode = int(data[1]) # 3
+        self.pdg = int(data[2])     #-2
+        self.px =  float(data[3])   #0
+        self.py = float(data[4])    #0
+        self.pz = float(data[5])    #30.3
+        self.E = float(data[6])     # 30.3
+        self.mass = float(data[7])  # 0
+        self.status = int(data[8])  # 21
+        self.polarization_theta = float(data[9]) #0
+        self.polarization_phi = float(data[10]) #0
+        self.vertex_barcode = float(data[11]) #-3 vertex on which this particle is incoming
+        self.nb_flow_list = int(data[12]) # 1
+        self.flows = [(int(data[13+2*i]),int(data[13+2*i+1])) 
+                                      for i in range(self.nb_flow_list)] # 2 501
+        
+        if event:
+            event.curr_vertex.add_outcoming(self)
+        
+    def __str__(self):
+        """P 3 -2 0 0 3.0332529367341937e+01 3.0332529367341937e+01 0 21 0 0 -3 1 2 501"""
+        
+        start = """P %i %i %17.16e %17.16e %17.16e %17.16e %17.16e %i %17.16e %17.16e %i %i %s\n""" %\
+         (self.barcode, self.pdg, self.px, self.py, self.pz, self.E, self.mass,
+          self.status, self.polarization_theta, self.polarization_phi, 
+          self.vertex_barcode, self.nb_flow_list, ' '.join("%i %i" % f for f in self.flows))
+
+        
+        return start.replace("%17.16e" % 0, '0')
+        
+
+     
+        
+class HEPMC_Vertex(object):
+
+    def __init__(self, text=None, event=None):
+
+        self.barcode = 0
+        self.id = 0
+        self.x = 0
+        self.y = 0
+        self.z = 0
+        self.ctau = 0
+        self.nb_orphan = 0
+        self.nb_outgoing = 0
+        self.nb_weight = 0
+        self.weights = [] 
+        self.incoming = []
+        self.outcoming = []
+        
+
+        if text:
+            self.parse(text,event)
+
+    def parse(self, line, event=None):
+        """V -8 0 0 0 0 0 0 2 0"""
+        
+        data = line.split()
+        self.barcode = int(data[1])
+        self.id = float(data[2])
+        self.x = float(data[3])
+        self.y = float(data[4])
+        self.z = float(data[5])
+        self.ctau = float(data[6])
+        self.nb_orphan = int(data[7])
+        self.nb_outgoing = int(data[8])
+        self.nb_weight = int(data[9])
+        self.weights = [float(data[10+i]) for i in range(self.nb_weight)]  
+        if event:
+            event.vertex[self.barcode] = self      
+
+    def add_incoming(self, particle):
+        self.incoming.append(particle)
+        
+    def add_outcoming(self, particle):
+        self.outcoming.append(particle)
+
+class HEPMC_Event(object):
+
+    def __init__(self, text=None):
+        """The initialization of an empty Event (or one associate to a text file)"""
+        #
+        self.particles = {} #barcode to object
+        self.vertex = {}    #barcode to object
+
+        # First line information (E line)
+        self.event_id = 0
+        self.nb_interaction = 0
+        self.scale = 0.
+        self.alphas = 0.
+        self.alphaew = 0.
+        self.process_id = 0
+        self.barcode_vertex =0
+        self.nb_vertex = 0
+        self.barcode_beam1 = 0
+        self.barcode_beam2 = 0
+        self.nb_random_state = 0
+        self.randoms = []
+        self.nb_weight = 0
+        self.weights = []
+
+        # not parse container (so far)
+        self.N = ''
+        self.U = ''
+        self.C = ''
+        self.H = ''
+        self.F = ''
+
+        if text:
+            self.parse(text)
+
+    @property
+    def wgt(self):
+        if self.weights:
+            return self.weights[0]
+        else:
+            return 0.
+    @wgt.setter
+    def wgt(self, value):
+        self.nb_weight = 1
+        self.weights = [value]
+    
+    
+    def parse(self, text):
+
+        for line in text.split('\n'):
+            if not line:
+                continue
+            if line[0] == 'P':
+                P = HEPMC_Particle(line, self)
+                self.add_particle(P)
+            elif line[0] == 'V':
+                V = HEPMC_Vertex(line, self)
+                self.curr_vertex = V
+                self.add_vertex(V)
+            elif line[0] in ['E', 'N', 'U', 'H','F','C']:
+                getattr(self, 'parse_%s' % line[0])(line)
+            else:
+                self.comment = '%s%s\n' % (self.comment,line) 
+        
+        # add the information about incoming particle
+        for particle in self:
+            try:
+                self.vertex[particle.vertex_barcode].add_incoming(particle)
+            except KeyError:
+                if particle.vertex_barcode == 0:
+                    continue
+                raise
+
+    def parse_E(self,line):
+        """E 249 -1 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 0 0 462 1 2 0 1 8.2247251000000005e-22"""
+
+        data = line.split()
+        self.event_id = int(data[1])
+        self.nb_interaction = int(data[2])
+        self.scale = float(data[3])
+        self.alphas = float(data[4])
+        self.alphaew = float(data[5])
+        self.process_id = int(data[6])
+        self.barcode_vertex= int(data[7])
+        self.nb_vertex = int(data[8])
+        self.barcode_beam1 = int(data[9])
+        self.barcode_beam2 = int(data[10])
+        self.nb_random_state = int(data[11])
+        self.randoms = [float(data[12+i]) for i in range(self.nb_random_state)]
+        self.nb_weight =  int(data[12+self.nb_random_state])
+        self.weights = [float(data[13+self.nb_random_state+i]) 
+                          for i in range(self.nb_weight)]      
+
+    def parse_N(self,line):
+        """just keep the information so far"""
+        self.N = '%s\n' % line
+    def parse_U(self,line):
+        self.U = '%s\n' % line
+    def parse_H(self,line):
+        self.H = '%s\n' % line
+    def parse_F(self,line):
+        self.F = '%s\n' %  line
+    def parse_C(self,line):
+        self.C = '%s\n' % line
+
+    def __iter__(self):
+        return self.particles.values().__iter__()
+    
+    #def __next__(self):
+    #    
+    #    self.particles.__next__()
+        
+    def add_vertex(self, V):
+        self.vertex[V.barcode] = V
+        
+    def add_particle(self, P):
+        self.particles[P.barcode] = P
+
+class HEPMC_EventFile(object):
+    
+    def __new__(self, path, mode='r', *args, **opt):
+
+        if not path.endswith(".gz"):
+            return file.__new__(HEPMC_EventFileNoGzip, path, mode, *args, **opt)
+        elif mode == 'r' and not os.path.exists(path) and os.path.exists(path[:-3]):
+            return HEPMC_EventFile.__new__(HEPMC_EventFileNoGzip, path[:-3], mode, *args, **opt)
+        else:
+            try:
+                return gzip.GzipFile.__new__(HEPMC_EventFileGzip, path, mode, *args, **opt)
+            except IOError, error:
+                raise
+            except Exception, error:
+                if mode == 'r':
+                    misc.gunzip(path)
+                return file.__new__(HEPMC_EventFileNoGzip, path[:-3], mode, *args, **opt)  
+  
+    
+    def __init__(self, path, mode='r', *args, **opt):
+        """open file and read the banner [if in read mode]"""
+
+        self.to_zip = False
+        if path.endswith('.gz') and mode == 'w' and\
+                                              isinstance(self, HEPMC_EventFileNoGzip):
+            path = path[:-3]
+            self.to_zip = True # force to zip the file at close() with misc.gzip
+        
+        self.parsing = True # check if/when we need to parse the event.
+        self.eventgroup  = False
+        try:
+            super(HEPMC_EventFile, self).__init__(path, mode, *args, **opt)
+        except IOError:
+            if '.gz' in path and isinstance(self, HEPMC_EventFileNoGzip) and\
+                mode == 'r' and os.path.exists(path[:-3]):
+                super(HEPMC_EventFile, self).__init__(path[:-3], mode, *args, **opt)
+            else:
+                raise
+
+        self.header = ''
+        if mode == 'r':
+            line = ''
+            while 'HepMC::IO_GenEvent-START_EVENT_LISTING' not in line:
+
+                try:
+                    line  = super(HEPMC_EventFile, self).next()
+                except StopIteration:
+                    self.seek(0)
+                    self.header = ''
+                    break 
+                self.header += line
+        self.start_event = ''
+
+    def seek(self, value):
+        self.start_event = ""
+        super(HEPMC_EventFile, self).seek(value)
+        
+    def next(self):
+        """get next event"""
+        text = self.start_event
+        line = ''
+        while 1:
+            line = super(HEPMC_EventFile, self).next()
+            if line.startswith('E'):
+                self.start_event = line
+                if text:
+                    return HEPMC_Event(text)
+                else:
+                    text += line
+                    
+            elif line.lstrip().startswith('HepMC::IO_GenEvent-END_EVENT_LISTING'):
+                if text:
+                    return HEPMC_Event(text)
+            elif line.lstrip().startswith('HepMC::IO_GenEvent-START_EVENT_LISTING'):
+                text = ''
+            else:
+                text += line
+
+
+class HEPMC_EventFileGzip(HEPMC_EventFile, gzip.GzipFile):
+    """A way to read/write a gzipped lhef event"""
+        
+class HEPMC_EventFileNoGzip(HEPMC_EventFile, file):
+    """A way to read a standard event file"""
+    
+    def close(self,*args, **opts):
+        
+        out = super(EventFileNoGzip, self).close(*args, **opts)
+        if self.to_zip:
+            misc.gzip(self.name)
+    
+    
+if "__main__" == __name__:
+    path = "/Users/omatt/Documents/eclipse/2.3.3_PY8_install_cmd/PROC_sm_24/Events/run_01/tag_1_pythia8_events.hepmc.gz"
+    evts = HEPMC_EventFile(path)
+    nb_event = 0
+    nb_p = 0
+    for event in evts:
+        nb_event +=1
+        for p in event:
+             nb_p+=1
+    print nb_event, nb_p
 
=== modified file 'madgraph/various/lhe_parser.py'
--- madgraph/various/lhe_parser.py	2018-03-09 15:44:05 +0000
+++ madgraph/various/lhe_parser.py	2018-06-15 08:18:50 +0000
@@ -52,7 +52,28 @@
             if event:
                 self.event = event
             return
-        
+        else:
+            try:
+                import madgraph.various.hepmc_parser as hepmc_parser
+            except Exception:
+                pass
+            else:
+                if isinstance(line, hepmc_parser.HEPMC_Particle):
+                    self.event = event
+                    self.event_id = len(event) #not yet in the event
+                    for key in ['pid', 'status', 'E','px','py','pz','mass']:
+                        setattr(self, key, getattr(line, key))
+                    self.mother1 = 1
+                    self.mother2 = 1
+                    self.color1 = 0
+                    self.color2 = 0
+                    self.vtim = 0
+                    self.comment = ''
+                    self.helicity = 9
+                    self.rwgt = 0
+                    return
+
+                
         self.event = event
         self.event_id = len(event) #not yet in the event
         # LHE information
@@ -154,6 +175,7 @@
 class EventFile(object):
     """A class to allow to read both gzip and not gzip file"""
     
+    allow_empty_event = False
 
     def __new__(self, path, mode='r', *args, **opt):
         
@@ -261,7 +283,7 @@
                     text += line
             if self.parsing:
                 out = Event(text)
-                if len(out) == 0:
+                if len(out) == 0  and not self.allow_empty_event:
                     raise Exception
                 return out
             else:
@@ -1246,6 +1268,27 @@
         self.assign_mother()
         
     def assign_mother(self):
+        """convert the number in actual particle"""
+        #Security if not incoming particle. Define a fake particle and set all particle as 
+        # decaying from that fake particle
+        if all(p.status != -1 for p in self):
+            if self.warning_order:
+                Event.warning_order = False
+                logger.warning("Weird format for lhe format: no incoming particle... adding a fake one")
+            
+            mother = Particle(event=self)
+            mother.status = -1
+            mother.pid = 0
+            self.insert(0,mother)
+            mother.color2 = 0
+            mother.event_id = 0
+            self.nexternal += 1
+            for p in self[1:]:
+                p.mother1 = 1
+                p.mother2 = 1
+                p.event_id += 1
+            
+        
         # assign the mother:
         for i,particle in enumerate(self):
             if i < particle.mother1 or i < particle.mother2:
@@ -2055,7 +2098,7 @@
                
     def __str__(self, event_id=''):
         """return a correctly formatted LHE event"""
-                
+        
         out="""<event%(event_flag)s>
 %(scale)s
 %(particles)s
@@ -2072,11 +2115,9 @@
         else:
             event_flag = ''
 
-        if self.nexternal:
-            scale_str = "%2d %6d %+13.7e %14.8e %14.8e %14.8e" % \
+        scale_str = "%2d %6d %+13.7e %14.8e %14.8e %14.8e" % \
             (self.nexternal,self.ievent,self.wgt,self.scale,self.aqed,self.aqcd)
-        else:
-            scale_str = ''
+
             
         if self.reweight_data:
             # check that all key have an order if not add them at the end
@@ -2367,6 +2408,12 @@
         """ return |\vec p|^2 """
         return self.px**2 + self.py**2 + self.pz**2
     
+    @property
+    def theta(self):                                                                                                  
+        """return the mass square""" 
+        import math  
+        return math.atan(math.sqrt((self.px**2+self.py**2)/self.pz**2))
+    
     
     def __add__(self, obj):
         
 
=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2018-04-29 07:57:44 +0000
+++ madgraph/various/misc.py	2018-06-15 08:18:50 +0000
@@ -1082,7 +1082,8 @@
         return self.path
     
 class TMP_variable(object):
-    """create a temporary directory and ensure this one to be cleaned.
+    """replace an attribute of a class with another value for the time of the
+       context manager
     """
 
     def __init__(self, cls, attribute, value):
@@ -1463,8 +1464,8 @@
             else:
                 return a == b  
         else:
-            power = sig_fig - int(math.log10(abs(a))) + 1
-    
+            power = sig_fig - int(math.log10(abs(a)))
+
         return ( a==b or abs(int(a*10**power) - int(b*10**power)) < 10)
     else:
         return abs(a-b) < sig_fig
 
=== modified file 'mg5decay/decay_objects.py'
--- mg5decay/decay_objects.py	2017-07-04 09:24:42 +0000
+++ mg5decay/decay_objects.py	2018-06-15 08:18:50 +0000
@@ -4091,7 +4091,7 @@
                         model.lorentz_dict = dict([(l.name, l) for l in model['lorentz']])
                         self.init_regular_expression()
                         
-                    structure = model.lorentz_dict[vertex['lorentz'][key[1]]].structure 
+                    structure = model.lorentz_dict[vertex['lorentz'][key[1]]].structure
                     new_structure = self.lor_pattern.sub(self.simplify_lorentz,
                                                          structure)
                     lor_value = eval(new_structure % q_dict_lor)
 
=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2018-03-10 22:48:36 +0000
+++ models/import_ufo.py	2018-06-15 08:18:50 +0000
@@ -21,6 +21,7 @@
 import re
 import sys
 import time
+import collections
 
 
 from madgraph import MadGraph5Error, MG5DIR, ReadWrite
@@ -497,7 +498,7 @@
         color_info = self.find_color_anti_color_rep()
 
         # load the lorentz structure.
-        self.model.set('lorentz', self.ufomodel.all_lorentz)
+        self.model.set('lorentz', list(self.ufomodel.all_lorentz))
         
         # Substitute the expression of CT couplings which include CTparameters
         # in their definition with the corresponding dictionaries, e.g.
@@ -529,6 +530,11 @@
             for interaction_info in self.ufomodel.all_CTvertices:
                 self.add_CTinteraction(interaction_info, color_info)
     
+
+        for interaction in self.interactions:
+            self.optimise_interaction(interaction)
+    
+    
         self.model.set('conserved_charge', self.conservecharge)
 
         # If we deal with a Loop model here, the order hierarchy MUST be 
@@ -576,7 +582,102 @@
         del self.checked_lor
 
         return self.model
-        
+    
+    def optimise_interaction(self, interaction):
+        
+        # we want to check if the same coupling is used for two lorentz strucutre 
+        # for the same color structure. 
+        to_lor = {}
+        for (color, lor), coup in interaction['couplings'].items():
+            key = (color, coup)
+            if key in to_lor:
+                to_lor[key].append(lor)
+            else:
+                to_lor[key] = [lor]
+                
+        nb_reduce = []
+        optimize = False
+        for key in to_lor:
+            if len(to_lor[key]) >1:
+                nb_reduce.append(len(to_lor[key])-1)
+                optimize = True
+           
+        if not optimize:
+            return
+        
+        if not hasattr(self, 'defined_lorentz_expr'):
+            self.defined_lorentz_expr = {}
+            self.lorentz_info = {}
+            self.lorentz_combine = {}
+            for lor in self.model['lorentz']:
+                self.defined_lorentz_expr[lor.get('structure')] = lor.get('name')
+                self.lorentz_info[lor.get('name')] = lor #(lor.get('structure'), lor.get('spins'))
+        
+        for key in to_lor:
+            if len(to_lor[key]) == 1:
+                continue
+            names = [interaction['lorentz'][i] for i in to_lor[key]]
+            names.sort()
+            
+            # get name of the new lorentz
+            if tuple(names) in self.lorentz_combine:
+                # already created new loretnz
+                new_name = self.lorentz_combine[tuple(names)]
+            else:
+                new_name = self.add_merge_lorentz(names)
+                
+            # remove the old couplings 
+            color, coup = key
+            to_remove = [(color, lor) for lor in to_lor[key]]  
+            for rm in to_remove:
+                del interaction['couplings'][rm]
+                
+            #add the lorentz structure to the interaction            
+            if new_name not in [l for l in interaction.get('lorentz')]:
+                interaction.get('lorentz').append(new_name)
+
+            #find the associate index
+            new_l = interaction.get('lorentz').index(new_name)
+            # adding the new combination (color,lor) associate to this sum of structure
+            interaction['couplings'][(color, new_l)] = coup  
+                
+    
+    def add_merge_lorentz(self, names):
+        """add a lorentz structure which is the sume of the list given above"""
+        
+        
+        #create new_name
+        ii = len(names[0])
+        while ii>0:
+            if not all(n.startswith(names[0][:ii]) for n in names[1:]):
+                ii -=1
+            else:
+                base_name = names[0][:ii]
+                break
+        else:
+            base_name = 'LMER'
+            
+        i = 1
+        while '%s%s' %(base_name, i) in self.lorentz_info:
+            i +=1
+        new_name = '%s%s' %(base_name, i)
+        self.lorentz_combine[tuple(names)] = new_name
+        assert new_name not in self.lorentz_info
+        assert new_name not in [l.name for l in self.model['lorentz']]
+        
+        # load the associate lorentz expression
+        new_struct = ' + '.join([self.lorentz_info[n].get('structure') for n in names])
+        spins = self.lorentz_info[names[0]].get('spins')
+        new_lor = self.add_lorentz(new_name, spins, new_struct)
+        self.lorentz_info[new_name] = new_lor
+        
+        return new_name
+                
+                # We also have to create the new lorentz
+                
+                    
+            
+            
     
     def add_particle(self, particle_info):
         """ convert and add a particle in the particle list """
@@ -980,7 +1081,6 @@
                           (intType if poleOrder==0 else (intType+str(poleOrder)+\
                                                              'eps')),loop_particles)
 
-
     def find_color_anti_color_rep(self, output=None):
         """find which color are in the 3/3bar states"""
         # method look at the 3 3bar 8 configuration.
@@ -1197,6 +1297,7 @@
                 self.conservecharge.discard(charge)
         
         
+        
     def get_sign_flow(self, flow, nb_fermion):
         """ensure that the flow of particles/lorentz are coherent with flow 
            and return a correct version if needed"""
@@ -1241,14 +1342,18 @@
 
     def add_lorentz(self, name, spins , expr):
         """ Add a Lorentz expression which is not present in the UFO """
-        
-        new = self.model['lorentz'][0].__class__(name = name,
-                spins = spins,
-                structure = expr)
-        
-        self.model['lorentz'].append(new)
+
+        assert name not in [l.name for l in self.model['lorentz']]
+        with misc.TMP_variable(self.ufomodel.object_library, 'all_lorentz', 
+                               self.model['lorentz']):
+            new = self.model['lorentz'][0].__class__(name = name,
+                    spins = spins,
+                    structure = expr)
+        assert name in [l.name for l in self.model['lorentz']]
+        assert name not in [l.name for l in self.ufomodel.all_lorentz]
+        #self.model['lorentz'].append(new) # already done by above command
         self.model.create_lorentz_dict()
-        return name
+        return new
     
     _pat_T = re.compile(r'T\((?P<first>\d*),(?P<second>\d*)\)')
     _pat_id = re.compile(r'Identity\((?P<first>\d*),(?P<second>\d*)\)')
@@ -1657,6 +1762,7 @@
         super(RestrictModel, self).default_setup()
         self.rule_card = check_param_card.ParamCardRule()
         self.restrict_card = None
+        self.coupling_order_dict ={}
      
     def restrict_model(self, param_card, rm_parameter=True, keep_external=False,
                                                       complex_mass_scheme=None):
@@ -1702,6 +1808,10 @@
         self.del_coup += zero_couplings
         self.remove_couplings(self.del_coup)
        
+        # modify interaction to avoid to have identical coupling with different lorentz
+        for interaction in self.get('interactions'):
+            self.optimise_interaction(interaction)
+            
         # deal with parameters
         parameters = self.detect_special_parameters()
         self.fix_parameter_values(*parameters, simplify=rm_parameter, 
@@ -1772,17 +1882,58 @@
                 return self.detect_identical_couplings(strict_zero=True)
 
             
-            if value in dict_value_coupling:
-                iden_key.add(value)
-                dict_value_coupling[value].append(name)
+            if value in dict_value_coupling or -1*value in dict_value_coupling:
+                if value in dict_value_coupling:
+                    iden_key.add(value)
+                    dict_value_coupling[value].append((name,1))
+                else:
+                    iden_key.add(-1*value)
+                    dict_value_coupling[-1*value].append((name,-1))
             else:
-                dict_value_coupling[value] = [name]
-        
+                dict_value_coupling[value] = [(name,1)]
         for key in iden_key:
-            iden_coupling.append(dict_value_coupling[key])
+            tmp = []
+            if key in dict_value_coupling:
+                tmp += dict_value_coupling[key]
+            elif -1*key in dict_value_coupling:
+                tmp += dict_value_coupling[-1*key]
+            assert tmp
+
+            #ensure that all coupling have the same coupling order.
+            ords = [self.get_coupling_order(k) for k,c in tmp]
+            coup_by_ord = collections.defaultdict(list)
+            for o,t in zip(ords, tmp):
+                coup_by_ord[str(o)].append(t)
+            # add the remaining identical
+            for tmp3 in coup_by_ord.values():
+                if len(tmp3) > 1:
+                    if tmp3[0][1] == -1: #ensure that the first coupling has positif value
+                        tmp3 = [(t0,-t1) for t0, t1 in tmp3]
+                    iden_coupling.append(tmp3)
+
+            
+            
 
         return zero_coupling, iden_coupling
     
+    def get_coupling_order(self, cname):
+        """return the coupling order associated to a coupling """
+        
+        if cname in self.coupling_order_dict:
+            return self.coupling_order_dict[cname]
+
+        for v in self['interactions']:
+            for c in v['couplings'].values():
+                self.coupling_order_dict[c] = v['orders']
+        
+        if cname not in self.coupling_order_dict:
+            self.coupling_order_dict[cname] = None
+            #can happen when some vertex are discarded due to ghost/...
+            
+        
+        return self.coupling_order_dict[cname]
+
+
     
     def detect_special_parameters(self):
         """ return the list of (name of) parameter which are zero """
@@ -1898,17 +2049,52 @@
         return output
 
 
+    @staticmethod
+    def get_new_coupling_name(main, coupling, value, coeff):
+        """ We have main == coeff * coupling
+            coeff is only +1 or -1
+            main can be either GC_X or -GC_X
+            coupling can be either GC_Y or -GC_Y
+            value is either GC_Y or -GC_Y
+            the return is either GC_X or -GC_X
+            such that we have value == OUTPUT
+        """
+        assert coeff in [-1,1]
+        assert value == coupling or value == '-%s' % coupling or coupling == '-%s' % value
+        assert isinstance(main, str)
+        assert isinstance(coupling, str)
+        assert isinstance(value, str)
+        if coeff ==1: 
+            if value == coupling:
+                return main # 4/4
+            else:
+                if main.startswith('-'):
+                    return main[1:] # 2/2
+                else:
+                    return '-%s' % main # 2/2
+        else:
+            if value == coupling:
+                if main.startswith('-'):
+                    return main[1:] # 2/2
+                else:
+                    return '-%s' % main # 2/2
+            else:
+                return main # 4/4
+
+
     def merge_iden_couplings(self, couplings):
         """merge the identical couplings in the interactions and particle 
         counterterms"""
 
         
         logger_mod.debug(' Fuse the Following coupling (they have the same value): %s '% \
-                        ', '.join([obj for obj in couplings]))
+                        ', '.join([str(obj) for obj in couplings]))
+
+        main = couplings[0][0]
+        assert couplings[0][1] == 1
+        self.del_coup += [c[0] for c in couplings[1:]] # add the other coupl to the suppress list
         
-        main = couplings[0]
-        self.del_coup += couplings[1:] # add the other coupl to the suppress list
-        for coupling in couplings[1:]:
+        for coupling, coeff in couplings[1:]:
             # check if param is linked to an interaction
             if coupling not in self.coupling_pos:
                 continue
@@ -1917,13 +2103,12 @@
                          isinstance(vert, base_objects.Interaction)]
             for vertex in vertices:
                 for key, value in vertex['couplings'].items():
-                    if value == coupling:
-                        vertex['couplings'][key] = main
-                    elif value == '-%s' % coupling:
-                        if main.startswith('-'):
-                            vertex['couplings'][key] = main[1:]
-                        else:
-                            vertex['couplings'][key] = '-%s' % main
+                    if value == coupling or value == '-%s' % coupling or coupling == '-%s' % value:
+                        vertex['couplings'][key] = self.get_new_coupling_name(\
+                                                   main, coupling, value, coeff)
+                    
+                    
+                            
                         
             # replace the coupling appearing in the particle counterterm
             particles_ct = [ pct for pct in self.coupling_pos[coupling] if 
@@ -2183,11 +2368,109 @@
             data = self['parameters'][param_info[param]['dep']]
             data.remove(param_info[param]['obj'])
 
-                
-
-
-
-                
+    def optimise_interaction(self, interaction):
+        
+        # we want to check if the same coupling (up to the sign) is used for two lorentz structure 
+        # for the same color structure. 
+        to_lor = {}
+        for (color, lor), coup in interaction['couplings'].items():
+            abscoup, coeff = (coup[1:],-1) if coup.startswith('-') else (coup, 1)
+            key = (color, abscoup)
+            if key in to_lor:
+                to_lor[key].append((lor,coeff))
+            else:
+                to_lor[key] = [(lor,coeff)]
+
+        nb_reduce = []
+        optimize = False
+        for key in to_lor:
+            if len(to_lor[key]) >1:
+                nb_reduce.append(len(to_lor[key])-1)
+                optimize = True
+           
+        if not optimize:
+            return
+        
+        if not hasattr(self, 'defined_lorentz_expr'):
+            self.defined_lorentz_expr = {}
+            self.lorentz_info = {}
+            self.lorentz_combine = {}
+            for lor in self.get('lorentz'):
+                self.defined_lorentz_expr[lor.get('structure')] = lor.get('name')
+                self.lorentz_info[lor.get('name')] = lor #(lor.get('structure'), lor.get('spins'))
+            
+        for key in to_lor:
+            if len(to_lor[key]) == 1:
+                continue
+            names = ['u%s' % interaction['lorentz'][i[0]] if i[1] ==1 else \
+                     'd%s' % interaction['lorentz'][i[0]] for i in to_lor[key]]
+
+            names.sort()
+            
+            # get name of the new lorentz
+            if tuple(names) in self.lorentz_combine:
+                # already created new loretnz
+                new_name = self.lorentz_combine[tuple(names)]
+            else:
+                new_name = self.add_merge_lorentz(names)
+                
+            # remove the old couplings 
+            color, coup = key
+            to_remove = [(color, lor[0]) for lor in to_lor[key]] 
+            for rm in to_remove:
+                del interaction['couplings'][rm]
+                
+            #add the lorentz structure to the interaction            
+            if new_name not in [l for l in interaction.get('lorentz')]:
+                interaction.get('lorentz').append(new_name)
+
+            #find the associate index
+            new_l = interaction.get('lorentz').index(new_name)
+            # adding the new combination (color,lor) associate to this sum of structure
+            interaction['couplings'][(color, new_l)] = coup     
+
+
+
+    def add_merge_lorentz(self, names):
+        """add a lorentz structure which is the sume of the list given above"""
+        
+        #create new_name
+        ii = len(names[0])
+        while ii>1:
+            #do not count the initial "u/d letter whcih indicates the sign"
+            if not all(n[1:].startswith(names[0][1:ii]) for n in names[1:]):
+                ii -=1
+            else:
+                base_name = names[0][1:ii]
+                break
+        else:
+            base_name = 'LMER'
+        i = 1
+        while '%s%s' %(base_name, i) in self.lorentz_info:
+            i +=1
+        new_name = '%s%s' %(base_name, i)
+        self.lorentz_combine[tuple(names)] = new_name
+        
+        # load the associate lorentz expression
+        new_struct = ' + '.join([self.lorentz_info[n[1:]].get('structure') for n in names if n.startswith('u')])
+        if any( n.startswith('d') for n in names ):
+            new_struct += '-' + ' - '.join(['1.*(%s)' %self.lorentz_info[n[1:]].get('structure') for n in names if n.startswith('d')])
+        spins = self.lorentz_info[names[0][1:]].get('spins')
+        new_lor = self.add_lorentz(new_name, spins, new_struct)
+        self.lorentz_info[new_name] = new_lor
+        
+        return new_name
+    
+    def add_lorentz(self, name, spin, struct):
+        """adding lorentz structure to the current model"""
+        new = self['lorentz'][0].__class__(name = name,
+                                           spins = spin,
+                                           structure = struct)
+        self['lorentz'].append(new)
+        self.create_lorentz_dict()
+        
+        return None
+                                
         
         
         
 
=== modified file 'models/write_param_card.py'
--- models/write_param_card.py	2017-01-15 14:28:13 +0000
+++ models/write_param_card.py	2018-06-15 08:18:50 +0000
@@ -308,8 +308,8 @@
             if part["pdg_code"] in self.sm_pdg or part["pdg_code"] < 0:
                 continue
             # don't write ghosts in the QNumbers block
-            if part["type"] == 'ghost':
-                continue
+            #if part["type"] == 'ghost':
+            #    continue
             text += self.qnumber_str % {'pdg': part["pdg_code"],
                                  'name': part["name"],
                                  'charge': 3 * part["charge"],
 
=== modified file 'tests/acceptance_tests/test_cmd_amcatnlo.py'
--- tests/acceptance_tests/test_cmd_amcatnlo.py	2018-04-29 05:41:18 +0000
+++ tests/acceptance_tests/test_cmd_amcatnlo.py	2018-06-15 08:18:50 +0000
@@ -44,6 +44,7 @@
 _pickle_path =os.path.join(_file_path, 'input_files')
 
 from madgraph import MG4DIR, MG5DIR, MadGraph5Error, InvalidCmd
+from tests.acceptance_tests.test_cmd_madevent import check_html_page
 
 pjoin = os.path.join
 
@@ -190,7 +191,7 @@
         self.assertTrue( 'HERWIG6   = parton_shower' in card)
         card = card.replace('HERWIG6   = parton_shower', 'HERWIGPP   = parton_shower')
         open('%s/Cards/run_card.dat' % self.path, 'w').write(card)
-        self.cmd_line.exec_cmd('set  cluster_temp_path /tmp/')
+        self.cmd_line.exec_cmd('set  cluster_temp_path /tmp/ --no_save')
         self.do('generate_events -pf')
         # test the lhe event file exists
         self.assertTrue(os.path.exists('%s/Events/run_01/events.lhe.gz' % self.path))
@@ -215,7 +216,7 @@
         self.assertTrue( 'HERWIG6   = parton_shower' in card)
         card = card.replace('HERWIG6   = parton_shower', 'PYTHIA8   = parton_shower')
         open('%s/Cards/run_card.dat' % self.path, 'w').write(card)
-        self.cmd_line.exec_cmd('set  cluster_temp_path /tmp/')
+        self.cmd_line.exec_cmd('set  cluster_temp_path /tmp/ --no_save')
         self.cmd_line.exec_cmd('set  pythia8_path None')
         self.do('generate_events -pf')
         # test the lhe event file exists
@@ -242,7 +243,7 @@
         self.assertTrue( ' -1 = nevt_job' in card)
         card = card.replace(' -1 = nevt_job', '500 = nevt_job')
         open('%s/Cards/run_card.dat' % self.path, 'w').write(card)
-        self.cmd_line.exec_cmd('set  cluster_temp_path /tmp/ --no-save')
+        self.cmd_line.exec_cmd('set  cluster_temp_path /tmp/ --no_save')
         self.do('generate_events -pf')
         # test the lhe event file exists
         self.assertTrue(os.path.exists('%s/Events/run_01/events.lhe.gz' % self.path))
@@ -258,7 +259,7 @@
 
         nevents =20
         text = """
-        set crash_on_error True
+        set crash_on_error True --no_save
         generate p p > t t~ [QCD]
         output %s
         launch
@@ -378,7 +379,7 @@
     def test_madspin_LOonly(self):
         
         text = """
-        set crash_on_error True
+        set crash_on_error True --no_save
         generate p p > w+ [LOonly]
         output %s
         launch
@@ -596,6 +597,9 @@
         self.assertTrue(os.path.exists('%s/Events/run_01/alllogs_0.html' % self.path))
         self.assertTrue(os.path.exists('%s/Events/run_01/alllogs_1.html' % self.path))
         self.assertTrue(os.path.exists('%s/Events/run_01/alllogs_2.html' % self.path))
+
+        check_html_page(self, pjoin(self.path, 'crossx.html'))
+        check_html_page(self, pjoin(self.path, 'HTML', 'run_01', 'results.html'))
         
 
     def test_calculate_xsect_nlo(self):
@@ -614,6 +618,9 @@
         self.assertTrue(os.path.exists('%s/Events/run_01/alllogs_0.html' % self.path))
         self.assertTrue(os.path.exists('%s/Events/run_01/alllogs_1.html' % self.path))
 
+        check_html_page(self, pjoin(self.path, 'crossx.html'))
+        check_html_page(self, pjoin(self.path, 'HTML', 'run_01', 'results.html'))
+
 
     def test_calculate_xsect_lo(self):
         """test the param_card created is correct"""
 
=== modified file 'tests/acceptance_tests/test_cmd_madevent.py'
--- tests/acceptance_tests/test_cmd_madevent.py	2018-04-26 14:24:04 +0000
+++ tests/acceptance_tests/test_cmd_madevent.py	2018-06-15 08:18:50 +0000
@@ -47,6 +47,22 @@
 
 pjoin = os.path.join
 
+def check_html_page(cls, link):
+    """return True if all link in the html page are existing on disk.
+       otherwise raise an assertion error"""
+        
+    text=open(link).read()
+    pattern = re.compile(r'href=[\"\']?(.*?)?[\"\'\s\#]', re.DOTALL)
+    
+    cwd = os.path.dirname(link)
+    with misc.chdir(cwd):
+        for path in pattern.findall(text):
+            if not path:
+                continue # means is just a linke starting with #
+            cls.assertTrue(os.path.exists(path), '%s/%s' %(cwd,path))
+    return True
+    
+
 #===============================================================================
 # TestCmd
 #===============================================================================
@@ -588,6 +604,12 @@
             text = fsock.read()
             self.assertTrue(text.count('dynamical scheme') >= 3)
         
+        # check that the html link makes sense
+        #check_html_page(self, pjoin(self.run_dir, 'crossx.html'))
+    
+        
+        
+        
                 
     def check_pythia_output(self, run_name='run_01', syst=False):
         """ """
@@ -825,6 +847,7 @@
                         stdout=stdout,stderr=stdout)
         
         self.check_parton_output(cross=4.541638, error=0.035)
+    
         self.check_parton_output('run_02', cross=4.41887317, error=0.035)
         self.check_pythia_output()
         self.assertEqual(cwd, os.getcwd())
@@ -878,7 +901,11 @@
                             'cross is %s and not %s. NB_SIGMA %s' % (float(data[0]['cross']), cross, float(data[0]['cross'])/new_error)
                             )
             self.assertTrue(float(data[0]['error']) < 3 * error)
-                            
+            
+        check_html_page(self, pjoin(self.run_dir, 'crossx.html'))
+        if 'decayed' not in run_name:
+            check_html_page(self, pjoin(self.run_dir,'HTML', run_name, 'results.html'))
+        
     def check_pythia_output(self, run_name='run_01'):
         """ """
         # check that the number of event is fine:
 
=== modified file 'tests/acceptance_tests/test_cmd_reweight.py'
--- tests/acceptance_tests/test_cmd_reweight.py	2018-04-24 21:57:16 +0000
+++ tests/acceptance_tests/test_cmd_reweight.py	2018-06-15 08:18:50 +0000
@@ -292,8 +292,8 @@
             rwgt_data = event.parse_reweight()
             #solutions.append(rwgt_data['MYNLO_tree'])
             if i < len(solutions):
-                self.assertTrue(misc.equal(rwgt_data['MYNLO_tree'], solutions[i]))
-            self.assertTrue(misc.equal(rwgt_data['MYNLO_tree'], event2.wgt))
+                self.assertTrue(misc.equal(rwgt_data['MYNLO_tree'], solutions[i],3), '(event %s) %s != %s ' % (i, rwgt_data['MYNLO_tree'], solutions[i]))
+            self.assertTrue(misc.equal(rwgt_data['MYNLO_tree'], event2.wgt, 3), '(event %s) %s != %s ' % (i, rwgt_data['MYNLO_tree'], event2.wgt))
         #misc.sprint(solutions)
             
     def test_scan_reweighting(self):
 
=== added file 'tests/acceptance_tests/test_madspin.py'
--- tests/acceptance_tests/test_madspin.py	1970-01-01 00:00:00 +0000
+++ tests/acceptance_tests/test_madspin.py	2018-06-15 08:18:50 +0000
@@ -0,0 +1,114 @@
+from __future__ import division
+import subprocess
+import unittest
+import os
+import re
+import shutil
+import sys
+import logging
+import time
+import tempfile
+import math
+
+logger = logging.getLogger('test_cmd')
+
+import tests.unit_tests.iolibs.test_file_writers as test_file_writers
+
+import madgraph.interface.master_interface as MGCmd
+import madgraph.interface.madevent_interface as MECmd
+import madgraph.interface.launch_ext_program as launch_ext
+import madgraph.iolibs.files as files
+
+import madgraph.various.misc as misc
+import madgraph.various.lhe_parser as lhe_parser
+import madgraph.various.banner as banner_mod
+import madgraph.various.lhe_parser as lhe_parser
+import madgraph.various.banner as banner
+
+_file_path = os.path.split(os.path.dirname(os.path.realpath(__file__)))[0]
+_pickle_path =os.path.join(_file_path, 'input_files')
+
+from madgraph import MG4DIR, MG5DIR, MadGraph5Error, InvalidCmd
+
+pjoin = os.path.join
+
+#===============================================================================
+# TestCmd
+#===============================================================================
+class TestMadSpin(unittest.TestCase):
+    """test that we can launch everything from a single file"""
+
+    def setUp(self):
+        
+        self.debuging = False
+        if self.debuging:
+            self.path = pjoin(MG5DIR, 'MS_TEST')
+            if os.path.exists(self.path):
+                shutil.rmtree(self.path)
+            os.mkdir(self.path) 
+        else:
+            self.path = tempfile.mkdtemp(prefix='ms_test_mg5')
+        self.run_dir = pjoin(self.path, 'MGPROC') 
+        
+    
+    def tearDown(self):
+
+        if not self.debuging:
+            shutil.rmtree(self.path)
+        self.assertFalse(self.debuging)
+
+
+    def test_hepmc_decay(self):
+        """ """
+        
+        cwd = os.getcwd()
+        
+        files.cp(pjoin(MG5DIR, 'tests', 'input_files', 'test.hepmc.gz'), self.path)
+
+
+        fsock = open(pjoin(self.path, 'test_hepmc'),'w')
+        text = """
+        set spinmode none
+        set cross_section {0:1.0}
+        set new_wgt BR
+        set input_format hepmc
+        import ./test.hepmc.gz
+        import model %s/tests/input_files/DM_pion %s/tests/input_files/DM_pion/param_pion.dat
+        decay k0 > xr xr a
+        launch
+        """ % (MG5DIR, MG5DIR)
+        
+        fsock.write(text)
+        fsock.close()
+
+        import subprocess
+        if logging.getLogger('madgraph').level <= 20:
+            stdout=None
+            stderr=None
+        else:
+            devnull =open(os.devnull,'w')
+            stdout=devnull
+            stderr=devnull
+
+        subprocess.call([pjoin(MG5DIR, 'MadSpin', 'madspin'),
+                         pjoin(self.path, 'test_hepmc')],
+                        cwd=pjoin(self.path),
+                        stdout=stdout,stderr=stdout)
+        self.assertTrue(os.path.exists(pjoin(self.path, 'test_decayed.lhe.gz')))
+        lhe = lhe_parser.EventFile(pjoin(self.path, 'test_decayed.lhe.gz'))
+        self.assertEqual(10, len(lhe))
+        
+        nb_dec = 0
+        nb_photon = 0
+        for event in lhe:
+            self.assertEqual(event.nexternal, len(event))
+            for particle in event:
+                if particle.pdg == 130:
+                    self.assertEqual(particle.status,2)
+                    nb_dec +=1
+                if particle.pdg ==22:
+                    nb_photon += 1
+                    
+        self.assertEqual(nb_dec, 116)
+        self.assertEqual(nb_photon, 116)
+        
 \ No newline at end of file
 
=== modified file 'tests/acceptance_tests/test_madweight.py'
--- tests/acceptance_tests/test_madweight.py	2015-10-24 19:53:10 +0000
+++ tests/acceptance_tests/test_madweight.py	2018-06-15 08:18:50 +0000
@@ -152,8 +152,8 @@
         except Exception, error:
             pass
         
-        cmd = """set automatic_html_opening False --no-save
-                 set cluster_temp_path /tmp --no-save
+        cmd = """set automatic_html_opening False --no_save
+                 set cluster_temp_path /tmp --no_save
                  generate p p > w+, w+ > e+ ve
                  output madweight TEST_MW_W_prod -f
                  launch
@@ -215,8 +215,8 @@
         except Exception, error:
             pass
         
-        cmd = """set automatic_html_opening False --no-save
-                 set cluster_temp_path /tmp --no-save
+        cmd = """set automatic_html_opening False --no_save
+                 set cluster_temp_path /tmp --no_save
                  generate p p > w+ j j, w+ > e+ ve
                  output madweight TEST_MW_W2J_prod
                  launch
 
=== modified file 'tests/acceptance_tests/test_model_equivalence.py'
--- tests/acceptance_tests/test_model_equivalence.py	2016-09-06 15:01:18 +0000
+++ tests/acceptance_tests/test_model_equivalence.py	2018-06-15 08:18:50 +0000
@@ -347,6 +347,7 @@
         solutions = {'ymtau ': [1.7769999504089355], 'I4x33 ': [0.024123685681481218, 0.0], 'MTA ': [1.7769999504089355], 'GC_81 ': [0.0, 67.544], 'GC_5 ': [0.0, 0.094836], 'MZ ': [91.18800354003906], 'GC_27 ': [0.94484, 0.0], 'I1x33 ': [0.024123685681481218, 0.0], 'I3x33 ': [0.9448443987662922, 0.0], 'GC_95 ': [0.66811, 0.0], 'GC_60 ': [-0.37035, 0.0], 'ee__exp__2 ': [0.09483552005165403], 'aEWM1 ': [132.5070037841797], 'ytau ': [0.01020661671581679], 'GC_69 ': [-0.0, -190.38], 'GC_35 ': [-0.0, -0.42671], 'cw__exp__2 ': [0.7777535472599892], 'Gf ': [1.16639e-05], 'GC_59 ': [0.0, 0.08231], 'GC_21 ': [-0.94484, -0.0], 'ee ': [0.307953762847045], 'WZ ': [2.441404104232788], 'sw2 ': [0.22224645274001076], 'WT ': [1.5083359479904175], 'GC_80 ': [-0.0, -33.772], 'GC_57 ': [-0.0, -0.35482], 'sqrt__sw2 ': [0.4714302204356555], 'GC_67 ': [13.239, 0.0], 'GC_76 ': [-29.784, 0.0], 'GC_36 ': [0.0, 0.33188], 'GC_68 ': [-0.0, -63.46], 'GC_56 ': [0.10058, 0.0], 'sw__exp__2 ': [0.22224645274001076], 'GC_3 ': [-0.0, -0.30795], 'GC_54 ': [-0.10058, 0.0], 'WW ': [2.047600030899048], 'GC_70 ': [-26.266, 0.0], 'GC_66 ': [-13.239, 0.0], 'GC_38 ': [-0.0, -0.32662], 'GC_83 ': [-0.0, -0.017058], 'GC_77 ': [-16.545, 0.0], 'gw ': [0.653232969584471], 'MH ': [125.0], 'ymb ': [4.199999809265137], 'complexi ': [0.0, 1.0], 'GC_37 ': [-0.32662, 0.0], 'conjg__CKM1x1 ': [1.0], 'GC_2 ': [0.0, 0.2053], 'GC_51 ': [0.0, 0.28804], 'GC_71 ': [-0.0, -26.266], 'GC_39 ': [0.0, 0.32662], 'GC_82 ': [-0.017058, 0.0], 'GC_55 ': [-0.0, -0.10058], 'GC_78 ': [16.545, 0.0], 'GC_98 ': [-0.0072172, 0.0], 'GC_30 ': [-0.024124, -0.0], 'GC_15 ': [0.024124, 0.0], 'cw ': [0.881903366168873], 'yt ': [0.9448443987662922], 'sqrt__aEW ': [0.08687215260631942], 'vev ': [246.2184581018163], 'GC_79 ': [29.784, 0.0], 'GC_72 ': [0.0, 52.532], 'GC_1 ': [-0.0, -0.10265], 'conjg__CKM3x3 ': [1.0], 'GC_52 ': [-0.0, -0.57609], 'GC_100 ': [0.0, 0.46191], 'GC_65 ': [0.0, 0.27432], 'GC_12 ': [0.0, 1.4828], 'I2x33 ': [0.9448443987662922, 0.0], 'GC_94 ': [-0.0, -0.66811], 'sqrt__aS ': [0.3435112817874484], 'GC_31 ': [-0.0, -0.25774], 'aS ': [0.11800000071525575], 'MW__exp__2 ': [6467.21673128622], 'MZ__exp__4 ': [69143415.65084904], 'yb ': [0.024123685681481218], 'GC_99 ': [-0.0, -0.0072172], 'WH ': [0.006382339168339968], 'GC_96 ': [-0.010207, 0.0], 'MH__exp__2 ': [15625.0], 'GC_63 ': [0.0, 0.12671], 'GC_53 ': [0.0, 0.57609], 'GC_73 ': [26.266, 0.0], 'GC_64 ': [0.0, 0.084653], 'sw ': [0.4714302204356555], 'GC_9 ': [0.053768, 0.0], 'GC_32 ': [-0.0, -0.51548], 'muH ': [88.38834764831844], 'GC_7 ': [-0.053768, 0.0], 'aEW ': [0.0075467708984556505], 'vev__exp__2 ': [60623.52911003587], 'MZ__exp__2 ': [8315.251989618177], 'GC_97 ': [0.010207, 0.0], 'GC_62 ': [0.0, 0.37035], 'GC_74 ': [-24.765, 0.0], 'g1 ': [0.34919218438279087], 'GC_10 ': [-1.2177, 0.0], 'GC_8 ': [0.0, 0.053768], 'CKM3x3 ': [1.0], 'MW ': [80.41900727617956], 'MT ': [172.0], 'GC_33 ': [-0.0, -0.77321], 'GC_6 ': [0.0, 0.18967], 'GC_4 ': [0.0, 0.30795], 'MB ': [4.699999809265137], 'GC_61 ': [0.0, -0.20573], 'ymt ': [164.5], 'GC_75 ': [24.765, 0.0], 'G__exp__2 ': [1.4828317414825511], 'lam ': [0.1288691060169027], 'GC_50 ': [-0.0, -0.28804], 'GC_34 ': [0.0, 0.21336], 'GC_11 ': [0.0, 1.2177], 'sqrt__2 ': [1.4142135623730951], 'GC_58 ': [-0.0, -0.027437]}
         #solutions = {'GC_5 ': [0.0, 0.094836], 'mdl_MW ': [80.41900727617956], 'mdl_yb ': [0.024123685681481218], 'mdl_sw__exp__2 ': [0.22224645274001076], 'mdl_conjg__CKM3x3 ': [1.0], 'GC_56 ': [0.10058, 0.0], 'mdl_MH ': [125.0], 'GC_95 ': [0.66811, 0.0], 'mdl_I4x33 ': [0.024123685681481218, 0.0], 'mdl_complexi ': [0.0, 1.0], 'aEWM1 ': [132.5070037841797], 'GC_69 ': [-0.0, -190.38], 'GC_35 ': [-0.0, -0.42671], 'mdl_Gf ': [1.16639e-05], 'mdl_gw ': [0.653232969584471], 'mdl_conjg__CKM1x1 ': [1.0], 'mdl_sqrt__aEW ': [0.08687215260631942], 'GC_59 ': [0.0, 0.08231], 'GC_21 ': [-0.94484, -0.0], 'GC_4 ': [0.0, 0.30795], 'mdl_cw ': [0.881903366168873], 'GC_80 ': [-0.0, -33.772], 'GC_64 ': [0.0, 0.084653], 'GC_57 ': [-0.0, -0.35482], 'GC_76 ': [-29.784, 0.0], 'GC_67 ': [13.239, 0.0], 'mdl_vev__exp__2 ': [60623.52911003587], 'mdl_I3x33 ': [0.9448443987662922, 0.0], 'GC_36 ': [0.0, 0.33188], 'mdl_I1x33 ': [0.024123685681481218, 0.0], 'GC_81 ': [0.0, 67.544], 'mdl_sw2 ': [0.22224645274001076], 'GC_68 ': [-0.0, -63.46], 'mdl_ytau ': [0.01020661671581679], 'GC_100 ': [0.0, 0.46191], 'GC_3 ': [-0.0, -0.30795], 'GC_54 ': [-0.10058, 0.0], 'GC_70 ': [-26.266, 0.0], 'GC_66 ': [-13.239, 0.0], 'GC_38 ': [-0.0, -0.32662], 'GC_83 ': [-0.0, -0.017058], 'GC_77 ': [-16.545, 0.0], 'GC_27 ': [0.94484, 0.0], 'GC_10 ': [-1.2177, 0.0], 'GC_37 ': [-0.32662, 0.0], 'GC_60 ': [-0.37035, 0.0], 'GC_2 ': [0.0, 0.2053], 'mdl_muH ': [88.38834764831844], 'mdl_MT ': [172.0], 'mdl_WH ': [0.006382339168339968], 'GC_51 ': [0.0, 0.28804], 'GC_71 ': [-0.0, -26.266], 'GC_39 ': [0.0, 0.32662], 'GC_82 ': [-0.017058, 0.0], 'mdl_sw ': [0.4714302204356555], 'GC_55 ': [-0.0, -0.10058], 'GC_61 ': [0.0, -0.20573], 'mdl_cw__exp__2 ': [0.7777535472599892], 'mdl_ymt ': [164.5], 'GC_78 ': [16.545, 0.0], 'mdl_CKM3x3 ': [1.0], 'GC_30 ': [-0.024124, -0.0], 'GC_15 ': [0.024124, 0.0], 'mdl_aEW ': [0.0075467708984556505], 'mdl_sqrt__sw2 ': [0.4714302204356555], 'mdl_I2x33 ': [0.9448443987662922, 0.0], 'GC_72 ': [0.0, 52.532], 'GC_1 ': [-0.0, -0.10265], 'GC_52 ': [-0.0, -0.57609], 'GC_65 ': [0.0, 0.27432], 'GC_12 ': [0.0, 1.4828], 'mdl_ymb ': [4.199999809265137], 'mdl_ee ': [0.307953762847045], 'GC_79 ': [29.784, 0.0], 'mdl_sqrt__2 ': [1.4142135623730951], 'GC_31 ': [-0.0, -0.25774], 'aS ': [0.11800000071525575], 'GC_99 ': [-0.0, -0.0072172], 'mdl_vev ': [246.2184581018163], 'GC_96 ': [-0.010207, 0.0], 'GC_63 ': [0.0, 0.12671], 'GC_53 ': [0.0, 0.57609], 'GC_73 ': [26.266, 0.0], 'mdl_MZ__exp__2 ': [8315.251989618177], 'mdl_WZ ': [2.441404104232788], 'GC_9 ': [0.053768, 0.0], 'mdl_g1 ': [0.34919218438279087], 'GC_32 ': [-0.0, -0.51548], 'mdl_G ': [1.2177157884673053], 'mdl_WT ': [1.5083359479904175], 'GC_7 ': [-0.053768, 0.0], 'mdl_G__exp__2 ': [1.4828317414825511], 'GC_97 ': [0.010207, 0.0], 'GC_62 ': [0.0, 0.37035], 'GC_74 ': [-24.765, 0.0], 'mdl_MZ ': [91.18800354003906], 'mdl_MZ__exp__4 ': [69143415.65084904], 'GC_8 ': [0.0, 0.053768], 'mdl_yt ': [0.9448443987662922], 'GC_98 ': [-0.0072172, 0.0], 'mdl_ee__exp__2 ': [0.09483552005165403], 'mdl_MB ': [4.699999809265137], 'GC_33 ': [-0.0, -0.77321], 'mdl_ymtau ': [1.7769999504089355], 'mdl_WW ': [2.047600030899048], 'GC_6 ': [0.0, 0.18967], 'mdl_MTA ': [1.7769999504089355], 'GC_75 ': [24.765, 0.0], 'GC_94 ': [-0.0, -0.66811], 'mdl_MW__exp__2 ': [6467.21673128622], 'mdl_MH__exp__2 ': [15625.0], 'GC_50 ': [-0.0, -0.28804], 'GC_34 ': [0.0, 0.21336], 'GC_11 ': [0.0, 1.2177], 'mdl_sqrt__aS ': [0.3435112817874484], 'GC_58 ': [-0.0, -0.027437], 'mdl_lam ': [0.1288691060169027]}
         nb_value = 0
+        checked_solutions = solutions.keys()
         for line in testprog.stdout:
             self.assertTrue('Warning' not in line)
             if '=' not in line:
@@ -356,6 +357,7 @@
             if variable.startswith('mdl_'):
                 variable = variable[4:]
 
+            checked_solutions.remove(variable)
             if ',' in line:
                 value = eval(split[1])
             else:
@@ -375,8 +377,9 @@
                 #        solutions[variable] = [singlevalue]
                 #    else:
                 #        solutions[variable].append(singlevalue)
-        
-        self.assertEqual(nb_value, 116)
+        self.assertEqual(nb_value, 116 - len(checked_solutions))
+        self.assertEqual(set(checked_solutions), set(['GC_%s ' % i for i in [27,67,54,38,78,15,79,96,73,9,74,4,50]]))
+
         
         
 
 
=== added directory 'tests/input_files/DM_pion'
=== added file 'tests/input_files/DM_pion/CT_couplings.py'
--- tests/input_files/DM_pion/CT_couplings.py	1970-01-01 00:00:00 +0000
+++ tests/input_files/DM_pion/CT_couplings.py	2018-06-15 08:18:50 +0000
@@ -0,0 +1,1731 @@
+# This file was automatically created by FeynRules 2.3.2
+# Mathematica version: 9.0 for Linux x86 (64-bit) (November 20, 2012)
+# Date: Thu 11 Jun 2015 17:39:54
+
+
+from object_library import all_couplings, Coupling
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec, cot
+
+
+
+R2GC_138_1 = Coupling(name = 'R2GC_138_1',
+                      value = '-(complex(0,1)*G**2)/(16.*cmath.pi**2)',
+                      order = {'QCD':2})
+
+R2GC_139_2 = Coupling(name = 'R2GC_139_2',
+                      value = '(complex(0,1)*G**2)/(48.*cmath.pi**2)',
+                      order = {'QCD':2})
+
+R2GC_140_3 = Coupling(name = 'R2GC_140_3',
+                      value = '(ee**2*complex(0,1)*G**2)/(216.*cmath.pi**2)',
+                      order = {'QCD':2,'QED':2})
+
+R2GC_140_4 = Coupling(name = 'R2GC_140_4',
+                      value = '(ee**2*complex(0,1)*G**2)/(54.*cmath.pi**2)',
+                      order = {'QCD':2,'QED':2})
+
+R2GC_141_5 = Coupling(name = 'R2GC_141_5',
+                      value = '-(ee*complex(0,1)*G**3)/(144.*cmath.pi**2)',
+                      order = {'QCD':3,'QED':1})
+
+R2GC_141_6 = Coupling(name = 'R2GC_141_6',
+                      value = '(ee*complex(0,1)*G**3)/(72.*cmath.pi**2)',
+                      order = {'QCD':3,'QED':1})
+
+R2GC_142_7 = Coupling(name = 'R2GC_142_7',
+                      value = '(complex(0,1)*G**3*gAd33)/(16.*cmath.pi**2)',
+                      order = {'DMV':1,'QCD':3})
+
+R2GC_142_8 = Coupling(name = 'R2GC_142_8',
+                      value = '(complex(0,1)*G**3*gAu22)/(16.*cmath.pi**2)',
+                      order = {'DMV':1,'QCD':3})
+
+R2GC_142_9 = Coupling(name = 'R2GC_142_9',
+                      value = '(complex(0,1)*G**3*gAd11)/(16.*cmath.pi**2)',
+                      order = {'DMV':1,'QCD':3})
+
+R2GC_142_10 = Coupling(name = 'R2GC_142_10',
+                       value = '(complex(0,1)*G**3*gAd22)/(16.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':3})
+
+R2GC_142_11 = Coupling(name = 'R2GC_142_11',
+                       value = '(complex(0,1)*G**3*gAu33)/(16.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':3})
+
+R2GC_142_12 = Coupling(name = 'R2GC_142_12',
+                       value = '(complex(0,1)*G**3*gAu11)/(16.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':3})
+
+R2GC_143_13 = Coupling(name = 'R2GC_143_13',
+                       value = '-(ee*complex(0,1)*G**2*gVd33)/(72.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_143_14 = Coupling(name = 'R2GC_143_14',
+                       value = '(ee*complex(0,1)*G**2*gVu22)/(36.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_143_15 = Coupling(name = 'R2GC_143_15',
+                       value = '-(ee*complex(0,1)*G**2*gVd11)/(72.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_143_16 = Coupling(name = 'R2GC_143_16',
+                       value = '-(ee*complex(0,1)*G**2*gVd22)/(72.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_143_17 = Coupling(name = 'R2GC_143_17',
+                       value = '(ee*complex(0,1)*G**2*gVu33)/(36.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_143_18 = Coupling(name = 'R2GC_143_18',
+                       value = '(ee*complex(0,1)*G**2*gVu11)/(36.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_144_19 = Coupling(name = 'R2GC_144_19',
+                       value = '(complex(0,1)*G**3*gVd33)/(48.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':3})
+
+R2GC_144_20 = Coupling(name = 'R2GC_144_20',
+                       value = '(complex(0,1)*G**3*gVu22)/(48.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':3})
+
+R2GC_144_21 = Coupling(name = 'R2GC_144_21',
+                       value = '(complex(0,1)*G**3*gVd11)/(48.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':3})
+
+R2GC_144_22 = Coupling(name = 'R2GC_144_22',
+                       value = '(complex(0,1)*G**3*gVd22)/(48.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':3})
+
+R2GC_144_23 = Coupling(name = 'R2GC_144_23',
+                       value = '(complex(0,1)*G**3*gVu33)/(48.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':3})
+
+R2GC_144_24 = Coupling(name = 'R2GC_144_24',
+                       value = '(complex(0,1)*G**3*gVu11)/(48.*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':3})
+
+R2GC_145_25 = Coupling(name = 'R2GC_145_25',
+                       value = '(complex(0,1)*G**2*gAd33**2)/(24.*cmath.pi**2) + (complex(0,1)*G**2*gVd33**2)/(24.*cmath.pi**2)',
+                       order = {'DMV':2,'QCD':2})
+
+R2GC_145_26 = Coupling(name = 'R2GC_145_26',
+                       value = '(complex(0,1)*G**2*gAu22**2)/(24.*cmath.pi**2) + (complex(0,1)*G**2*gVu22**2)/(24.*cmath.pi**2)',
+                       order = {'DMV':2,'QCD':2})
+
+R2GC_145_27 = Coupling(name = 'R2GC_145_27',
+                       value = '(complex(0,1)*G**2*gAd11**2)/(24.*cmath.pi**2) + (complex(0,1)*G**2*gVd11**2)/(24.*cmath.pi**2)',
+                       order = {'DMV':2,'QCD':2})
+
+R2GC_145_28 = Coupling(name = 'R2GC_145_28',
+                       value = '(complex(0,1)*G**2*gAd22**2)/(24.*cmath.pi**2) + (complex(0,1)*G**2*gVd22**2)/(24.*cmath.pi**2)',
+                       order = {'DMV':2,'QCD':2})
+
+R2GC_145_29 = Coupling(name = 'R2GC_145_29',
+                       value = '(complex(0,1)*G**2*gAu33**2)/(24.*cmath.pi**2) + (complex(0,1)*G**2*gVu33**2)/(24.*cmath.pi**2)',
+                       order = {'DMV':2,'QCD':2})
+
+R2GC_145_30 = Coupling(name = 'R2GC_145_30',
+                       value = '(complex(0,1)*G**2*gAu11**2)/(24.*cmath.pi**2) + (complex(0,1)*G**2*gVu11**2)/(24.*cmath.pi**2)',
+                       order = {'DMV':2,'QCD':2})
+
+R2GC_146_31 = Coupling(name = 'R2GC_146_31',
+                       value = '-(complex(0,1)*G**2*MB**2)/(8.*cmath.pi**2)',
+                       order = {'QCD':2})
+
+R2GC_146_32 = Coupling(name = 'R2GC_146_32',
+                       value = '-(complex(0,1)*G**2*MC**2)/(8.*cmath.pi**2)',
+                       order = {'QCD':2})
+
+R2GC_146_33 = Coupling(name = 'R2GC_146_33',
+                       value = '-(complex(0,1)*G**2*MD**2)/(8.*cmath.pi**2)',
+                       order = {'QCD':2})
+
+R2GC_146_34 = Coupling(name = 'R2GC_146_34',
+                       value = '-(complex(0,1)*G**2*MS**2)/(8.*cmath.pi**2)',
+                       order = {'QCD':2})
+
+R2GC_146_35 = Coupling(name = 'R2GC_146_35',
+                       value = '-(complex(0,1)*G**2*MT**2)/(8.*cmath.pi**2)',
+                       order = {'QCD':2})
+
+R2GC_146_36 = Coupling(name = 'R2GC_146_36',
+                       value = '-(complex(0,1)*G**2*MU**2)/(8.*cmath.pi**2)',
+                       order = {'QCD':2})
+
+R2GC_147_37 = Coupling(name = 'R2GC_147_37',
+                       value = '(cw*ee**2*complex(0,1)*G**2)/(288.*cmath.pi**2*sw) - (ee**2*complex(0,1)*G**2*sw)/(864.*cw*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_147_38 = Coupling(name = 'R2GC_147_38',
+                       value = '(cw*ee**2*complex(0,1)*G**2)/(144.*cmath.pi**2*sw) - (5*ee**2*complex(0,1)*G**2*sw)/(432.*cw*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_148_39 = Coupling(name = 'R2GC_148_39',
+                       value = '-(cw*ee*complex(0,1)*G**3)/(192.*cmath.pi**2*sw) + (ee*complex(0,1)*G**3*sw)/(576.*cw*cmath.pi**2)',
+                       order = {'QCD':3,'QED':1})
+
+R2GC_148_40 = Coupling(name = 'R2GC_148_40',
+                       value = '(cw*ee*complex(0,1)*G**3)/(192.*cmath.pi**2*sw) - (5*ee*complex(0,1)*G**3*sw)/(576.*cw*cmath.pi**2)',
+                       order = {'QCD':3,'QED':1})
+
+R2GC_149_41 = Coupling(name = 'R2GC_149_41',
+                       value = '(-3*cw*ee*complex(0,1)*G**3)/(64.*cmath.pi**2*sw) - (3*ee*complex(0,1)*G**3*sw)/(64.*cw*cmath.pi**2)',
+                       order = {'QCD':3,'QED':1})
+
+R2GC_149_42 = Coupling(name = 'R2GC_149_42',
+                       value = '(3*cw*ee*complex(0,1)*G**3)/(64.*cmath.pi**2*sw) + (3*ee*complex(0,1)*G**3*sw)/(64.*cw*cmath.pi**2)',
+                       order = {'QCD':3,'QED':1})
+
+R2GC_150_43 = Coupling(name = 'R2GC_150_43',
+                       value = '(cw*ee*complex(0,1)*G**2*gAd33)/(96.*cmath.pi**2*sw) - (cw*ee*complex(0,1)*G**2*gVd33)/(96.*cmath.pi**2*sw) + (ee*complex(0,1)*G**2*gAd33*sw)/(96.*cw*cmath.pi**2) + (ee*complex(0,1)*G**2*gVd33*sw)/(288.*cw*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_150_44 = Coupling(name = 'R2GC_150_44',
+                       value = '-(cw*ee*complex(0,1)*G**2*gAu22)/(96.*cmath.pi**2*sw) + (cw*ee*complex(0,1)*G**2*gVu22)/(96.*cmath.pi**2*sw) - (ee*complex(0,1)*G**2*gAu22*sw)/(96.*cw*cmath.pi**2) - (5*ee*complex(0,1)*G**2*gVu22*sw)/(288.*cw*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_150_45 = Coupling(name = 'R2GC_150_45',
+                       value = '(cw*ee*complex(0,1)*G**2*gAd11)/(96.*cmath.pi**2*sw) - (cw*ee*complex(0,1)*G**2*gVd11)/(96.*cmath.pi**2*sw) + (ee*complex(0,1)*G**2*gAd11*sw)/(96.*cw*cmath.pi**2) + (ee*complex(0,1)*G**2*gVd11*sw)/(288.*cw*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_150_46 = Coupling(name = 'R2GC_150_46',
+                       value = '(cw*ee*complex(0,1)*G**2*gAd22)/(96.*cmath.pi**2*sw) - (cw*ee*complex(0,1)*G**2*gVd22)/(96.*cmath.pi**2*sw) + (ee*complex(0,1)*G**2*gAd22*sw)/(96.*cw*cmath.pi**2) + (ee*complex(0,1)*G**2*gVd22*sw)/(288.*cw*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_150_47 = Coupling(name = 'R2GC_150_47',
+                       value = '-(cw*ee*complex(0,1)*G**2*gAu33)/(96.*cmath.pi**2*sw) + (cw*ee*complex(0,1)*G**2*gVu33)/(96.*cmath.pi**2*sw) - (ee*complex(0,1)*G**2*gAu33*sw)/(96.*cw*cmath.pi**2) - (5*ee*complex(0,1)*G**2*gVu33*sw)/(288.*cw*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_150_48 = Coupling(name = 'R2GC_150_48',
+                       value = '-(cw*ee*complex(0,1)*G**2*gAu11)/(96.*cmath.pi**2*sw) + (cw*ee*complex(0,1)*G**2*gVu11)/(96.*cmath.pi**2*sw) - (ee*complex(0,1)*G**2*gAu11*sw)/(96.*cw*cmath.pi**2) - (5*ee*complex(0,1)*G**2*gVu11*sw)/(288.*cw*cmath.pi**2)',
+                       order = {'DMV':1,'QCD':2,'QED':1})
+
+R2GC_151_49 = Coupling(name = 'R2GC_151_49',
+                       value = '(ee**2*complex(0,1)*G**2)/(288.*cmath.pi**2) + (cw**2*ee**2*complex(0,1)*G**2)/(192.*cmath.pi**2*sw**2) + (5*ee**2*complex(0,1)*G**2*sw**2)/(1728.*cw**2*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_151_50 = Coupling(name = 'R2GC_151_50',
+                       value = '-(ee**2*complex(0,1)*G**2)/(288.*cmath.pi**2) + (cw**2*ee**2*complex(0,1)*G**2)/(192.*cmath.pi**2*sw**2) + (17*ee**2*complex(0,1)*G**2*sw**2)/(1728.*cw**2*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_152_51 = Coupling(name = 'R2GC_152_51',
+                       value = '-(complex(0,1)*G**2*MB*yb)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'QCD':2,'QED':1})
+
+R2GC_152_52 = Coupling(name = 'R2GC_152_52',
+                       value = '-(complex(0,1)*G**2*MC*yc)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'QCD':2,'QED':1})
+
+R2GC_152_53 = Coupling(name = 'R2GC_152_53',
+                       value = '-(complex(0,1)*G**2*MD*ydo)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'QCD':2,'QED':1})
+
+R2GC_152_54 = Coupling(name = 'R2GC_152_54',
+                       value = '-(complex(0,1)*G**2*MS*ys)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'QCD':2,'QED':1})
+
+R2GC_152_55 = Coupling(name = 'R2GC_152_55',
+                       value = '-(complex(0,1)*G**2*MT*yt)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'QCD':2,'QED':1})
+
+R2GC_152_56 = Coupling(name = 'R2GC_152_56',
+                       value = '-(complex(0,1)*G**2*MU*yup)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'QCD':2,'QED':1})
+
+R2GC_153_57 = Coupling(name = 'R2GC_153_57',
+                       value = '(complex(0,1)*G**2*gSd33*MB*yb)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_153_58 = Coupling(name = 'R2GC_153_58',
+                       value = '(complex(0,1)*G**2*gSu22*MC*yc)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_153_59 = Coupling(name = 'R2GC_153_59',
+                       value = '(complex(0,1)*G**2*gSd11*MD*ydo)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_153_60 = Coupling(name = 'R2GC_153_60',
+                       value = '(complex(0,1)*G**2*gSd22*MS*ys)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_153_61 = Coupling(name = 'R2GC_153_61',
+                       value = '(complex(0,1)*G**2*gSu33*MT*yt)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_153_62 = Coupling(name = 'R2GC_153_62',
+                       value = '(complex(0,1)*G**2*gSu11*MU*yup)/(8.*cmath.pi**2*cmath.sqrt(2))',
+                       order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_154_63 = Coupling(name = 'R2GC_154_63',
+                       value = '-(complex(0,1)*G**2*yb**2)/(16.*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_154_64 = Coupling(name = 'R2GC_154_64',
+                       value = '-(complex(0,1)*G**2*yc**2)/(16.*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_154_65 = Coupling(name = 'R2GC_154_65',
+                       value = '-(complex(0,1)*G**2*ydo**2)/(16.*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_154_66 = Coupling(name = 'R2GC_154_66',
+                       value = '-(complex(0,1)*G**2*ys**2)/(16.*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_154_67 = Coupling(name = 'R2GC_154_67',
+                       value = '-(complex(0,1)*G**2*yt**2)/(16.*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_154_68 = Coupling(name = 'R2GC_154_68',
+                       value = '-(complex(0,1)*G**2*yup**2)/(16.*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_155_69 = Coupling(name = 'R2GC_155_69',
+                       value = '(complex(0,1)*G**2*gPd33*yb**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_155_70 = Coupling(name = 'R2GC_155_70',
+                       value = '-(complex(0,1)*G**2*gPu22*yc**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_155_71 = Coupling(name = 'R2GC_155_71',
+                       value = '(complex(0,1)*G**2*gPd11*ydo**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_155_72 = Coupling(name = 'R2GC_155_72',
+                       value = '(complex(0,1)*G**2*gPd22*ys**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_155_73 = Coupling(name = 'R2GC_155_73',
+                       value = '-(complex(0,1)*G**2*gPu33*yt**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_155_74 = Coupling(name = 'R2GC_155_74',
+                       value = '-(complex(0,1)*G**2*gPu11*yup**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_156_75 = Coupling(name = 'R2GC_156_75',
+                       value = '(complex(0,1)*G**2*gSd33*yb**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_156_76 = Coupling(name = 'R2GC_156_76',
+                       value = '(complex(0,1)*G**2*gSu22*yc**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_156_77 = Coupling(name = 'R2GC_156_77',
+                       value = '(complex(0,1)*G**2*gSd11*ydo**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_156_78 = Coupling(name = 'R2GC_156_78',
+                       value = '(complex(0,1)*G**2*gSd22*ys**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_156_79 = Coupling(name = 'R2GC_156_79',
+                       value = '(complex(0,1)*G**2*gSu33*yt**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_156_80 = Coupling(name = 'R2GC_156_80',
+                       value = '(complex(0,1)*G**2*gSu11*yup**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':1,'QCD':2,'QED':2})
+
+R2GC_157_81 = Coupling(name = 'R2GC_157_81',
+                       value = '-(complex(0,1)*G**2*gPd33**2*yb**2)/(16.*cmath.pi**2) - (complex(0,1)*G**2*gSd33**2*yb**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':2,'QCD':2,'QED':2})
+
+R2GC_157_82 = Coupling(name = 'R2GC_157_82',
+                       value = '-(complex(0,1)*G**2*gPu22**2*yc**2)/(16.*cmath.pi**2) - (complex(0,1)*G**2*gSu22**2*yc**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':2,'QCD':2,'QED':2})
+
+R2GC_157_83 = Coupling(name = 'R2GC_157_83',
+                       value = '-(complex(0,1)*G**2*gPd11**2*ydo**2)/(16.*cmath.pi**2) - (complex(0,1)*G**2*gSd11**2*ydo**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':2,'QCD':2,'QED':2})
+
+R2GC_157_84 = Coupling(name = 'R2GC_157_84',
+                       value = '-(complex(0,1)*G**2*gPd22**2*ys**2)/(16.*cmath.pi**2) - (complex(0,1)*G**2*gSd22**2*ys**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':2,'QCD':2,'QED':2})
+
+R2GC_157_85 = Coupling(name = 'R2GC_157_85',
+                       value = '-(complex(0,1)*G**2*gPu33**2*yt**2)/(16.*cmath.pi**2) - (complex(0,1)*G**2*gSu33**2*yt**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':2,'QCD':2,'QED':2})
+
+R2GC_157_86 = Coupling(name = 'R2GC_157_86',
+                       value = '-(complex(0,1)*G**2*gPu11**2*yup**2)/(16.*cmath.pi**2) - (complex(0,1)*G**2*gSu11**2*yup**2)/(16.*cmath.pi**2)',
+                       order = {'DMS':2,'QCD':2,'QED':2})
+
+R2GC_158_87 = Coupling(name = 'R2GC_158_87',
+                       value = '(ee**2*complex(0,1)*G**2)/(96.*cmath.pi**2*sw**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_158_88 = Coupling(name = 'R2GC_158_88',
+                       value = '(CKM2x1*ee**2*complex(0,1)*G**2*complexconjugate(CKM2x1))/(96.*cmath.pi**2*sw**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_158_89 = Coupling(name = 'R2GC_158_89',
+                       value = '(CKM2x2*ee**2*complex(0,1)*G**2*complexconjugate(CKM2x2))/(96.*cmath.pi**2*sw**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_158_90 = Coupling(name = 'R2GC_158_90',
+                       value = '(CKM1x1*ee**2*complex(0,1)*G**2*complexconjugate(CKM1x1))/(96.*cmath.pi**2*sw**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_158_91 = Coupling(name = 'R2GC_158_91',
+                       value = '(CKM1x2*ee**2*complex(0,1)*G**2*complexconjugate(CKM1x2))/(96.*cmath.pi**2*sw**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_159_92 = Coupling(name = 'R2GC_159_92',
+                       value = '-(complex(0,1)*G**2*yb**2)/(16.*cmath.pi**2) - (complex(0,1)*G**2*yt**2)/(16.*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_159_93 = Coupling(name = 'R2GC_159_93',
+                       value = '-(CKM2x1*complex(0,1)*G**2*yc**2*complexconjugate(CKM2x1))/(16.*cmath.pi**2) - (CKM2x1*complex(0,1)*G**2*ydo**2*complexconjugate(CKM2x1))/(16.*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_159_94 = Coupling(name = 'R2GC_159_94',
+                       value = '-(CKM2x2*complex(0,1)*G**2*yc**2*complexconjugate(CKM2x2))/(16.*cmath.pi**2) - (CKM2x2*complex(0,1)*G**2*ys**2*complexconjugate(CKM2x2))/(16.*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_159_95 = Coupling(name = 'R2GC_159_95',
+                       value = '-(CKM1x1*complex(0,1)*G**2*ydo**2*complexconjugate(CKM1x1))/(16.*cmath.pi**2) - (CKM1x1*complex(0,1)*G**2*yup**2*complexconjugate(CKM1x1))/(16.*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_159_96 = Coupling(name = 'R2GC_159_96',
+                       value = '-(CKM1x2*complex(0,1)*G**2*ys**2*complexconjugate(CKM1x2))/(16.*cmath.pi**2) - (CKM1x2*complex(0,1)*G**2*yup**2*complexconjugate(CKM1x2))/(16.*cmath.pi**2)',
+                       order = {'QCD':2,'QED':2})
+
+R2GC_163_97 = Coupling(name = 'R2GC_163_97',
+                       value = '-G**4/(192.*cmath.pi**2)',
+                       order = {'QCD':4})
+
+R2GC_163_98 = Coupling(name = 'R2GC_163_98',
+                       value = 'G**4/(64.*cmath.pi**2)',
+                       order = {'QCD':4})
+
+R2GC_164_99 = Coupling(name = 'R2GC_164_99',
+                       value = '-(complex(0,1)*G**4)/(192.*cmath.pi**2)',
+                       order = {'QCD':4})
+
+R2GC_164_100 = Coupling(name = 'R2GC_164_100',
+                        value = '(complex(0,1)*G**4)/(64.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_165_101 = Coupling(name = 'R2GC_165_101',
+                        value = '(complex(0,1)*G**4)/(192.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_165_102 = Coupling(name = 'R2GC_165_102',
+                        value = '-(complex(0,1)*G**4)/(64.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_166_103 = Coupling(name = 'R2GC_166_103',
+                        value = '-(complex(0,1)*G**4)/(48.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_167_104 = Coupling(name = 'R2GC_167_104',
+                        value = '(complex(0,1)*G**4)/(288.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_167_105 = Coupling(name = 'R2GC_167_105',
+                        value = '-(complex(0,1)*G**4)/(32.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_168_106 = Coupling(name = 'R2GC_168_106',
+                        value = '-(complex(0,1)*G**4)/(16.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_168_107 = Coupling(name = 'R2GC_168_107',
+                        value = '(complex(0,1)*G**4)/(4.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_169_108 = Coupling(name = 'R2GC_169_108',
+                        value = '(-3*complex(0,1)*G**4)/(64.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_169_109 = Coupling(name = 'R2GC_169_109',
+                        value = '(-23*complex(0,1)*G**4)/(64.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_170_110 = Coupling(name = 'R2GC_170_110',
+                        value = '(ee*complex(0,1)*G**2)/(18.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_171_111 = Coupling(name = 'R2GC_171_111',
+                        value = '-(complex(0,1)*G**3)/(6.*cmath.pi**2)',
+                        order = {'QCD':3})
+
+R2GC_172_112 = Coupling(name = 'R2GC_172_112',
+                        value = '-(ee*complex(0,1)*G**2)/(9.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_182_113 = Coupling(name = 'R2GC_182_113',
+                        value = '(complex(0,1)*G**2)/(12.*cmath.pi**2)',
+                        order = {'QCD':2})
+
+R2GC_185_114 = Coupling(name = 'R2GC_185_114',
+                        value = '(complex(0,1)*G**2*gAd33)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_186_115 = Coupling(name = 'R2GC_186_115',
+                        value = '-(complex(0,1)*G**2*gVd33)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_187_116 = Coupling(name = 'R2GC_187_116',
+                        value = '(complex(0,1)*G**2*MB)/(6.*cmath.pi**2)',
+                        order = {'QCD':2})
+
+R2GC_188_117 = Coupling(name = 'R2GC_188_117',
+                        value = '(cw*ee*complex(0,1)*G**2)/(12.*cmath.pi**2*sw)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_189_118 = Coupling(name = 'R2GC_189_118',
+                        value = '(ee*complex(0,1)*G**2*sw)/(36.*cw*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_190_119 = Coupling(name = 'R2GC_190_119',
+                        value = '(complex(0,1)*G**2*yb)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_191_120 = Coupling(name = 'R2GC_191_120',
+                        value = '-(G**2*yb)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_192_121 = Coupling(name = 'R2GC_192_121',
+                        value = '-(G**2*gPd33*yb)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_193_122 = Coupling(name = 'R2GC_193_122',
+                        value = '-(complex(0,1)*G**2*gSd33*yb)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_197_123 = Coupling(name = 'R2GC_197_123',
+                        value = '(complex(0,1)*G**2*gAu22)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_198_124 = Coupling(name = 'R2GC_198_124',
+                        value = '-(complex(0,1)*G**2*gVu22)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_199_125 = Coupling(name = 'R2GC_199_125',
+                        value = '(complex(0,1)*G**2*MC)/(6.*cmath.pi**2)',
+                        order = {'QCD':2})
+
+R2GC_200_126 = Coupling(name = 'R2GC_200_126',
+                        value = '-(cw*ee*complex(0,1)*G**2)/(12.*cmath.pi**2*sw)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_202_127 = Coupling(name = 'R2GC_202_127',
+                        value = '(G**2*yc)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_203_128 = Coupling(name = 'R2GC_203_128',
+                        value = '(complex(0,1)*G**2*yc)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_204_129 = Coupling(name = 'R2GC_204_129',
+                        value = '-(G**2*gPu22*yc)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_205_130 = Coupling(name = 'R2GC_205_130',
+                        value = '-(complex(0,1)*G**2*gSu22*yc)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_209_131 = Coupling(name = 'R2GC_209_131',
+                        value = '(complex(0,1)*G**2*gAd11)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_210_132 = Coupling(name = 'R2GC_210_132',
+                        value = '-(complex(0,1)*G**2*gVd11)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_211_133 = Coupling(name = 'R2GC_211_133',
+                        value = '(complex(0,1)*G**2*MD)/(6.*cmath.pi**2)',
+                        order = {'QCD':2})
+
+R2GC_212_134 = Coupling(name = 'R2GC_212_134',
+                        value = '-(CKM2x1*ee*complex(0,1)*G**2)/(6.*cmath.pi**2*sw*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_215_135 = Coupling(name = 'R2GC_215_135',
+                        value = '-(CKM2x1*G**2*yc)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_216_136 = Coupling(name = 'R2GC_216_136',
+                        value = '(complex(0,1)*G**2*ydo)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_217_137 = Coupling(name = 'R2GC_217_137',
+                        value = '-(G**2*ydo)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_218_138 = Coupling(name = 'R2GC_218_138',
+                        value = '(CKM2x1*G**2*ydo)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_219_139 = Coupling(name = 'R2GC_219_139',
+                        value = '-(G**2*gPd11*ydo)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_220_140 = Coupling(name = 'R2GC_220_140',
+                        value = '-(complex(0,1)*G**2*gSd11*ydo)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_221_141 = Coupling(name = 'R2GC_221_141',
+                        value = '-(ee*complex(0,1)*G**2*complexconjugate(CKM2x1))/(6.*cmath.pi**2*sw*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_222_142 = Coupling(name = 'R2GC_222_142',
+                        value = '(G**2*yc*complexconjugate(CKM2x1))/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_223_143 = Coupling(name = 'R2GC_223_143',
+                        value = '-(G**2*ydo*complexconjugate(CKM2x1))/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_227_144 = Coupling(name = 'R2GC_227_144',
+                        value = '(complex(0,1)*G**2*gAd22)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_228_145 = Coupling(name = 'R2GC_228_145',
+                        value = '-(complex(0,1)*G**2*gVd22)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_229_146 = Coupling(name = 'R2GC_229_146',
+                        value = '(complex(0,1)*G**2*MS)/(6.*cmath.pi**2)',
+                        order = {'QCD':2})
+
+R2GC_230_147 = Coupling(name = 'R2GC_230_147',
+                        value = '-(CKM2x2*ee*complex(0,1)*G**2)/(6.*cmath.pi**2*sw*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_233_148 = Coupling(name = 'R2GC_233_148',
+                        value = '-(CKM2x2*G**2*yc)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_234_149 = Coupling(name = 'R2GC_234_149',
+                        value = '(complex(0,1)*G**2*ys)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_235_150 = Coupling(name = 'R2GC_235_150',
+                        value = '-(G**2*ys)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_236_151 = Coupling(name = 'R2GC_236_151',
+                        value = '(CKM2x2*G**2*ys)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_237_152 = Coupling(name = 'R2GC_237_152',
+                        value = '-(G**2*gPd22*ys)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_238_153 = Coupling(name = 'R2GC_238_153',
+                        value = '-(complex(0,1)*G**2*gSd22*ys)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_239_154 = Coupling(name = 'R2GC_239_154',
+                        value = '-(ee*complex(0,1)*G**2*complexconjugate(CKM2x2))/(6.*cmath.pi**2*sw*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_240_155 = Coupling(name = 'R2GC_240_155',
+                        value = '(G**2*yc*complexconjugate(CKM2x2))/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_241_156 = Coupling(name = 'R2GC_241_156',
+                        value = '-(G**2*ys*complexconjugate(CKM2x2))/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_245_157 = Coupling(name = 'R2GC_245_157',
+                        value = '(complex(0,1)*G**2*gAu33)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_246_158 = Coupling(name = 'R2GC_246_158',
+                        value = '-(complex(0,1)*G**2*gVu33)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_247_159 = Coupling(name = 'R2GC_247_159',
+                        value = '(complex(0,1)*G**2*MT)/(6.*cmath.pi**2)',
+                        order = {'QCD':2})
+
+R2GC_248_160 = Coupling(name = 'R2GC_248_160',
+                        value = '-(ee*complex(0,1)*G**2)/(6.*cmath.pi**2*sw*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_251_161 = Coupling(name = 'R2GC_251_161',
+                        value = '(G**2*yb)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_252_162 = Coupling(name = 'R2GC_252_162',
+                        value = '-(G**2*yb)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_253_163 = Coupling(name = 'R2GC_253_163',
+                        value = '(G**2*yt)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_254_164 = Coupling(name = 'R2GC_254_164',
+                        value = '-(G**2*yt)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_255_165 = Coupling(name = 'R2GC_255_165',
+                        value = '(G**2*yt)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_256_166 = Coupling(name = 'R2GC_256_166',
+                        value = '(complex(0,1)*G**2*yt)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_257_167 = Coupling(name = 'R2GC_257_167',
+                        value = '-(G**2*gPu33*yt)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_258_168 = Coupling(name = 'R2GC_258_168',
+                        value = '-(complex(0,1)*G**2*gSu33*yt)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_260_169 = Coupling(name = 'R2GC_260_169',
+                        value = 'G**3/(24.*cmath.pi**2)',
+                        order = {'QCD':3})
+
+R2GC_260_170 = Coupling(name = 'R2GC_260_170',
+                        value = '(11*G**3)/(64.*cmath.pi**2)',
+                        order = {'QCD':3})
+
+R2GC_261_171 = Coupling(name = 'R2GC_261_171',
+                        value = '(31*complex(0,1)*G**4)/(64.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_262_172 = Coupling(name = 'R2GC_262_172',
+                        value = '(5*complex(0,1)*G**4)/(48.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_262_173 = Coupling(name = 'R2GC_262_173',
+                        value = '(19*complex(0,1)*G**4)/(32.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_263_174 = Coupling(name = 'R2GC_263_174',
+                        value = '(23*complex(0,1)*G**4)/(192.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_264_175 = Coupling(name = 'R2GC_264_175',
+                        value = '(7*complex(0,1)*G**4)/(64.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_265_176 = Coupling(name = 'R2GC_265_176',
+                        value = '(-17*complex(0,1)*G**4)/(64.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_266_177 = Coupling(name = 'R2GC_266_177',
+                        value = '(-7*complex(0,1)*G**4)/(32.*cmath.pi**2)',
+                        order = {'QCD':4})
+
+R2GC_270_178 = Coupling(name = 'R2GC_270_178',
+                        value = '(complex(0,1)*G**2*gAu11)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_271_179 = Coupling(name = 'R2GC_271_179',
+                        value = '-(complex(0,1)*G**2*gVu11)/(6.*cmath.pi**2)',
+                        order = {'DMV':1,'QCD':2})
+
+R2GC_272_180 = Coupling(name = 'R2GC_272_180',
+                        value = '(complex(0,1)*G**2*MU)/(6.*cmath.pi**2)',
+                        order = {'QCD':2})
+
+R2GC_273_181 = Coupling(name = 'R2GC_273_181',
+                        value = '-(CKM1x1*ee*complex(0,1)*G**2)/(6.*cmath.pi**2*sw*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_274_182 = Coupling(name = 'R2GC_274_182',
+                        value = '-(CKM1x2*ee*complex(0,1)*G**2)/(6.*cmath.pi**2*sw*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_277_183 = Coupling(name = 'R2GC_277_183',
+                        value = '(CKM1x1*G**2*ydo)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_278_184 = Coupling(name = 'R2GC_278_184',
+                        value = '(CKM1x2*G**2*ys)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_279_185 = Coupling(name = 'R2GC_279_185',
+                        value = '(G**2*yup)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_280_186 = Coupling(name = 'R2GC_280_186',
+                        value = '(complex(0,1)*G**2*yup)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_281_187 = Coupling(name = 'R2GC_281_187',
+                        value = '-(CKM1x1*G**2*yup)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_282_188 = Coupling(name = 'R2GC_282_188',
+                        value = '-(CKM1x2*G**2*yup)/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_283_189 = Coupling(name = 'R2GC_283_189',
+                        value = '-(G**2*gPu11*yup)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_284_190 = Coupling(name = 'R2GC_284_190',
+                        value = '-(complex(0,1)*G**2*gSu11*yup)/(3.*cmath.pi**2*cmath.sqrt(2))',
+                        order = {'DMS':1,'QCD':2,'QED':1})
+
+R2GC_285_191 = Coupling(name = 'R2GC_285_191',
+                        value = '-(ee*complex(0,1)*G**2*complexconjugate(CKM1x1))/(6.*cmath.pi**2*sw*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_286_192 = Coupling(name = 'R2GC_286_192',
+                        value = '-(G**2*ydo*complexconjugate(CKM1x1))/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_287_193 = Coupling(name = 'R2GC_287_193',
+                        value = '(G**2*yup*complexconjugate(CKM1x1))/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_288_194 = Coupling(name = 'R2GC_288_194',
+                        value = '-(ee*complex(0,1)*G**2*complexconjugate(CKM1x2))/(6.*cmath.pi**2*sw*cmath.sqrt(2))',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_289_195 = Coupling(name = 'R2GC_289_195',
+                        value = '-(G**2*ys*complexconjugate(CKM1x2))/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+R2GC_290_196 = Coupling(name = 'R2GC_290_196',
+                        value = '(G**2*yup*complexconjugate(CKM1x2))/(3.*cmath.pi**2)',
+                        order = {'QCD':2,'QED':1})
+
+UVGC_160_1 = Coupling(name = 'UVGC_160_1',
+                      value = {-1:'(51*G**3)/(128.*cmath.pi**2)'},
+                      order = {'QCD':3})
+
+UVGC_161_2 = Coupling(name = 'UVGC_161_2',
+                      value = {-1:'G**3/(128.*cmath.pi**2)'},
+                      order = {'QCD':3})
+
+UVGC_162_3 = Coupling(name = 'UVGC_162_3',
+                      value = {-1:'(3*complex(0,1)*G**2)/(64.*cmath.pi**2)'},
+                      order = {'QCD':2})
+
+UVGC_162_4 = Coupling(name = 'UVGC_162_4',
+                      value = {-1:'(-3*complex(0,1)*G**2)/(64.*cmath.pi**2)'},
+                      order = {'QCD':2})
+
+UVGC_163_5 = Coupling(name = 'UVGC_163_5',
+                      value = {-1:'(3*G**4)/(512.*cmath.pi**2)'},
+                      order = {'QCD':4})
+
+UVGC_163_6 = Coupling(name = 'UVGC_163_6',
+                      value = {-1:'(-3*G**4)/(512.*cmath.pi**2)'},
+                      order = {'QCD':4})
+
+UVGC_164_7 = Coupling(name = 'UVGC_164_7',
+                      value = {-1:'(3*complex(0,1)*G**4)/(512.*cmath.pi**2)'},
+                      order = {'QCD':4})
+
+UVGC_164_8 = Coupling(name = 'UVGC_164_8',
+                      value = {-1:'(-3*complex(0,1)*G**4)/(512.*cmath.pi**2)'},
+                      order = {'QCD':4})
+
+UVGC_166_9 = Coupling(name = 'UVGC_166_9',
+                      value = {-1:'-(complex(0,1)*G**4)/(128.*cmath.pi**2)'},
+                      order = {'QCD':4})
+
+UVGC_166_10 = Coupling(name = 'UVGC_166_10',
+                       value = {-1:'(complex(0,1)*G**4)/(128.*cmath.pi**2)'},
+                       order = {'QCD':4})
+
+UVGC_167_11 = Coupling(name = 'UVGC_167_11',
+                       value = {-1:'(-3*complex(0,1)*G**4)/(256.*cmath.pi**2)'},
+                       order = {'QCD':4})
+
+UVGC_167_12 = Coupling(name = 'UVGC_167_12',
+                       value = {-1:'(3*complex(0,1)*G**4)/(256.*cmath.pi**2)'},
+                       order = {'QCD':4})
+
+UVGC_168_13 = Coupling(name = 'UVGC_168_13',
+                       value = {-1:'-(complex(0,1)*G**4)/(24.*cmath.pi**2)'},
+                       order = {'QCD':4})
+
+UVGC_168_14 = Coupling(name = 'UVGC_168_14',
+                       value = {-1:'(47*complex(0,1)*G**4)/(128.*cmath.pi**2)'},
+                       order = {'QCD':4})
+
+UVGC_169_15 = Coupling(name = 'UVGC_169_15',
+                       value = {-1:'(-253*complex(0,1)*G**4)/(512.*cmath.pi**2)'},
+                       order = {'QCD':4})
+
+UVGC_169_16 = Coupling(name = 'UVGC_169_16',
+                       value = {-1:'(5*complex(0,1)*G**4)/(512.*cmath.pi**2)'},
+                       order = {'QCD':4})
+
+UVGC_170_17 = Coupling(name = 'UVGC_170_17',
+                       value = {-1:'(ee*complex(0,1)*G**2)/(36.*cmath.pi**2)'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_171_18 = Coupling(name = 'UVGC_171_18',
+                       value = {-1:'(-13*complex(0,1)*G**3)/(48.*cmath.pi**2)'},
+                       order = {'QCD':3})
+
+UVGC_172_19 = Coupling(name = 'UVGC_172_19',
+                       value = {-1:'-(ee*complex(0,1)*G**2)/(18.*cmath.pi**2)'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_182_20 = Coupling(name = 'UVGC_182_20',
+                       value = {-1:'( (complex(0,1)*G**2)/(6.*cmath.pi**2) if MB else -(complex(0,1)*G**2)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2)/(12.*cmath.pi**2)',0:'( (5*complex(0,1)*G**2)/(12.*cmath.pi**2) - (complex(0,1)*G**2*reglog(MB/MU_R))/(2.*cmath.pi**2) if MB else (complex(0,1)*G**2)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2)/(12.*cmath.pi**2)'},
+                       order = {'QCD':2})
+
+UVGC_183_21 = Coupling(name = 'UVGC_183_21',
+                       value = {-1:'( (ee*complex(0,1)*G**2)/(18.*cmath.pi**2) if MB else -(ee*complex(0,1)*G**2)/(36.*cmath.pi**2) )',0:'( (5*ee*complex(0,1)*G**2)/(36.*cmath.pi**2) - (ee*complex(0,1)*G**2*reglog(MB/MU_R))/(6.*cmath.pi**2) if MB else (ee*complex(0,1)*G**2)/(36.*cmath.pi**2) ) - (ee*complex(0,1)*G**2)/(36.*cmath.pi**2)'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_184_22 = Coupling(name = 'UVGC_184_22',
+                       value = {-1:'( 0 if MB else (complex(0,1)*G**3)/(48.*cmath.pi**2) )'},
+                       order = {'QCD':3})
+
+UVGC_184_23 = Coupling(name = 'UVGC_184_23',
+                       value = {-1:'( 0 if MC else (complex(0,1)*G**3)/(48.*cmath.pi**2) )'},
+                       order = {'QCD':3})
+
+UVGC_184_24 = Coupling(name = 'UVGC_184_24',
+                       value = {-1:'( 0 if MD else (complex(0,1)*G**3)/(48.*cmath.pi**2) )'},
+                       order = {'QCD':3})
+
+UVGC_184_25 = Coupling(name = 'UVGC_184_25',
+                       value = {-1:'(-19*complex(0,1)*G**3)/(128.*cmath.pi**2)'},
+                       order = {'QCD':3})
+
+UVGC_184_26 = Coupling(name = 'UVGC_184_26',
+                       value = {-1:'-(complex(0,1)*G**3)/(128.*cmath.pi**2)'},
+                       order = {'QCD':3})
+
+UVGC_184_27 = Coupling(name = 'UVGC_184_27',
+                       value = {-1:'( 0 if MS else (complex(0,1)*G**3)/(48.*cmath.pi**2) )'},
+                       order = {'QCD':3})
+
+UVGC_184_28 = Coupling(name = 'UVGC_184_28',
+                       value = {-1:'( 0 if MT else (complex(0,1)*G**3)/(48.*cmath.pi**2) )'},
+                       order = {'QCD':3})
+
+UVGC_184_29 = Coupling(name = 'UVGC_184_29',
+                       value = {-1:'( 0 if MU else (complex(0,1)*G**3)/(48.*cmath.pi**2) )'},
+                       order = {'QCD':3})
+
+UVGC_184_30 = Coupling(name = 'UVGC_184_30',
+                       value = {-1:'( -(complex(0,1)*G**3)/(6.*cmath.pi**2) if MB else (complex(0,1)*G**3)/(12.*cmath.pi**2) )',0:'( (-5*complex(0,1)*G**3)/(12.*cmath.pi**2) + (complex(0,1)*G**3*reglog(MB/MU_R))/(2.*cmath.pi**2) if MB else -(complex(0,1)*G**3)/(12.*cmath.pi**2) ) + (complex(0,1)*G**3)/(12.*cmath.pi**2)'},
+                       order = {'QCD':3})
+
+UVGC_185_31 = Coupling(name = 'UVGC_185_31',
+                       value = {-1:'( (complex(0,1)*G**2*gAd33)/(6.*cmath.pi**2) if MB else -(complex(0,1)*G**2*gAd33)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2*gAd33)/(12.*cmath.pi**2)',0:'( (5*complex(0,1)*G**2*gAd33)/(12.*cmath.pi**2) - (complex(0,1)*G**2*gAd33*reglog(MB/MU_R))/(2.*cmath.pi**2) if MB else (complex(0,1)*G**2*gAd33)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2*gAd33)/(12.*cmath.pi**2)'},
+                       order = {'DMV':1,'QCD':2})
+
+UVGC_186_32 = Coupling(name = 'UVGC_186_32',
+                       value = {-1:'( -(complex(0,1)*G**2*gVd33)/(6.*cmath.pi**2) if MB else (complex(0,1)*G**2*gVd33)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2*gVd33)/(12.*cmath.pi**2)',0:'( (-5*complex(0,1)*G**2*gVd33)/(12.*cmath.pi**2) + (complex(0,1)*G**2*gVd33*reglog(MB/MU_R))/(2.*cmath.pi**2) if MB else -(complex(0,1)*G**2*gVd33)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2*gVd33)/(12.*cmath.pi**2)'},
+                       order = {'DMV':1,'QCD':2})
+
+UVGC_187_33 = Coupling(name = 'UVGC_187_33',
+                       value = {-1:'( (complex(0,1)*G**2*MB)/(6.*cmath.pi**2) if MB else -(complex(0,1)*G**2*MB)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2*MB)/(3.*cmath.pi**2)',0:'( (3*complex(0,1)*G**2*MB)/(4.*cmath.pi**2) - (complex(0,1)*G**2*MB*reglog(MB/MU_R))/cmath.pi**2 if MB else (complex(0,1)*G**2*MB)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2*MB)/(12.*cmath.pi**2)'},
+                       order = {'QCD':2})
+
+UVGC_188_34 = Coupling(name = 'UVGC_188_34',
+                       value = {-1:'( (cw*ee*complex(0,1)*G**2)/(12.*cmath.pi**2*sw) if MB else -(cw*ee*complex(0,1)*G**2)/(24.*cmath.pi**2*sw) ) + (cw*ee*complex(0,1)*G**2)/(24.*cmath.pi**2*sw)',0:'( (5*cw*ee*complex(0,1)*G**2)/(24.*cmath.pi**2*sw) - (cw*ee*complex(0,1)*G**2*reglog(MB/MU_R))/(4.*cmath.pi**2*sw) if MB else (cw*ee*complex(0,1)*G**2)/(24.*cmath.pi**2*sw) ) - (cw*ee*complex(0,1)*G**2)/(24.*cmath.pi**2*sw)'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_189_35 = Coupling(name = 'UVGC_189_35',
+                       value = {-1:'( (ee*complex(0,1)*G**2*sw)/(36.*cw*cmath.pi**2) if MB else -(ee*complex(0,1)*G**2*sw)/(72.*cw*cmath.pi**2) ) + (ee*complex(0,1)*G**2*sw)/(72.*cw*cmath.pi**2)',0:'( (5*ee*complex(0,1)*G**2*sw)/(72.*cw*cmath.pi**2) - (ee*complex(0,1)*G**2*sw*reglog(MB/MU_R))/(12.*cw*cmath.pi**2) if MB else (ee*complex(0,1)*G**2*sw)/(72.*cw*cmath.pi**2) ) - (ee*complex(0,1)*G**2*sw)/(72.*cw*cmath.pi**2)'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_190_36 = Coupling(name = 'UVGC_190_36',
+                       value = {-1:'( (complex(0,1)*G**2*yb)/(6.*cmath.pi**2*cmath.sqrt(2)) if MB else -(complex(0,1)*G**2*yb)/(12.*cmath.pi**2*cmath.sqrt(2)) ) + (complex(0,1)*G**2*yb)/(3.*cmath.pi**2*cmath.sqrt(2))',0:'( (3*complex(0,1)*G**2*yb)/(4.*cmath.pi**2*cmath.sqrt(2)) - (complex(0,1)*G**2*yb*reglog(MB/MU_R))/(cmath.pi**2*cmath.sqrt(2)) if MB else (complex(0,1)*G**2*yb)/(12.*cmath.pi**2*cmath.sqrt(2)) ) - (complex(0,1)*G**2*yb)/(12.*cmath.pi**2*cmath.sqrt(2))'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_191_37 = Coupling(name = 'UVGC_191_37',
+                       value = {-1:'( -(G**2*yb)/(6.*cmath.pi**2*cmath.sqrt(2)) if MB else (G**2*yb)/(12.*cmath.pi**2*cmath.sqrt(2)) ) - (G**2*yb)/(3.*cmath.pi**2*cmath.sqrt(2))',0:'( (-3*G**2*yb)/(4.*cmath.pi**2*cmath.sqrt(2)) + (G**2*yb*reglog(MB/MU_R))/(cmath.pi**2*cmath.sqrt(2)) if MB else -(G**2*yb)/(12.*cmath.pi**2*cmath.sqrt(2)) ) + (G**2*yb)/(12.*cmath.pi**2*cmath.sqrt(2))'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_192_38 = Coupling(name = 'UVGC_192_38',
+                       value = {-1:'( -(G**2*gPd33*yb)/(6.*cmath.pi**2*cmath.sqrt(2)) if MB else (G**2*gPd33*yb)/(12.*cmath.pi**2*cmath.sqrt(2)) ) - (G**2*gPd33*yb)/(3.*cmath.pi**2*cmath.sqrt(2))',0:'( (-5*G**2*gPd33*yb)/(12.*cmath.pi**2*cmath.sqrt(2)) + (G**2*gPd33*yb*reglog(MB/MU_R))/(2.*cmath.pi**2*cmath.sqrt(2)) if MB else -(G**2*gPd33*yb)/(12.*cmath.pi**2*cmath.sqrt(2)) ) + (G**2*gPd33*yb)/(12.*cmath.pi**2*cmath.sqrt(2))'},
+                       order = {'DMS':1,'QCD':2,'QED':1})
+
+UVGC_193_39 = Coupling(name = 'UVGC_193_39',
+                       value = {-1:'( -(complex(0,1)*G**2*gSd33*yb)/(6.*cmath.pi**2*cmath.sqrt(2)) if MB else (complex(0,1)*G**2*gSd33*yb)/(12.*cmath.pi**2*cmath.sqrt(2)) ) - (complex(0,1)*G**2*gSd33*yb)/(3.*cmath.pi**2*cmath.sqrt(2))',0:'( (-5*complex(0,1)*G**2*gSd33*yb)/(12.*cmath.pi**2*cmath.sqrt(2)) + (complex(0,1)*G**2*gSd33*yb*reglog(MB/MU_R))/(2.*cmath.pi**2*cmath.sqrt(2)) if MB else -(complex(0,1)*G**2*gSd33*yb)/(12.*cmath.pi**2*cmath.sqrt(2)) ) + (complex(0,1)*G**2*gSd33*yb)/(12.*cmath.pi**2*cmath.sqrt(2))'},
+                       order = {'DMS':1,'QCD':2,'QED':1})
+
+UVGC_194_40 = Coupling(name = 'UVGC_194_40',
+                       value = {-1:'( (complex(0,1)*G**2)/(6.*cmath.pi**2) if MC else -(complex(0,1)*G**2)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2)/(12.*cmath.pi**2)',0:'( (5*complex(0,1)*G**2)/(12.*cmath.pi**2) - (complex(0,1)*G**2*reglog(MC/MU_R))/(2.*cmath.pi**2) if MC else (complex(0,1)*G**2)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2)/(12.*cmath.pi**2)'},
+                       order = {'QCD':2})
+
+UVGC_195_41 = Coupling(name = 'UVGC_195_41',
+                       value = {-1:'( -(ee*complex(0,1)*G**2)/(9.*cmath.pi**2) if MC else (ee*complex(0,1)*G**2)/(18.*cmath.pi**2) )',0:'( (-5*ee*complex(0,1)*G**2)/(18.*cmath.pi**2) + (ee*complex(0,1)*G**2*reglog(MC/MU_R))/(3.*cmath.pi**2) if MC else -(ee*complex(0,1)*G**2)/(18.*cmath.pi**2) ) + (ee*complex(0,1)*G**2)/(18.*cmath.pi**2)'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_196_42 = Coupling(name = 'UVGC_196_42',
+                       value = {-1:'( -(complex(0,1)*G**3)/(6.*cmath.pi**2) if MC else (complex(0,1)*G**3)/(12.*cmath.pi**2) )',0:'( (-5*complex(0,1)*G**3)/(12.*cmath.pi**2) + (complex(0,1)*G**3*reglog(MC/MU_R))/(2.*cmath.pi**2) if MC else -(complex(0,1)*G**3)/(12.*cmath.pi**2) ) + (complex(0,1)*G**3)/(12.*cmath.pi**2)'},
+                       order = {'QCD':3})
+
+UVGC_197_43 = Coupling(name = 'UVGC_197_43',
+                       value = {-1:'( (complex(0,1)*G**2*gAu22)/(6.*cmath.pi**2) if MC else -(complex(0,1)*G**2*gAu22)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2*gAu22)/(12.*cmath.pi**2)',0:'( (5*complex(0,1)*G**2*gAu22)/(12.*cmath.pi**2) - (complex(0,1)*G**2*gAu22*reglog(MC/MU_R))/(2.*cmath.pi**2) if MC else (complex(0,1)*G**2*gAu22)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2*gAu22)/(12.*cmath.pi**2)'},
+                       order = {'DMV':1,'QCD':2})
+
+UVGC_198_44 = Coupling(name = 'UVGC_198_44',
+                       value = {-1:'( -(complex(0,1)*G**2*gVu22)/(6.*cmath.pi**2) if MC else (complex(0,1)*G**2*gVu22)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2*gVu22)/(12.*cmath.pi**2)',0:'( (-5*complex(0,1)*G**2*gVu22)/(12.*cmath.pi**2) + (complex(0,1)*G**2*gVu22*reglog(MC/MU_R))/(2.*cmath.pi**2) if MC else -(complex(0,1)*G**2*gVu22)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2*gVu22)/(12.*cmath.pi**2)'},
+                       order = {'DMV':1,'QCD':2})
+
+UVGC_199_45 = Coupling(name = 'UVGC_199_45',
+                       value = {-1:'( (complex(0,1)*G**2*MC)/(6.*cmath.pi**2) if MC else -(complex(0,1)*G**2*MC)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2*MC)/(3.*cmath.pi**2)',0:'( (3*complex(0,1)*G**2*MC)/(4.*cmath.pi**2) - (complex(0,1)*G**2*MC*reglog(MC/MU_R))/cmath.pi**2 if MC else (complex(0,1)*G**2*MC)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2*MC)/(12.*cmath.pi**2)'},
+                       order = {'QCD':2})
+
+UVGC_200_46 = Coupling(name = 'UVGC_200_46',
+                       value = {-1:'( -(cw*ee*complex(0,1)*G**2)/(12.*cmath.pi**2*sw) if MC else (cw*ee*complex(0,1)*G**2)/(24.*cmath.pi**2*sw) ) - (cw*ee*complex(0,1)*G**2)/(24.*cmath.pi**2*sw)',0:'( (-5*cw*ee*complex(0,1)*G**2)/(24.*cmath.pi**2*sw) + (cw*ee*complex(0,1)*G**2*reglog(MC/MU_R))/(4.*cmath.pi**2*sw) if MC else -(cw*ee*complex(0,1)*G**2)/(24.*cmath.pi**2*sw) ) + (cw*ee*complex(0,1)*G**2)/(24.*cmath.pi**2*sw)'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_201_47 = Coupling(name = 'UVGC_201_47',
+                       value = {-1:'( (ee*complex(0,1)*G**2*sw)/(36.*cw*cmath.pi**2) if MC else -(ee*complex(0,1)*G**2*sw)/(72.*cw*cmath.pi**2) ) + (ee*complex(0,1)*G**2*sw)/(72.*cw*cmath.pi**2)',0:'( (5*ee*complex(0,1)*G**2*sw)/(72.*cw*cmath.pi**2) - (ee*complex(0,1)*G**2*sw*reglog(MC/MU_R))/(12.*cw*cmath.pi**2) if MC else (ee*complex(0,1)*G**2*sw)/(72.*cw*cmath.pi**2) ) - (ee*complex(0,1)*G**2*sw)/(72.*cw*cmath.pi**2)'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_202_48 = Coupling(name = 'UVGC_202_48',
+                       value = {-1:'( (G**2*yc)/(6.*cmath.pi**2*cmath.sqrt(2)) if MC else -(G**2*yc)/(12.*cmath.pi**2*cmath.sqrt(2)) ) + (G**2*yc)/(3.*cmath.pi**2*cmath.sqrt(2))',0:'( (3*G**2*yc)/(4.*cmath.pi**2*cmath.sqrt(2)) - (G**2*yc*reglog(MC/MU_R))/(cmath.pi**2*cmath.sqrt(2)) if MC else (G**2*yc)/(12.*cmath.pi**2*cmath.sqrt(2)) ) - (G**2*yc)/(12.*cmath.pi**2*cmath.sqrt(2))'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_203_49 = Coupling(name = 'UVGC_203_49',
+                       value = {-1:'( (complex(0,1)*G**2*yc)/(6.*cmath.pi**2*cmath.sqrt(2)) if MC else -(complex(0,1)*G**2*yc)/(12.*cmath.pi**2*cmath.sqrt(2)) ) + (complex(0,1)*G**2*yc)/(3.*cmath.pi**2*cmath.sqrt(2))',0:'( (3*complex(0,1)*G**2*yc)/(4.*cmath.pi**2*cmath.sqrt(2)) - (complex(0,1)*G**2*yc*reglog(MC/MU_R))/(cmath.pi**2*cmath.sqrt(2)) if MC else (complex(0,1)*G**2*yc)/(12.*cmath.pi**2*cmath.sqrt(2)) ) - (complex(0,1)*G**2*yc)/(12.*cmath.pi**2*cmath.sqrt(2))'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_204_50 = Coupling(name = 'UVGC_204_50',
+                       value = {-1:'( -(G**2*gPu22*yc)/(6.*cmath.pi**2*cmath.sqrt(2)) if MC else (G**2*gPu22*yc)/(12.*cmath.pi**2*cmath.sqrt(2)) ) - (G**2*gPu22*yc)/(3.*cmath.pi**2*cmath.sqrt(2))',0:'( (-5*G**2*gPu22*yc)/(12.*cmath.pi**2*cmath.sqrt(2)) + (G**2*gPu22*yc*reglog(MC/MU_R))/(2.*cmath.pi**2*cmath.sqrt(2)) if MC else -(G**2*gPu22*yc)/(12.*cmath.pi**2*cmath.sqrt(2)) ) + (G**2*gPu22*yc)/(12.*cmath.pi**2*cmath.sqrt(2))'},
+                       order = {'DMS':1,'QCD':2,'QED':1})
+
+UVGC_205_51 = Coupling(name = 'UVGC_205_51',
+                       value = {-1:'( -(complex(0,1)*G**2*gSu22*yc)/(6.*cmath.pi**2*cmath.sqrt(2)) if MC else (complex(0,1)*G**2*gSu22*yc)/(12.*cmath.pi**2*cmath.sqrt(2)) ) - (complex(0,1)*G**2*gSu22*yc)/(3.*cmath.pi**2*cmath.sqrt(2))',0:'( (-5*complex(0,1)*G**2*gSu22*yc)/(12.*cmath.pi**2*cmath.sqrt(2)) + (complex(0,1)*G**2*gSu22*yc*reglog(MC/MU_R))/(2.*cmath.pi**2*cmath.sqrt(2)) if MC else -(complex(0,1)*G**2*gSu22*yc)/(12.*cmath.pi**2*cmath.sqrt(2)) ) + (complex(0,1)*G**2*gSu22*yc)/(12.*cmath.pi**2*cmath.sqrt(2))'},
+                       order = {'DMS':1,'QCD':2,'QED':1})
+
+UVGC_206_52 = Coupling(name = 'UVGC_206_52',
+                       value = {-1:'( (complex(0,1)*G**2)/(6.*cmath.pi**2) if MD else -(complex(0,1)*G**2)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2)/(12.*cmath.pi**2)',0:'( (5*complex(0,1)*G**2)/(12.*cmath.pi**2) - (complex(0,1)*G**2*reglog(MD/MU_R))/(2.*cmath.pi**2) if MD else (complex(0,1)*G**2)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2)/(12.*cmath.pi**2)'},
+                       order = {'QCD':2})
+
+UVGC_207_53 = Coupling(name = 'UVGC_207_53',
+                       value = {-1:'( (ee*complex(0,1)*G**2)/(18.*cmath.pi**2) if MD else -(ee*complex(0,1)*G**2)/(36.*cmath.pi**2) )',0:'( (5*ee*complex(0,1)*G**2)/(36.*cmath.pi**2) - (ee*complex(0,1)*G**2*reglog(MD/MU_R))/(6.*cmath.pi**2) if MD else (ee*complex(0,1)*G**2)/(36.*cmath.pi**2) ) - (ee*complex(0,1)*G**2)/(36.*cmath.pi**2)'},
+                       order = {'QCD':2,'QED':1})
+
+UVGC_208_54 = Coupling(name = 'UVGC_208_54',
+                       value = {-1:'( -(complex(0,1)*G**3)/(6.*cmath.pi**2) if MD else (complex(0,1)*G**3)/(12.*cmath.pi**2) )',0:'( (-5*complex(0,1)*G**3)/(12.*cmath.pi**2) + (complex(0,1)*G**3*reglog(MD/MU_R))/(2.*cmath.pi**2) if MD else -(complex(0,1)*G**3)/(12.*cmath.pi**2) ) + (complex(0,1)*G**3)/(12.*cmath.pi**2)'},
+                       order = {'QCD':3})
+
+UVGC_209_55 = Coupling(name = 'UVGC_209_55',
+                       value = {-1:'( (complex(0,1)*G**2*gAd11)/(6.*cmath.pi**2) if MD else -(complex(0,1)*G**2*gAd11)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2*gAd11)/(12.*cmath.pi**2)',0:'( (5*complex(0,1)*G**2*gAd11)/(12.*cmath.pi**2) - (complex(0,1)*G**2*gAd11*reglog(MD/MU_R))/(2.*cmath.pi**2) if MD else (complex(0,1)*G**2*gAd11)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2*gAd11)/(12.*cmath.pi**2)'},
+                       order = {'DMV':1,'QCD':2})
+
+UVGC_210_56 = Coupling(name = 'UVGC_210_56',
+                       value = {-1:'( -(complex(0,1)*G**2*gVd11)/(6.*cmath.pi**2) if MD else (complex(0,1)*G**2*gVd11)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2*gVd11)/(12.*cmath.pi**2)',0:'( (-5*complex(0,1)*G**2*gVd11)/(12.*cmath.pi**2) + (complex(0,1)*G**2*gVd11*reglog(MD/MU_R))/(2.*cmath.pi**2) if MD else -(complex(0,1)*G**2*gVd11)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2*gVd11)/(12.*cmath.pi**2)'},
+                       order = {'DMV':1,'QCD':2})
+
+UVGC_211_57 = Coupling(name = 'UVGC_211_57',
+                       value = {-1:'( (complex(0,1)*G**2*MD)/(6.*cmath.pi**2) if MD else -(complex(0,1)*G**2*MD)/(12.*cmath.pi**2) ) + (complex(0,1)*G**2*MD)/(3.*cmath.pi**2)',0:'( (3*complex(0,1)*G**2*MD)/(4.*cmath.pi**2) - (complex(0,1)*G**2*MD*reglog(MD/MU_R))/cmath.pi**2 if MD else (complex(0,1)*G**2*MD)/(12.*cmath.pi**2) ) - (complex(0,1)*G**2*MD)/(12.*cmath.pi**2)'},