|
[Rivet-svn] r1822 - trunk/pyextblackhole at projects.hepforge.org blackhole at projects.hepforge.orgMon Sep 21 10:28:07 BST 2009
Author: buckley Date: Mon Sep 21 10:28:07 2009 New Revision: 1822 Log: Updating bundled HepMC 2.4 PyExt files Modified: trunk/pyext/rivet.py-HepMC24 trunk/pyext/rivet_wrap.cc-HepMC24 Modified: trunk/pyext/rivet.py-HepMC24 ============================================================================== --- trunk/pyext/rivet.py-HepMC24 Thu Sep 10 18:35:13 2009 (r1821) +++ trunk/pyext/rivet.py-HepMC24 Mon Sep 21 10:28:07 2009 (r1822) @@ -926,12 +926,10 @@ __swig_getmethods__ = {} __getattr__ = lambda self, name: _swig_getattr(self, AnalysisLoader, name) __repr__ = _swig_repr + __swig_getmethods__["analysisNames"] = lambda x: _rivet.AnalysisLoader_analysisNames + if _newclass:analysisNames = staticmethod(_rivet.AnalysisLoader_analysisNames) __swig_getmethods__["getAnalysis"] = lambda x: _rivet.AnalysisLoader_getAnalysis if _newclass:getAnalysis = staticmethod(_rivet.AnalysisLoader_getAnalysis) - __swig_getmethods__["closeAnalysisBuilders"] = lambda x: _rivet.AnalysisLoader_closeAnalysisBuilders - if _newclass:closeAnalysisBuilders = staticmethod(_rivet.AnalysisLoader_closeAnalysisBuilders) - __swig_getmethods__["allAnalysisNames"] = lambda x: _rivet.AnalysisLoader_allAnalysisNames - if _newclass:allAnalysisNames = staticmethod(_rivet.AnalysisLoader_allAnalysisNames) def __init__(self, *args): this = _rivet.new_AnalysisLoader(*args) try: self.this.append(this) @@ -940,9 +938,8 @@ __del__ = lambda self : None; AnalysisLoader_swigregister = _rivet.AnalysisLoader_swigregister AnalysisLoader_swigregister(AnalysisLoader) +AnalysisLoader_analysisNames = _rivet.AnalysisLoader_analysisNames AnalysisLoader_getAnalysis = _rivet.AnalysisLoader_getAnalysis -AnalysisLoader_closeAnalysisBuilders = _rivet.AnalysisLoader_closeAnalysisBuilders -AnalysisLoader_allAnalysisNames = _rivet.AnalysisLoader_allAnalysisNames Modified: trunk/pyext/rivet_wrap.cc-HepMC24 ============================================================================== --- trunk/pyext/rivet_wrap.cc-HepMC24 Thu Sep 10 18:35:13 2009 (r1821) +++ trunk/pyext/rivet_wrap.cc-HepMC24 Mon Sep 21 10:28:07 2009 (r1822) @@ -5011,11 +5011,6 @@ return SWIG_OK; } -SWIGINTERN std::vector<std::string,std::allocator<std::string > > Rivet_AnalysisLoader_allAnalysisNames(){ - std::set<std::string> names = Rivet::AnalysisLoader::getAllAnalysisNames(); - std::vector<std::string> vnames(names.begin(), names.end()); - return vnames; - } #ifdef __cplusplus extern "C" { #endif @@ -27555,6 +27550,19 @@ return SWIG_Py_Void(); } +SWIGINTERN PyObject *_wrap_AnalysisLoader_analysisNames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector<std::string,std::allocator<std::string > > result; + + if (!PyArg_ParseTuple(args,(char *)":AnalysisLoader_analysisNames")) SWIG_fail; + result = Rivet::AnalysisLoader::analysisNames(); + resultobj = swig::from(static_cast< std::vector<std::string,std::allocator<std::string > > >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_AnalysisLoader_getAnalysis(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::string *arg1 = 0 ; @@ -27584,31 +27592,6 @@ } -SWIGINTERN PyObject *_wrap_AnalysisLoader_closeAnalysisBuilders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - - if (!PyArg_ParseTuple(args,(char *)":AnalysisLoader_closeAnalysisBuilders")) SWIG_fail; - Rivet::AnalysisLoader::closeAnalysisBuilders(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_AnalysisLoader_allAnalysisNames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector<std::string,std::allocator<std::string > > result; - - if (!PyArg_ParseTuple(args,(char *)":AnalysisLoader_allAnalysisNames")) SWIG_fail; - result = Rivet_AnalysisLoader_allAnalysisNames(); - resultobj = swig::from(static_cast< std::vector<std::string,std::allocator<std::string > > >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_new_AnalysisLoader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Rivet::AnalysisLoader *result = 0 ; @@ -28142,9 +28125,8 @@ { (char *)"AnalysisHandler_commitData", _wrap_AnalysisHandler_commitData, METH_VARARGS, NULL}, { (char *)"delete_AnalysisHandler", _wrap_delete_AnalysisHandler, METH_VARARGS, NULL}, { (char *)"AnalysisHandler_swigregister", AnalysisHandler_swigregister, METH_VARARGS, NULL}, + { (char *)"AnalysisLoader_analysisNames", _wrap_AnalysisLoader_analysisNames, METH_VARARGS, NULL}, { (char *)"AnalysisLoader_getAnalysis", _wrap_AnalysisLoader_getAnalysis, METH_VARARGS, NULL}, - { (char *)"AnalysisLoader_closeAnalysisBuilders", _wrap_AnalysisLoader_closeAnalysisBuilders, METH_VARARGS, NULL}, - { (char *)"AnalysisLoader_allAnalysisNames", _wrap_AnalysisLoader_allAnalysisNames, METH_VARARGS, NULL}, { (char *)"new_AnalysisLoader", _wrap_new_AnalysisLoader, METH_VARARGS, NULL}, { (char *)"delete_AnalysisLoader", _wrap_delete_AnalysisLoader, METH_VARARGS, NULL}, { (char *)"AnalysisLoader_swigregister", AnalysisLoader_swigregister, METH_VARARGS, NULL},
More information about the Rivet-svn mailing list |