diff --git a/Generators/Herwig_i/Herwig_i/Herwig.h b/Generators/Herwig_i/Herwig_i/Herwig.h
index baeef1845b52328abc9a1443b20bed3a5e698782..123bfef3250582ae675d28648ae328459200ad7f 100644
--- a/Generators/Herwig_i/Herwig_i/Herwig.h
+++ b/Generators/Herwig_i/Herwig_i/Herwig.h
@@ -121,7 +121,7 @@ protected:
/// I/O to HEPEVT
void store_Atlas_HEPEVT();
- static Atlas_HEPEVT* atlas_HEPEVT;
+ static Atlas_HEPEVT* s_atlas_HEPEVT;
};
diff --git a/Generators/Herwig_i/Herwig_i/Lhefinfo.h b/Generators/Herwig_i/Herwig_i/Lhefinfo.h
index 417841673e3c6f1c4e4138e19d9257ebd7ca15c4..978e3b3c4f204ee4f58664a550579257efaa760b 100644
--- a/Generators/Herwig_i/Herwig_i/Lhefinfo.h
+++ b/Generators/Herwig_i/Herwig_i/Lhefinfo.h
@@ -44,7 +44,7 @@ private:
double scalePdf, xPdf1, xPdf2;
};
- static LHEFINFO* _lhefinfo;
+ static LHEFINFO* s_lhefinfo;
};
#include "Herwig_i/Lhefinfo.icc"
diff --git a/Generators/Herwig_i/Herwig_i/Lhefinfo.icc b/Generators/Herwig_i/Herwig_i/Lhefinfo.icc
index c2ebd84187cc82d8a3252fd9bb136c2f107db7c0..5ebfb4da4009b44541ed93824e0c11ea216f06fc 100644
--- a/Generators/Herwig_i/Herwig_i/Lhefinfo.icc
+++ b/Generators/Herwig_i/Herwig_i/Lhefinfo.icc
@@ -7,8 +7,8 @@
// initialise pointer
void Lhefinfo::init()
{
- if ( !_lhefinfo ) {
- _lhefinfo = static_cast< LHEFINFO* >( lhefinfo_address_() );
+ if ( !s_lhefinfo ) {
+ s_lhefinfo = static_cast< LHEFINFO* >( lhefinfo_address_() );
}
}
diff --git a/Generators/Herwig_i/Herwig_i/herwig6520.h b/Generators/Herwig_i/Herwig_i/herwig6520.h
index ee29c944a69b402711fe3a0a20a210dd1c66d2d0..d11abb9b8f659333b10f37ffd5b176b1465df1f7 100644
--- a/Generators/Herwig_i/Herwig_i/herwig6520.h
+++ b/Generators/Herwig_i/Herwig_i/herwig6520.h
@@ -2,13 +2,13 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef __HERWIG65_HH__
-#define __HERWIG65_HH__
+#ifndef HERWIG_I_HERWIG6520_H
+#define HERWIG_I_HERWIG6520_H
/* Common Block Declarations */
#include <complex>
-const int m_nmxhep = 10000;
+const int nmxhep = 10000;
struct Hwbeam_t {
int ipart1, ipart2;
@@ -69,7 +69,7 @@ extern Hwparp_t* gHwparp ;
struct Hwbosc_t {
// rhohep = 3*NMXHEP
// double alpfac, brhig[12], enhanc[12], gammax, rhohep[30000];
- double alpfac, brhig[12], enhanc[12], gammax, rhohep[3*m_nmxhep];
+ double alpfac, brhig[12], enhanc[12], gammax, rhohep[3*nmxhep];
int iophig, modbos[50];
} ;
@@ -92,7 +92,7 @@ struct Hwevnt_t {
// idhw = NMXHEP
double avwgt, evwgt, gamwt, tlout, wbigst, wgtmax, wgtsum, wsqsum;
// int idhw[10000], ierror, istat, lwevt, maxer, maxpr;
- int idhw[m_nmxhep], ierror, istat, lwevt, maxer, maxpr;
+ int idhw[nmxhep], ierror, istat, lwevt, maxer, maxpr;
int nowgt;
int nrn[2], numer, numeru, nwgts;
int gensof;
@@ -313,7 +313,7 @@ struct Hwspin_t {
std::complex<double> mespn[2400] /* was [2][2][2][2][3][50] */, rhospn[200] /* was [2][2][50] */;
double spncfc[450] /* was [3][3][50] */;
// int idspn[50], jmospn[50], jdaspn[100] /* was [2][50] */, nspn, isnhep[10000], nsntry;
- int idspn[50], jmospn[50], jdaspn[100] /* was [2][50] */, nspn, isnhep[m_nmxhep], nsntry;
+ int idspn[50], jmospn[50], jdaspn[100] /* was [2][50] */, nspn, isnhep[nmxhep], nsntry;
int decspn[50];
int ncfl[50], spcopt;
};
diff --git a/Generators/Herwig_i/Herwig_i/wgtacp.h b/Generators/Herwig_i/Herwig_i/wgtacp.h
index 4db6d461e27b316ac0e4270a093daef400a3aef9..c3fc89f46947bcbed76692a8275f089547f19873 100644
--- a/Generators/Herwig_i/Herwig_i/wgtacp.h
+++ b/Generators/Herwig_i/Herwig_i/wgtacp.h
@@ -42,7 +42,7 @@ private:
int userwgts;
};
- static WGTACP* _wgtacp;
+ static WGTACP* s_wgtacp;
};
#include "Herwig_i/wgtacp.icc"
diff --git a/Generators/Herwig_i/Herwig_i/wgtacp.icc b/Generators/Herwig_i/Herwig_i/wgtacp.icc
index 6215065d1441d961ada3a8a911128c98b66b335a..2300e59960f16a7a7de79771284ddc5a439abce8 100644
--- a/Generators/Herwig_i/Herwig_i/wgtacp.icc
+++ b/Generators/Herwig_i/Herwig_i/wgtacp.icc
@@ -6,18 +6,18 @@
// initialise pointer
void Wgtacp::init(){
- if ( !_wgtacp ) {
- _wgtacp = static_cast< WGTACP* >( wgtacp_address_() );
+ if ( !s_wgtacp ) {
+ s_wgtacp = static_cast< WGTACP* >( wgtacp_address_() );
}
}
double Wgtacp::wgtacp(int i){
init();
- return _wgtacp->wgtacp[i];
+ return s_wgtacp->wgtacp[i];
}
int Wgtacp::userwgts(){
init();
- return _wgtacp->userwgts;
+ return s_wgtacp->userwgts;
}
diff --git a/Generators/Herwig_i/src/Herwig.cxx b/Generators/Herwig_i/src/Herwig.cxx
index a47fde5fb8b917c52f36b1aa1597fb91cd4c5ae8..1006ae3f0798def2bac56e7065a2194ad54322c5 100644
--- a/Generators/Herwig_i/src/Herwig.cxx
+++ b/Generators/Herwig_i/src/Herwig.cxx
@@ -129,7 +129,7 @@ extern "C" {
////////////////////////////////////////////////////////
-Atlas_HEPEVT* Herwig::atlas_HEPEVT = new Atlas_HEPEVT();
+Atlas_HEPEVT* Herwig::s_atlas_HEPEVT = new Atlas_HEPEVT();
//--------------------------------------------------------------------------
@@ -809,17 +809,17 @@ StatusCode Herwig::fillEvt(HepMC::GenEvent* evt) {
int idh1=gHwevnt->idhw[ ld1-1 ];
int idh2=gHwevnt->idhw[ ld2-1 ];
int nset=0;
- double m_disf[26];
+ double disf[26];
if ( idx1 > 25 || idx2 > 25 ) {
ATH_MSG_WARNING( "PDF index out of range!" );
} else {
- hwsfun_(&x1, &q, &idh1, &nset, &(m_disf[0]), &ld1);
- hwsfun_(&x2, &q, &idh2, &nset, &(m_disf[13]), &ld2);
+ hwsfun_(&x1, &q, &idh1, &nset, &(disf[0]), &ld1);
+ hwsfun_(&x2, &q, &idh2, &nset, &(disf[13]), &ld2);
- xpdf1 = m_disf[ idx1 ];
- xpdf2 = m_disf[ idx2 ];
+ xpdf1 = disf[ idx1 ];
+ xpdf2 = disf[ idx2 ];
}
@@ -934,15 +934,15 @@ void Herwig::updateStatusCode( HepMC::GenEvent *evt )
void Herwig::store_Atlas_HEPEVT() {
ATH_MSG_DEBUG("atlas_HEPEVT params: "
- << "nhep=" << atlas_HEPEVT->nhep() << ", "
- << "isthep(10)=" << atlas_HEPEVT->isthep(10) << ", "
- << "idhep(10)=" << atlas_HEPEVT->idhep(10) << ", "
- << "jmohep(1,10)=" << atlas_HEPEVT->jmohep(1,10) << ", "
- << "jdahep(2,10)=" << atlas_HEPEVT->jdahep(2,10));
+ << "nhep=" << s_atlas_HEPEVT->nhep() << ", "
+ << "isthep(10)=" << s_atlas_HEPEVT->isthep(10) << ", "
+ << "idhep(10)=" << s_atlas_HEPEVT->idhep(10) << ", "
+ << "jmohep(1,10)=" << s_atlas_HEPEVT->jmohep(1,10) << ", "
+ << "jdahep(2,10)=" << s_atlas_HEPEVT->jdahep(2,10));
/// @todo Ugly... and a memory leak?
- atlas_HEPEVT->fill();
+ s_atlas_HEPEVT->fill();
Atlas_HEPEVT* ahep = new Atlas_HEPEVT();
- *(ahep) = *(atlas_HEPEVT);
+ *(ahep) = *(s_atlas_HEPEVT);
string keyid = "Herwig";
StatusCode sc = evtStore()->record(ahep, keyid);
if (!sc.isSuccess()) {
diff --git a/Generators/Herwig_i/src/Lhefinfo.cxx b/Generators/Herwig_i/src/Lhefinfo.cxx
index c0f936ec4886b57eb38e3eddcf7153c31aa67754..647f084cfce47e0ed8675ab6952753999fe0b0d0 100644
--- a/Generators/Herwig_i/src/Lhefinfo.cxx
+++ b/Generators/Herwig_i/src/Lhefinfo.cxx
@@ -6,7 +6,7 @@
#include "Herwig_i/Lhefinfo.h"
// set pointer to zero at start
-Lhefinfo::LHEFINFO* Lhefinfo::_lhefinfo = 0;
+Lhefinfo::LHEFINFO* Lhefinfo::s_lhefinfo = 0;
// Constructor
Lhefinfo::Lhefinfo()
@@ -19,42 +19,42 @@ Lhefinfo::~Lhefinfo()
int& Lhefinfo::id1()
{
init();
- return _lhefinfo->id1;
+ return s_lhefinfo->id1;
}
int& Lhefinfo::id2()
{
init();
- return _lhefinfo->id2;
+ return s_lhefinfo->id2;
}
double& Lhefinfo::x1()
{
init();
- return _lhefinfo->x1;
+ return s_lhefinfo->x1;
}
double& Lhefinfo::x2()
{
init();
- return _lhefinfo->x2;
+ return s_lhefinfo->x2;
}
double& Lhefinfo::scalePdf()
{
init();
- return _lhefinfo->scalePdf;
+ return s_lhefinfo->scalePdf;
}
double& Lhefinfo::xPdf1()
{
init();
- return _lhefinfo->xPdf1;
+ return s_lhefinfo->xPdf1;
}
double& Lhefinfo::xPdf2()
{
init();
- return _lhefinfo->xPdf2;
+ return s_lhefinfo->xPdf2;
}
diff --git a/Generators/Herwig_i/src/wgtacp.cxx b/Generators/Herwig_i/src/wgtacp.cxx
index 369a85942fba50b09db8b7b7038f6023daef5031..5d5aafd5afd62f0f1e948d7c0fc2d7feafadcfa9 100644
--- a/Generators/Herwig_i/src/wgtacp.cxx
+++ b/Generators/Herwig_i/src/wgtacp.cxx
@@ -6,7 +6,7 @@
#include "Herwig_i/wgtacp.h"
// set pointer to zero at start
-Wgtacp::WGTACP* Wgtacp::_wgtacp = 0;
+Wgtacp::WGTACP* Wgtacp::s_wgtacp = 0;
// Constructor
Wgtacp::Wgtacp(){