diff --git a/.gitignore b/.gitignore
index db767639090cd46110697b2721c8db967a405c09..241eb7657b4454727300243d8f99a09cb3a3d706 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,9 +33,7 @@
.cproject
# ignore configured files
-/include/Geant4VersionInfo.hh
/include/PackageInfo.hh
-/scripts/create_slic_tarball.sh
# build dir
/build/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25d5395e5110fd6c04b81b2e45c3a57c20b1d85c..39e38fd1d14476b6003a83f6a287dfa8ebc85708 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,8 +85,6 @@ ELSE()
# configure files
CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/include/PackageInfo.hh.in ${PROJECT_SOURCE_DIR}/include/PackageInfo.hh)
- CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/include/Geant4VersionInfo.hh.in ${PROJECT_SOURCE_DIR}/include/Geant4VersionInfo.hh )
- #CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/scripts/create_slic_tarball.sh.in ${PROJECT_SOURCE_DIR}/scripts/create_slic_tarball.sh )
# additional compilation flags for Geant4
INCLUDE( ${Geant4_USE_FILE} )
diff --git a/include/CommandLineProcessor.hh b/include/CommandLineProcessor.hh
index 8687198f8345654cc0556997955d9649589c0028..af2a8cd9855b4db68570590f4d2495f8bca3d8d7 100644
--- a/include/CommandLineProcessor.hh
+++ b/include/CommandLineProcessor.hh
@@ -9,7 +9,6 @@
// SLIC
#include "CommandLineOption.hh"
#include "CommandQueue.hh"
-#include "Geant4VersionInfo.hh"
#include "Module.hh"
#include "PackageInfo.hh"
#include "Singleton.hh"
@@ -88,7 +87,6 @@ public:
*/
void printVersion() {
log() << LOG::okay << PackageInfo::getShortName() << " " << PackageInfo::getVersion() << LOG::done;
- log() << LOG::okay << "Geant4 " << Geant4VersionInfo::getVersion() << LOG::done;
}
/**
diff --git a/include/EventSourceManager.hh b/include/EventSourceManager.hh
index 41a1457297fb1fb83ce5452f4fb8a7741624a1c6..ba5a8bca8269a9c81db9319e4b16196bc7415a4f 100644
--- a/include/EventSourceManager.hh
+++ b/include/EventSourceManager.hh
@@ -290,8 +290,8 @@ public:
return m_zSmearingParam;
}
- void enablePrintEvent(G4bool enablePrintEvent) {
- _enablePrintEvent = enablePrintEvent;
+ void enablePrintEvent(G4bool enable) {
+ m_enablePrintEvent = enable;
}
public:
@@ -339,7 +339,7 @@ private:
// Parameter which will be used to smear vertex Z position.
G4double m_zSmearingParam;
- G4bool _enablePrintEvent;
+ G4bool m_enablePrintEvent;
};
}
diff --git a/include/Geant4VersionInfo.hh.in b/include/Geant4VersionInfo.hh.in
deleted file mode 100644
index f77ba2ccf52c7c554be76dc0968056a1c29c3b55..0000000000000000000000000000000000000000
--- a/include/Geant4VersionInfo.hh.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef SLIC_GEANT4VERSIONINFO_HH_
-#define SLIC_GEANT4VERSIONINFO_HH_ 1
-
-// LCDD
-#include "lcdd/util/StringUtil.hh"
-
-// STL
-#include <string>
-
-/**
- * @class Geant4VersionInfo
- * @brief Statically accessible Geant4 version information.
- */
-class Geant4VersionInfo
-{
-private:
-
- /**
- * Class constructor.
- */
- Geant4VersionInfo() {;}
-
-public:
-
- /**
- * Get the Geant4 version string in format "##.##.##"
- * or "[release].[version].[patch]".
- * @return The Geant4 version string.
- */
- static std::string getVersion() {
- return "@Geant4_VERSION@";
- }
-
- /**
- * Get the Geant4 version string in format "##_##_##"
- * or "[release]_[version]_[patch]".
- * @return The Geant4 version string.
- */
- static std::string getVersion(std::string& sep, int width = 2) {
- std::string version = StringUtil::pad(std::string("@Geant4_VERSION_MAJOR@"), width);
- version += sep + StringUtil::pad(std::string("@Geant4_VERSION_MINOR@"), width);
- version += sep + StringUtil::pad(std::string("@Geant4_VERSION_PATCH@"), width);
- return version;
- }
-};
-
-#endif
diff --git a/include/LogStream.hh b/include/LogStream.hh
index 5eeef62691e1266cff9995ef3a8c93cb0cf0fef5..55b646e9c6d29b533fd113b91f33cfebba669569 100644
--- a/include/LogStream.hh
+++ b/include/LogStream.hh
@@ -218,7 +218,7 @@ public:
* @param[in] file The file name.
*/
void setOutputFile(const std::string& file) {
- ofstream* m_fos = new ofstream();
+ m_fos = new ofstream();
m_fos->open(file.c_str(), ios::app | ios::out);
m_os = m_fos;
}
diff --git a/include/Module.hh b/include/Module.hh
index c85d58c5658bb5495e01d6241e60f538fb8dc03f..6415865c1c27869b52352a3af8a825a75ec1cd97 100644
--- a/include/Module.hh
+++ b/include/Module.hh
@@ -104,56 +104,49 @@ public:
* Begin of event hook.
* @param[in] event The G4Event.
*/
- virtual void beginEvent(const G4Event* event) {
- ;
+ virtual void beginEvent(const G4Event*) {
}
/**
* End of event hook.
* @param[in] event The G4Event.
*/
- virtual void endEvent(const G4Event* event) {
- ;
+ virtual void endEvent(const G4Event*) {
}
/**
* Begin of run hook.
* @param[in] run The G4Run.
*/
- virtual void beginRun(const G4Run* run) {
- ;
+ virtual void beginRun(const G4Run*) {
}
/**
* End run hook.
* @param[in] run The G4Run.
*/
- virtual void endRun(const G4Run* run) {
- ;
+ virtual void endRun(const G4Run*) {
}
/**
* Pre-tracking hook called for new G4Track objects.
* @param[in] track The G4Track.
*/
- virtual void preTracking(const G4Track* track) {
- ;
+ virtual void preTracking(const G4Track* ) {
}
/**
* Post-tracking hook called before G4Track deletion.
* @param[in] track The G4Track.
*/
- virtual void postTracking(const G4Track* track) {
- ;
+ virtual void postTracking(const G4Track*) {
}
/**
* Stepping hook called before a G4Step is executed.
* @param[in] step The G4Step.
*/
- virtual void stepping(const G4Step* step) {
- ;
+ virtual void stepping(const G4Step*) {
}
public:
diff --git a/src/EventAction.cc b/src/EventAction.cc
index b67c0ae527f5ae25abe39bae891fbfd3193f679f..f2b5ff7ab54796e18d188d33b2c2816644a00db6 100644
--- a/src/EventAction.cc
+++ b/src/EventAction.cc
@@ -27,7 +27,7 @@ EventAction::EventAction() :
EventAction::~EventAction() {
}
-void EventAction::BeginOfEventAction(const G4Event *anEvent) {
+void EventAction::BeginOfEventAction(const G4Event*) {
// Reset current track state.
CurrentTrackState::setCurrentTrackID(-1);
}
diff --git a/src/EventSourceManager.cc b/src/EventSourceManager.cc
index 560e13174facccbcd2deb4e1209b4d82f508bf32..b17e813279873ad37febf862d168fe1850b64dad 100644
--- a/src/EventSourceManager.cc
+++ b/src/EventSourceManager.cc
@@ -24,7 +24,7 @@ std::string EventSourceManager::UNKNOWN = std::string("unknown");
EventSourceManager::EventSourceManager() :
Module("EventSourceManager"), m_currentEventSource(0), m_filename(""), m_fileIsSet(false),
m_newFilename(false), m_ngen(0), m_nskip(0), m_newSource(true), m_sourceType(eUnknown),
- m_lorentzTransformationAngle(0.), m_zSmearingParam(0.), _enablePrintEvent(false) {
+ m_lorentzTransformationAngle(0.), m_zSmearingParam(0.), m_enablePrintEvent(false) {
// messenger with generator command macro bindings
m_messenger = new GeneratorMessenger();
@@ -241,7 +241,7 @@ void EventSourceManager::beginEvent(const G4Event* anEvent) {
void EventSourceManager::endEvent(const G4Event* anEvent) {
m_currentEventSource->endEvent(anEvent);
- if (_enablePrintEvent) {
+ if (m_enablePrintEvent) {
m_currentEventSource->printCurrentEvent();
}
}
diff --git a/src/GeneratorMessenger.cc b/src/GeneratorMessenger.cc
index 991280f2ab813f92983cef117682d2f1a267ffb5..4b5bad837420da1c7bfe64f53d54446e25e108d7 100644
--- a/src/GeneratorMessenger.cc
+++ b/src/GeneratorMessenger.cc
@@ -59,7 +59,7 @@ void GeneratorMessenger::SetNewValue(G4UIcommand* cmd, G4String newVals) {
// dumpCurrentEvent
else if (cmd == m_enablePrintEventCmd) {
G4bool enablePrintEvent = StringUtil::toBool(s);
- mgr->enablePrintEvent(true);
+ mgr->enablePrintEvent(enablePrintEvent);
}
// printNumEventsGenerated
else if (cmd == m_printNumEventsGeneratedCmd) {
diff --git a/src/LcioFileNamer.cc b/src/LcioFileNamer.cc
index 9453d618f61df9ef5bc7da0472dd554ccd13da5b..bae1a3b8207922c35fec8df642788f8b9cd3d312 100644
--- a/src/LcioFileNamer.cc
+++ b/src/LcioFileNamer.cc
@@ -7,7 +7,6 @@
#include "RunManager.hh"
#include "TimeUtil.hh"
#include "PhysicsListManager.hh"
-#include "Geant4VersionInfo.hh"
// LCDD
#include "lcdd/core/LCDDProcessor.hh"
@@ -31,7 +30,6 @@ LcioFileNamer::LcioFileNamer() :
Module("LcioFileNamer") {
m_defaultFields.push_back("event");
m_defaultFields.push_back("application");
- m_defaultFields.push_back("geant4");
m_defaultFields.push_back("physics");
m_defaultFields.push_back("geometry");
}
@@ -60,15 +58,12 @@ std::string LcioFileNamer::getFieldValue(std::string field) {
value = SlicApplication::instance()->getBinaryBasename();
} else if (field == "physics") {
value = PhysicsListManager::instance()->getCurrentListName();
- } else if (field == "geant4") {
- value = "Geant4-v" + Geant4VersionInfo::getVersion(sep);
} else {
#ifdef SLIC_LOG
- log() << LOG::error << "Ignoring unknown autoname field <" << field << ">." << LOG::done;
+ log() << LOG::error << "Ignoring unknown autoname field <" << field << ">." << LOG::done;
#endif
- value = "";
+ value = "";
}
-
return value;
}
diff --git a/src/LcioManager.cc b/src/LcioManager.cc
index c16ff40814054117b0ceb3e316c5e7de535ba8e1..574c79df375875e18823fc72f9b6038397080c3e 100644
--- a/src/LcioManager.cc
+++ b/src/LcioManager.cc
@@ -10,7 +10,6 @@
#include "LcioFileNamer.hh"
#include "SlicApplication.hh"
#include "RunManager.hh"
-#include "Geant4VersionInfo.hh"
// LCDD
#include "lcdd/hits/CalorimeterHit.hh"
@@ -253,9 +252,6 @@ void LcioManager::createRunHeader(const G4Run*) {
// Write SLIC version into run header.
m_runHdr->parameters().setValue("SLIC_VERSION", PackageInfo::getVersion());
- // Write Geant4 version into run header.
- m_runHdr->parameters().setValue("GEANT4_VERSION", Geant4VersionInfo::getVersion());
-
// set run number
m_runHdr->setRunNumber(m_runNumber);
@@ -358,9 +354,6 @@ LCEventImpl* LcioManager::createLCEvent(const G4Event* anEvent) {
// Write SLIC version into event header.
lcevt->parameters().setValue("SLIC_VERSION", PackageInfo::getVersion());
- // Write Geant4 version into event header.
- lcevt->parameters().setValue("GEANT4_VERSION", Geant4VersionInfo::getVersion());
-
/* Set the current LCEvent. */
setCurrentLCEvent(lcevt);
diff --git a/src/MCParticleManager.cc b/src/MCParticleManager.cc
index 39d630317df49e4bd89dd474ad82b3f8b4f517ca..ff6713fd8d7d19dcb998408aca55995da51fe317 100644
--- a/src/MCParticleManager.cc
+++ b/src/MCParticleManager.cc
@@ -23,7 +23,7 @@ void MCParticleManager::generateEvent(LCCollectionVec* particles, G4Event* event
#if SLIC_LOG
log() << LOG::debug << "applying Z smearing: " << EventSourceManager::instance()->getZSmearing() << LOG::done;
#endif
- G4double z = smearZPosition(EventSourceManager::instance()->getZSmearing());
+ smearZPosition(EventSourceManager::instance()->getZSmearing());
/// Apply the Lorentz Transformation to input particles.
#if SLIC_LOG
diff --git a/src/SteppingAction.cc b/src/SteppingAction.cc
index 980583330b8f4e9a99925ddaee98fa2b882596b9..a10120b3eb4323dd0b5a23edc994d2be6c61cea8 100644
--- a/src/SteppingAction.cc
+++ b/src/SteppingAction.cc
@@ -37,8 +37,8 @@ void SteppingAction::UserSteppingAction(const G4Step* step) {
TrackSummary* trackSummary = trackInfo->getTrackSummary();
//G4cout << "setting backscattering flag" << G4endl;
- trackInfo->getTrackSummary()->update(fpSteppingManager->GetTrack());
- trackInfo->getTrackSummary()->setBackScattering();
+ trackSummary->update(fpSteppingManager->GetTrack());
+ trackSummary->getTrackSummary()->setBackScattering();
// Suspend backscattering tracks to postpone them to the end of shower development.
fpSteppingManager->GetTrack()->SetTrackStatus(fSuspend);