← Back to branch summary

~maddevelopers/mg5amcnlo/2.7.1.3

« back to all changes in this revision

Viewing changes to madgraph/various/process_checks.py

  • Committer: olivier Mattelaer
  • Date: 2016-06-09 23:51:14 UTC
  • mfrom: (262.9.33 2.4.1_new)
  • Revision ID: olivier.mattelaer@uclouvain.be-20160609235114-saz2i0eou1az8lsv
pass to 2.4.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
madgraph/various/process_checks.py
732
732
            sys.stdout.flush()
733
733
         
734
734
        shell_name = None
735
 
        directories = glob.glob(pjoin(working_dir, 'SubProcesses',
736
 
                                  'P%i_*' % proc_id))
 
735
        directories = misc.glob('P%i_*' % proc_id, pjoin(working_dir, 'SubProcesses'))
737
736
        if directories and os.path.isdir(directories[0]):
738
737
            shell_name = os.path.basename(directories[0])
739
738
 
885
884
                                                " in function apply_log_tweak.")
886
885
        
887
886
        model_path = pjoin(proc_path,'Source','MODEL')
888
 
        directories = glob.glob(pjoin(proc_path,'SubProcesses','P0_*'))
 
887
        directories = misc.glob('P0_*', pjoin(proc_path,'SubProcesses'))
889
888
        if directories and os.path.isdir(directories[0]):
890
889
            exe_path = directories[0]
891
890
        else:
995
994
        flexible solution but it works for this particular case."""
996
995
        
997
996
        shell_name = None
998
 
        directories = glob.glob(pjoin(working_dir,'P0_*'))
 
997
        directories = misc.glob('P0_*', working_dir)
999
998
        if directories and os.path.isdir(directories[0]):
1000
999
            shell_name = os.path.basename(directories[0])
1001
1000
        
1186
1185
                            mp = False, loop_filter = True,MLOptions=MLOptions)
1187
1186
        
1188
1187
        shell_name = None
1189
 
        directories = glob.glob(pjoin(export_dir, 'SubProcesses','P0_*'))
 
1188
        directories = misc.glob('P0_*', pjoin(export_dir, 'SubProcesses'))
1190
1189
        if directories and os.path.isdir(directories[0]):
1191
1190
            shell_name = os.path.basename(directories[0])
1192
1191
        dir_name = pjoin(export_dir, 'SubProcesses', shell_name)
2478
2477
    if mg_root is None:
2479
2478
        pass
2480
2479
    
2481
 
    directories = glob.glob(pjoin(mg_root, '%s*'%temp_dir_prefix))
 
2480
    directories = misc.glob('%s*' % temp_dir_prefix, mg_root)
2482
2481
    if directories != []:
2483
2482
        logger.debug("Cleaning temporary %s* check runs."%temp_dir_prefix)
2484
2483
    for dir in directories:
4413
4412
   
4414
4413
        # And recompile while making sure to recreate the executable and 
4415
4414
        # modified sources
4416
 
        for dir in glob.glob(pjoin(proc_dir,'SubProcesses','P*_*')):
 
4415
        for dir in misc.glob('P*_*', pjoin(proc_dir,'SubProcesses')):
4417
4416
            if not (re.search(r'.*P\d+_\w*$', dir) or not os.path.isdir(dir)):
4418
4417
                continue
4419
4418
            try: