~madteam/mg5amcnlo/series2.0

« back to all changes in this revision

Viewing changes to madgraph/interface/madgraph_interface.py

  • Committer: olivier Mattelaer
  • Date: 2014-05-07 08:54:27 UTC
  • mto: (258.8.1 2.3)
  • mto: This revision was merged to the branch mainline in revision 259.
  • Revision ID: olivier.mattelaer@uclouvain.be-20140507085427-hm77vltwk4c6t9u1
fix problems

Show diffs side-by-side

added added

removed removed

Lines of Context:
1361
1361
                    raise self.InvalidCmd('%s is not allowed in the output path' % char)
1362
1362
            # Check for special directory treatment
1363
1363
            if path == 'auto' and self._export_format in \
1364
 
                     ['madevent', 'standalone', 'standalone_cpp', 'matchbox_cpp', 'madweight']:
 
1364
                     ['madevent', 'standalone', 'standalone_cpp', 'matchbox_cpp', 'madweight',
 
1365
                      'matchbox']:
1365
1366
                self.get_default_path()
1366
1367
                if '-noclean' not in args and os.path.exists(self._export_dir):
1367
1368
                    args.append('-noclean')
1519
1520
                                    (self._curr_model['name'], i)
1520
1521
            auto_path = lambda i: pjoin(self.writing_dir,
1521
1522
                                               name_dir(i))
1522
 
        elif self._export_format == 'matchbox_cpp':
 
1523
        elif self._export_format in ['matchbox_cpp', 'matchbox']:
1523
1524
            name_dir = lambda i: 'PROC_MATCHBOX_%s_%s' % \
1524
1525
                                    (self._curr_model['name'], i)
1525
1526
            auto_path = lambda i: pjoin(self.writing_dir,
2393
2394
    _v4_export_formats = ['madevent', 'standalone', 'standalone_msP','standalone_msF',
2394
2395
                          'matrix', 'standalone_rw', 'madweight'] 
2395
2396
    _export_formats = _v4_export_formats + ['standalone_cpp', 'pythia8', 'aloha',
2396
 
                                            'matchbox_cpp']
 
2397
                                            'matchbox_cpp', 'matchbox']
2397
2398
    _set_options = ['group_subprocesses',
2398
2399
                    'ignore_six_quark_processes',
2399
2400
                    'stdout_level',