Only in .: agileenv.csh Only in .: agileenv.sh Only in .: agile.patch Only in ./bin: agile-config Only in ./bin: Makefile Only in .: config.log Only in .: config.status Only in ./data: Makefile Only in ./include/AGILe: AGILeConfig.hh Only in ./include/AGILe: FortranWrappers.hh diff -crB /scratch/MonteCarlo/rivet/build/AGILe-1.2.0//include/AGILe/FPythia/FPythiaWrapper.hh ./include/AGILe/FPythia/FPythiaWrapper.hh *** /scratch/MonteCarlo/rivet/build/AGILe-1.2.0//include/AGILe/FPythia/FPythiaWrapper.hh 2010-01-16 21:46:49.000000000 +0000 --- ./include/AGILe/FPythia/FPythiaWrapper.hh 2010-12-04 09:56:05.117816001 +0000 *************** *** 11,16 **** --- 11,18 ---- void FC_PYINIT(const char*,const char*,const char*,double*,int,int,int); #define FC_PYGIVE FC_FUNC(pygive, PYGIVE) void FC_PYGIVE(const char*,int); + #define FC_PYTUNE FC_FUNC(pytune, PYTUNE) + void FC_PYTUNE(int*); #define FC_PYLIST FC_FUNC(pylist, PYLIST) void FC_PYLIST(int*); #define FC_PYSTAT FC_FUNC(pystat, PYSTAT) *************** *** 29,34 **** --- 31,37 ---- void call_pyhepc(int mode); void call_pyinit(const char* frame, const char* beam, const char* target, double win); void call_pygive(const char* frame ); + void call_pytune(int tune); void call_pylist(int mode); void call_pystat(int mode); void call_pyevnt(); Only in ./include/AGILe/FPythia: FPythiaWrapper.hh~ Only in ./include/AGILe: Generator.hh~ Only in ./include/AGILe: Makefile Only in ./include/AGILe: stamp-h1 Only in ./include/AGILe: stamp-h2 Only in ./include: Makefile Only in .: libtool Only in .: Makefile Only in ./pyext/AGILe: Makefile Only in ./pyext: Makefile Only in ./pyext: setup.py Only in ./src/AlpGen: AlpGen.lo Only in ./src/AlpGen: .deps Only in ./src/AlpGen: libAGILeAlpGen.la Only in ./src/AlpGen: .libs Only in ./src/AlpGen: Makefile Only in ./src/Cascade: .deps Only in ./src/Cascade: Makefile Only in ./src/Charybdis: .deps Only in ./src/Charybdis: Makefile Only in ./src/Core: .deps Only in ./src/Core: libAGILeCore.la Only in ./src/Core: .libs Only in ./src/Core: Loader.lo Only in ./src/Core: Makefile Only in ./src/Core: Run.lo Only in ./src/FHerwig: .deps Only in ./src/FHerwig: FHerwigDummyRoutines.lo Only in ./src/FHerwig: FHerwigJimmy.lo Only in ./src/FHerwig: FHerwig.lo Only in ./src/FHerwig: libAGILeFHerwigJimmy.la Only in ./src/FHerwig: libAGILeFHerwig.la Only in ./src/FHerwig: .libs Only in ./src/FHerwig: Makefile Only in ./src/FPythia: .deps diff -crB /scratch/MonteCarlo/rivet/build/AGILe-1.2.0//src/FPythia/FPythia.cc ./src/FPythia/FPythia.cc *** /scratch/MonteCarlo/rivet/build/AGILe-1.2.0//src/FPythia/FPythia.cc 2010-06-30 19:49:15.000000000 +0100 --- ./src/FPythia/FPythia.cc 2010-12-04 09:57:22.717816002 +0000 *************** *** 106,117 **** // Set a parameter with a string value bool FPythia::setParam(const string& name, const string& value) { Generator::setParam(name, value); ! const string pygive_input(toUpper(name) + "=" + value); ! call_pygive(pygive_input.c_str()); return SUCCESS; } ! ! // Run the generator for one event void FPythia::makeEvent(HepMC::GenEvent& evt) { Generator::makeEvent(evt); --- 106,121 ---- // Set a parameter with a string value bool FPythia::setParam(const string& name, const string& value) { Generator::setParam(name, value); ! if(name=="PYTUNE") ! call_pytune(atoi(value.c_str())); ! else { ! const string pygive_input(toUpper(name) + "=" + value); ! call_pygive(pygive_input.c_str()); ! } return SUCCESS; + } ! // Run the generator for one event void FPythia::makeEvent(HepMC::GenEvent& evt) { Generator::makeEvent(evt); Only in ./src/FPythia: FPythia.cc~ Only in ./src/FPythia: FPythia.lo diff -crB /scratch/MonteCarlo/rivet/build/AGILe-1.2.0//src/FPythia/FPythiaWrapper.cc ./src/FPythia/FPythiaWrapper.cc *** /scratch/MonteCarlo/rivet/build/AGILe-1.2.0//src/FPythia/FPythiaWrapper.cc 2010-01-16 21:46:50.000000000 +0000 --- ./src/FPythia/FPythiaWrapper.cc 2010-12-04 09:48:34.149816003 +0000 *************** *** 27,29 **** --- 27,33 ---- void call_pyevnt() { pyevnt_(); } + + void call_pytune( int tune ) { + pytune_( &tune ); + } Only in ./src/FPythia: FPythiaWrapper.cc~ Only in ./src/FPythia: FPythiaWrapper.lo Only in ./src/FPythia: initpydata.lo Only in ./src/FPythia: libAGILeFPythia.la Only in ./src/FPythia: libAGILeFPythia_pyevwt.la Only in ./src/FPythia: .libs Only in ./src/FPythia: Makefile Only in ./src/FPythia: pyevwt.lo Only in ./src/IO: AGILeIO.lo Only in ./src/IO: .deps Only in ./src/IO: libAGILeIO.la Only in ./src/IO: .libs Only in ./src/IO: Makefile Only in ./src: Makefile Only in ./src/Rapgap: .deps Only in ./src/Rapgap: Makefile Only in ./src/Tools: .deps Only in ./src/Tools: libAGILeTools.la Only in ./src/Tools: libAGILeTools_la-AGILePaths.lo Only in ./src/Tools: libAGILeTools_la-binreloc.lo Only in ./src/Tools: libAGILeTools_la-Logging.lo Only in ./src/Tools: libAGILeTools_la-tinyxmlerror.lo Only in ./src/Tools: libAGILeTools_la-tinyxml.lo Only in ./src/Tools: libAGILeTools_la-tinyxmlparser.lo Only in ./src/Tools: .libs Only in ./src/Tools: Makefile Only in ./test: Makefile