*** /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(); *** /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); *** /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 ); + }