← Back to branch summary

~madteam/mg5amcnlo/series2.0

« back to all changes in this revision

Viewing changes to madgraph/interface/amcatnlo_run_interface.py

  • Committer: olivier-mattelaer
  • Date: 2018-11-09 20:46:26 UTC
  • mfrom: (279.1.34 2.6.4)
  • Revision ID: olivier-mattelaer-20181109204626-50om03249xt7cyv5
merge 2.6.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
madgraph/interface/amcatnlo_run_interface.py
1053
1053
        
1054
1054
        if self.last_mode in ['LO', 'NLO']:
1055
1055
            self.switch['fixed_order'] = 'ON'
1056
 
        self.switch['fixed_order'] = 'OFF'
 
1056
        if self.proc_characteristics['ninitial'] == 1:
 
1057
            self.switch['fixed_order'] = 'ON'
 
1058
        else:
 
1059
            self.switch['fixed_order'] = 'OFF'
1057
1060
 
1058
1061
    def color_for_fixed_order(self, switch_value):
1059
1062
         
1158
1161
        if self.last_mode in ['LO', 'NLO', 'noshower', 'noshowerLO']:
1159
1162
            self.switch['shower'] = 'OFF'
1160
1163
            return 
 
1164
        
 
1165
        if self.proc_characteristics['ninitial'] == 1:
 
1166
            self.switch['shower'] = 'OFF'
 
1167
            return
 
1168
        
1161
1169
         
1162
1170
        if os.path.exists(pjoin(self.me_dir, 'Cards', 'shower_card.dat')):
1163
1171
            self.switch['shower'] = self.run_card['parton_shower']  
2603
2611
        devnull = open(os.devnull, 'w') 
2604
2612
        
2605
2613
        if self.analyse_card['fo_analysis_format'].lower() == 'topdrawer':
2606
 
            misc.call(['./combine_plots_FO.sh'] + folder_name, \
 
2614
            topfiles = []
 
2615
            for job in jobs:
 
2616
                if job['dirname'].endswith('.top'):
 
2617
                    topfiles.append(job['dirname'])
 
2618
                else:
 
2619
                    topfiles.append(pjoin(job['dirname'],'MADatNLO.top'))
 
2620
            misc.call(['./combine_plots_FO.sh'] + topfiles, \
2607
2621
                      stdout=devnull, 
2608
2622
                      cwd=pjoin(self.me_dir, 'SubProcesses'))
2609
2623
            files.cp(pjoin(self.me_dir, 'SubProcesses', 'MADatNLO.top'),