← Back to branch summary

~madteam/mg5amcnlo/series2.0

« back to all changes in this revision

Viewing changes to madgraph/madevent/gen_crossxhtml.py

  • Committer: olivier Mattelaer
  • Date: 2015-03-05 00:14:16 UTC
  • mfrom: (258.1.9 2.3)
  • mto: (258.8.1 2.3)
  • mto: This revision was merged to the branch mainline in revision 259.
  • Revision ID: olivier.mattelaer@uclouvain.be-20150305001416-y9mzeykfzwnl9t0j
partial merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
madgraph/madevent/gen_crossxhtml.py
24
24
import logging
25
25
 
26
26
try:
 
27
    import madgraph
 
28
except ImportError:
27
29
    import internal.files as files
28
30
    import internal.save_load_object as save_load_object
29
31
    import internal.lhe_parser as lhe_parser
30
32
    import internal.misc as misc
31
 
except ImportError:
 
33
else:
32
34
    import madgraph.iolibs.files as files
33
35
    import madgraph.iolibs.save_load_object as save_load_object
34
36
    import madgraph.various.lhe_parser as lhe_parser
35
37
    import madgraph.various.misc as misc
 
38
 
36
39
pjoin = os.path.join
37
40
exists = os.path.exists
38
41
logger = logging.getLogger('madgraph.stdout') # -> stdout
496
499
        data = process.split('>',1)[0].split()
497
500
        if len(data) == 2:
498
501
            name1,name2 = data
499
 
            if run_card['lpp1'] == '-1':
 
502
            if run_card['lpp1'] == -1:
500
503
                name1 = ' p~'
501
 
            elif run_card['lpp1']  == '1':
 
504
            elif run_card['lpp1']  == 1:
502
505
                name1 = ' p'   
503
 
            elif run_card['lpp1'] == '2':
 
506
            elif run_card['lpp1'] in [2,3]:
504
507
                name1 = ' a'
505
 
            if run_card['lpp2'] == '-1':
 
508
            if run_card['lpp2'] == -1:
506
509
                name2 = 'p~'
507
 
            elif run_card['lpp2']  == '1':
 
510
            elif run_card['lpp2']  == 1:
508
511
                name2 = ' p' 
509
 
            elif run_card['lpp2'] == '2':
 
512
            elif run_card['lpp2'] == [2,3]:
510
513
                name2 = ' a'                
511
514
            self.info['collider'] = '''%s %s <br> %s x %s  GeV''' % \
512
515
                    (name1, name2, run_card['ebeam1'], run_card['ebeam2'])
611
614
                tagresult = self.return_tag(tag)
612
615
            tagresult['nb_event'] = nb_event
613
616
            tagresult['cross'] = cross
614
 
            if run_card['ickkw'] != '0':
 
617
            if run_card['ickkw'] != 0:
615
618
                #parse the file to have back the information
616
619
                pythia_log = misc.BackRead(pjoin(path, '%s_pythia.log' % tag))
617
620
                pythiare = re.compile("\s*I\s+0 All included subprocesses\s+I\s+(?P<generated>\d+)\s+(?P<tried>\d+)\s+I\s+(?P<xsec>[\d\.D\-+]+)\s+I")            
739
742
    def update_status(self, level='all', nolevel=[]):
740
743
        """update the status of the current run """
741
744
 
742
 
        import misc as misc
743
745
        exists = os.path.exists
744
746
        run = self['run_name']
745
747
        tag =self['tag']