~madteam/mg5amcnlo/series2.0

« back to all changes in this revision

Viewing changes to madgraph/various/process_checks.py

  • Committer: Rikkert Frederix
  • Date: 2014-09-10 16:17:48 UTC
  • mfrom: (253.17.27 2.2.0)
  • mto: (253.17.29 2.2.0)
  • mto: This revision was merged to the branch mainline in revision 255.
  • Revision ID: frederix@physik.uzh.ch-20140910161748-lh37vqyin7eh22y3
merge with latest 2.2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
767
767
                                   not os.path.basename(dir_path)=='check_sa.f':
768
768
            file_path = pjoin(dir_path,'check_sa.f')
769
769
            if not os.path.isfile(file_path):
770
 
                directories = glob.glob(pjoin(dir_path,'P0_*'))
771
 
                if len(directories)>0 and os.path.isdir(directories[0]):
 
770
                directories = [d for d in glob.glob(pjoin(dir_path,'P*_*')) \
 
771
                         if (re.search(r'.*P\d+_\w*$', d) and os.path.isdir(d))]
 
772
                if len(directories)>0:
772
773
                     file_path = pjoin(directories[0],'check_sa.f')
773
774
        if not os.path.isfile(file_path):
774
775
            raise MadGraph5Error('Could not find the location of check_sa.f'+\