← Back to branch summary

~maddevelopers/mg5amcnlo/eft_width_expansion

« back to all changes in this revision

Viewing changes to madgraph/interface/madevent_interface.py

  • Committer: olivier-mattelaer
  • Date: 2018-02-07 21:30:27 UTC
  • Revision ID: olivier-mattelaer-20180207213027-l1jxbycyqww1idcl
include the value of auto with in the scan summary

Show diffs side-by-side

added added

removed removed

Lines of Context:
madgraph/interface/madevent_interface.py
2570
2570
            if self.param_card_iterator:
2571
2571
                param_card_iterator = self.param_card_iterator
2572
2572
                self.param_card_iterator = []
 
2573
                path = pjoin(self.me_dir,'Cards','param_card.dat')
2573
2574
                with misc.TMP_variable(self, 'allow_notification_center', False):
2574
 
                    param_card_iterator.store_entry(self.run_name, self.results.current['cross'])
 
2575
                    param_card_iterator.store_entry(self.run_name, self.results.current['cross'], param_card_path=path)
2575
2576
                    #check if the param_card defines a scan.
2576
2577
                    orig_name = self.run_name
2577
2578
                    for card in param_card_iterator:
2578
 
                        path = pjoin(self.me_dir,'Cards','param_card.dat')
2579
 
                        card.write(pjoin(self.me_dir,'Cards','param_card.dat'))
 
2579
                        card.write(path)
2580
2580
                        self.check_param_card(path, dependent=True)
2581
2581
                        next_name = param_card_iterator.get_next_name(self.run_name)
2582
2582
                        try:
2583
2583
                            self.exec_cmd("generate_events -f %s" % next_name,
2584
2584
                                      precmd=True, postcmd=True,errorhandling=False)
2585
2585
                        except ZeroResult:
2586
 
                            param_card_iterator.store_entry(self.run_name, 0)
 
2586
                            param_card_iterator.store_entry(self.run_name, 0, param_card_path=path)
2587
2587
                        else:
2588
 
                            param_card_iterator.store_entry(self.run_name, self.results.current['cross'])
2589
 
                    param_card_iterator.write(pjoin(self.me_dir,'Cards','param_card.dat'))
 
2588
                            param_card_iterator.store_entry(self.run_name, self.results.current['cross'], param_card_path=path)
 
2589
                    param_card_iterator.write(path)
2590
2590
                    name = misc.get_scan_name(orig_name, self.run_name)
2591
2591
                    path = pjoin(self.me_dir, 'Events','scan_%s.txt' % name)
2592
2592
                    logger.info("write all cross-section results in %s" % path ,'$MG:color:BLACK')
2973
2973
        self.update_status('', level='parton')
2974
2974
        self.print_results_in_shell(self.results.current)   
2975
2975
        
 
2976
        cpath = pjoin(self.me_dir,'Cards','param_card.dat')
2976
2977
        if param_card_iterator:
2977
2978
 
2978
 
            param_card_iterator.store_entry(self.run_name, self.results.current['cross'])
 
2979
            param_card_iterator.store_entry(self.run_name, self.results.current['cross'],param_card_path=cpath)
2979
2980
            #check if the param_card defines a scan.
2980
2981
            orig_name=self.run_name
2981
2982
            for card in param_card_iterator:
2982
 
                card.write(pjoin(self.me_dir,'Cards','param_card.dat'))
 
2983
                card.write(cpath)
2983
2984
                self.exec_cmd("multi_run %s -f " % nb_run ,precmd=True, postcmd=True,errorhandling=False)
2984
 
                param_card_iterator.store_entry(self.run_name, self.results.current['cross'])
 
2985
                param_card_iterator.store_entry(self.run_name, self.results.current['cross'], param_card_path=cpath)
2985
2986
            param_card_iterator.write(pjoin(self.me_dir,'Cards','param_card.dat'))
2986
2987
            scan_name = misc.get_scan_name(orig_name, self.run_name)
2987
2988
            path = pjoin(self.me_dir, 'Events','scan_%s.txt' % scan_name)