96 modified files
projects/slic/trunk/include
--- projects/slic/trunk/include/CommandLineOption.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/CommandLineOption.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/CommandLineOption.hh,v 1.3 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_COMMANDLINEOPTION_HH_
+#define SLIC_COMMANDLINEOPTION_HH_ 1
-#ifndef slic_CommandLineOption_hh_
-#define slic_CommandLineOption_hh_ 1
-
// STL
#include <map>
#include <vector>
projects/slic/trunk/include
--- projects/slic/trunk/include/CommandLineProcessor.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/CommandLineProcessor.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,6 +1,5 @@
-// $id: $
-#ifndef slic_CommandLineProcessor_hh_
-#define slic_CommandLineProcessor_hh_ 1
+#ifndef SLIC_COMMANDLINEPROCESSOR_HH_
+#define SLIC_COMMANDLINEPROCESSOR_HH_ 1
// STL
#include <string>
projects/slic/trunk/include
--- projects/slic/trunk/include/CommandQueue.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/CommandQueue.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,6 +1,5 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/CommandQueue.hh,v 1.4 2013-11-06 00:23:35 jeremy Exp $
-#ifndef slic_CommandQueue_hh_
-#define slic_CommandQueue_hh_ 1
+#ifndef SLIC_COMMANDQUEUE_HH_
+#define SLIC_COMMANDQUEUE_HH_ 1
// SLIC
#include "Module.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/EventAction.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/EventAction.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/EventAction.hh,v 1.14 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_EVENTACTION_HH_
+#define SLIC_EVENTACTION_HH_ 1
-#ifndef SLIC_EVENTACTION_HH
-#define SLIC_EVENTACTION_HH 1
-
// SLIC
#include "Module.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/EventMessenger.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/EventMessenger.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/EventMessenger.hh,v 1.8 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_EVENTMESSENGER_HH_
+#define SLIC_EVENTMESSENGER_HH_ 1
-#ifndef SLIC_EVENTMESSENGER_HH
-#define SLIC_EVENTMESSENGER_HH 1
-
// Geant4
#include "G4UImessenger.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/EventSource.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/EventSource.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/EventSource.hh,v 1.11 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_EVENTSOURCE_HH_
+#define SLIC_EVENTSOURCE_HH_ 1
-#ifndef SLIC_EVENTSOURCE_HH
-#define SLIC_EVENTSOURCE_HH 1
-
// SLIC
#include "Module.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/EventSourceManager.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/EventSourceManager.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/EventSourceManager.hh,v 1.15 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_EVENTSOURCEMANAGER_HH_
+#define SLIC_EVENTSOURCEMANAGER_HH_ 1
-#ifndef SLIC_EVENTSOURCEMANAGER_HH
-#define SLIC_EVENTSOURCEMANAGER_HH 1
-
// SLIC
#include "Module.hh"
#include "EventSource.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/EventSourceWithInputFile.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/EventSourceWithInputFile.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/EventSourceWithInputFile.hh,v 1.11 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_EVENTSOURCEWITHINPUTFILE_HH_
+#define SLIC_EVENTSOURCEWITHINPUTFILE_HH_ 1
-#ifndef SLIC_EVENTSOURCEWITHINPUTFILE_HH
-#define SLIC_EVENTSOURCEWITHINPUTFILE_HH 1
-
// SLIC
#include "EventSource.hh"
#include "FileUtil.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/FieldManager.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/FieldManager.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Id: FieldManager.hh,v 1.4 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_FIELDMANAGER_HH_
+#define SLIC_FIELDMANAGER_HH_ 1
-#ifndef SLIC_FIELDMANAGER_HH
-#define SLIC_FIELDMANAGER_HH 1
-
// SLIC
#include "Module.hh"
#include "FieldMessenger.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/FieldMessenger.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/FieldMessenger.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/FieldMessenger.hh,v 1.7 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_FIELDMESSENGER_HH_
+#define SLIC_FIELDMESSENGER_HH_ 1
-#ifndef SLIC_FIELDMESSENGER_HH
-#define SLIC_FIELDMESSENGER_HH 1
-
// geant4
#include "G4UImessenger.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/FileUtil.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/FileUtil.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/FileUtil.hh,v 1.12 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_FILEUTIL_HH_
+#define SLIC_FILEUTIL_HH_ 1
-#ifndef SLIC_FILEUTIL_HH
-#define SLIC_FILEUTIL_HH 1
-
// STL
#include <string>
projects/slic/trunk/include
--- projects/slic/trunk/include/G4MagIntegratorStepperFactory.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/G4MagIntegratorStepperFactory.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/G4MagIntegratorStepperFactory.hh,v 1.7 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_G4MAGINTEGRATORSTEPPERFACTORY_HH_
+#define SLIC_G4MAGINTEGRATORSTEPPERFACTORY_HH_ 1
-#ifndef SLIC_G4MAGINTEGRATORSTEPPERFACTORY_HH
-#define SLIC_G4MAGINTEGRATORSTEPPERFACTORY_HH 1
-
// std
#include <string>
projects/slic/trunk/include
--- projects/slic/trunk/include/GPSEventSource.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/GPSEventSource.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,12 +1,10 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/GPSEventSource.hh,v 1.10 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_GPSEVENTSOURCE_HH_
+#define SLIC_GPSEVENTSOURCE_HH_ 1
-#ifndef SLIC_GPSEVENTSOURCE_HH
-#define SLIC_GPSEVENTSOURCE_HH 1
-
-// slic
+// SLIC
#include "EventSource.hh"
-// geant4
+// Geant4
#include "G4GeneralParticleSource.hh"
namespace slic {
projects/slic/trunk/include
--- projects/slic/trunk/include/Geant4VersionInfo.hh.in 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/Geant4VersionInfo.hh.in 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef Geant4VersionInfo_hh
-#define Geant4VersionInfo_hh 1
+#ifndef SLIC_GEANT4VERSIONINFO_HH_
+#define SLIC_GEANT4VERSIONINFO_HH_ 1
// LCDD
#include "lcdd/util/StringUtil.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/GeneratorMessenger.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/GeneratorMessenger.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/GeneratorMessenger.hh,v 1.12 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_GENERATORMESSENGER_HH_
+#define SLIC_GENERATORMESSENGER_HH_ 1
-#ifndef SLIC_GENERATORMESSENGER_HH
-#define SLIC_GENERATORMESSENGER_HH 1
-
// geant4
#include "G4UImessenger.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/HepPDTManager.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/HepPDTManager.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef SLIC_HEPPDTMANAGER_HH
-#define SLIC_HEPPDTMANAGER_HH 1
+#ifndef SLIC_HEPPDTMANAGER_HH_
+#define SLIC_HEPPDTMANAGER_HH_ 1
// HepPDT
#include "HepPDT/TableBuilder.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/HitsCollectionUtil.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/HitsCollectionUtil.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/HitsCollectionUtil.hh,v 1.11 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_HITSCOLLECTIONUTIL_HH_
+#define SLIC_HITSCOLLECTIONUTIL_HH_ 1
-#ifndef SLIC_HITSCOLLECTIONUTIL_HH
-#define SLIC_HITSCOLLECTIONUTIL_HH 1
-
// std
#include <vector>
#include <string>
projects/slic/trunk/include
--- projects/slic/trunk/include/LCExtendedDecay.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LCExtendedDecay.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef SLIC_LCEXTENDEDDECAY_HH
-#define SLIC_LCEXTENDEDDECAY_HH 1
+#ifndef SLIC_LCEXTENDEDDECAY_HH_
+#define SLIC_LCEXTENDEDDECAY_HH_ 1
#include "G4UnknownDecay.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/LCExtendedParticles.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LCExtendedParticles.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,10 +1,10 @@
-#ifndef SLIC_LCEXTENDEDPARTICLES_HH
-#define SLIC_LCEXTENDEDPARTICLES_HH
+#ifndef SLIC_LCEXTENDEDPARTICLES_HH_
+#define SLIC_LCEXTENDEDPARTICLES_HH_ 1
-// slic
+// SLIC
#include "LCExtendedDecay.hh"
-// geant4
+// Geant4
#include "G4VPhysicsConstructor.hh"
#include "G4Decay.hh"
#include "G4hIonisation.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/LCOpticalPhysics.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LCOpticalPhysics.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,16 +1,6 @@
-//
-////////////////////////////////////////////////////////////////
-// //
-// Title: Optical physics for a Linear Collider Detector //
-// Date: //
-// Author: //
-// //
-////////////////////////////////////////////////////////////////
-//
+#ifndef SLIC_LCOPTICALPHYSICS_HH_
+#define SLIC_LCOPTICALPHYSICS_HH_ 1
-#ifndef LCOpticalPhysics_hh
-#define LCOpticalPhysics_hh 1
-
// Geant4
#include "G4VPhysicsConstructor.hh"
#include "G4Cerenkov.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/LCSUSYDecay.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LCSUSYDecay.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,6 +1,7 @@
#ifndef SLIC_LCSUSYDECAY_HH
#define SLIC_LCSUSYDECAY_HH 1
+// Geant4
#include "G4UnknownDecay.hh"
namespace slic {
projects/slic/trunk/include
--- projects/slic/trunk/include/LCSUSYPhysics.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LCSUSYPhysics.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,11 +1,11 @@
-#ifndef SLIC_LCSUSYPHYSICS_H
-#define SLIC_LCSUSYPHYSICS_H 1
+#ifndef SLIC_LCSUSYPHYSICS_HH_
+#define SLIC_LCSUSYPHYSICS_HH_ 1
-// slic
+// SLIC
#include "Module.hh"
#include "LCSUSYDecay.hh"
-// geant4
+// Geant4
#include "G4VPhysicsConstructor.hh"
#include "G4ProcessManager.hh"
#include "G4hIonisation.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/LcioEventSource.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LcioEventSource.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,14 +1,12 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/LcioEventSource.hh,v 1.9 2012-11-27 19:32:17 jeremy Exp $
+#ifndef SLIC_LCIOEVENTSOURCE_HH_
+#define SLIC_LCIOEVENTSOURCE_HH_ 1
-#ifndef SLIC_LCIOEVENTSOURCE_HH
-#define SLIC_LCIOEVENTSOURCE_HH 1
-
-// slic
+// SLIC
#include "EventSourceWithInputFile.hh"
#include "MCParticleGenerator.hh"
#include "LcioManager.hh"
-// lcio
+// LCIO
#include "EVENT/LCEvent.h"
#include "EVENT/LCCollection.h"
#include "IOIMPL/LCFactory.h"
projects/slic/trunk/include
--- projects/slic/trunk/include/LcioFileNamer.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LcioFileNamer.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,15 +1,13 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/LcioFileNamer.hh,v 1.11 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_LCIOFILENAMER_HH_
+#define SLIC_LCIOFILENAMER_HH_ 1
-#ifndef SLIC_LCIOFILENAMER_HH
-#define SLIC_LCIOFILENAMER_HH 1
-
-// slic
+// SLIC
#include "Module.hh"
-// geant4
+// Geant4
#include "G4ThreeVector.hh"
-// std
+// STL
#include <string>
#include <vector>
projects/slic/trunk/include
--- projects/slic/trunk/include/LcioHitsCollectionBuilder.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LcioHitsCollectionBuilder.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/LcioHitsCollectionBuilder.hh,v 1.13 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_LCIOHITSCOLLECTIONBUILDER_HH_
+#define SLIC_LCIOHITSCOLLECTIONBUILDER_HH_ 1
-#ifndef SLIC_LCIOHITSCOLLECTIONBUILDER_HH
-#define SLIC_LCIOHITSCOLLECTIONBUILDER_HH
-
// SLIC
#include "Module.hh"
@@ -19,7 +17,7 @@
#include "IMPL/SimCalorimeterHitImpl.h"
#include "IMPL/SimTrackerHitImpl.h"
-// geant4
+// Geant4
#include "G4Event.hh"
namespace slic {
projects/slic/trunk/include
--- projects/slic/trunk/include/LcioManager.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LcioManager.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/LcioManager.hh,v 1.62 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_LCIOMANAGER_HH_
+#define SLIC_LCIOMANAGER_HH_ 1
-#ifndef SLIC_LCIOMANAGER_HH
-#define SLIC_LCIOMANAGER_HH 1
-
// lcdd
#include "lcdd/detectors/SensitiveDetector.hh"
#include "lcdd/hits/CalorimeterHit.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/LcioMessenger.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LcioMessenger.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/LcioMessenger.hh,v 1.23 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_LCIOMESSENGER_HH_
+#define SLIC_LCIOMESSENGER_HH_ 1
-#ifndef SLIC_LCIOMESSENGER_HH
-#define SLIC_LCIOMESSENGER_HH 1
-
// Geant4
#include "G4UImessenger.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/LogManager.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LogManager.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef SLIC_LOGMANAGER_HH
-#define SLIC_LOGMANAGER_HH 1
+#ifndef SLIC_LOGMANAGER_HH_
+#define SLIC_LOGMANAGER_HH_ 1
// SLIC
#include "LogStream.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/LogMessenger.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LogMessenger.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,7 @@
-// $Id: LogMessenger.hh,v 1.12 2013-11-06 00:23:35 jeremy Exp $
-#ifndef LOG_MESSENGER_HH
-#define LOG_MESSENGER_HH 1
+#ifndef SLIC_LOG_MESSENGER_HH_
+#define SLIC_LOG_MESSENGER_HH_ 1
-// geant4
+// Geant4
#include "G4UImessenger.hh"
class G4UIdirectory;
@@ -10,6 +9,7 @@
class G4UIcmdWithAString;
namespace slic {
+
class LogStream;
/**
projects/slic/trunk/include
--- projects/slic/trunk/include/LogStream.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/LogStream.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,7 +1,7 @@
-#ifndef SLIC_LOGSTREAM_HH
-#define SLIC_LOGSTREAM_HH 1
+#ifndef SLIC_LOGSTREAM_HH_
+#define SLIC_LOGSTREAM_HH_ 1
-// SLIC
+// LCDD
#include "TimeUtil.hh"
// STL
@@ -42,20 +42,29 @@
namespace slic {
/**
+ * @class LogStream
+ *
+ * @brief A class for streaming messages to a log
+ *
+ * @note
* LogStream provides methods for logging messages at a certain level. The
* LogStream has a default level, and if a message's log level is greater
* than the current log level, it is discarded.
*
+ * @note
* The stream operators are overloaded so that the LogStream can be used
* similarly to std::cout.
*
+ * @note
* The manipulator LOG::done should be used to terminate a log message.
*
+ * @note
* Some of the code, particularly the handling of ios manipulators,
* is based on Gaudi's
* <a href="http://isscvs.cern.ch/cgi-bin/cvsweb.cgi/GaudiKernel/GaudiKernel/MsgStream.h?rev=1.41;content-type=text%2Fplain;cvsroot=Gaudi">MsgStream</a>
* class.
*
+ * @note
* For more information on the STL IO library see
* <a href="http://www.cplusplus.com/reference/iolibrary/">this reference page</a>.
*/
projects/slic/trunk/include
--- projects/slic/trunk/include/MCParticleGenerator.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/MCParticleGenerator.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef slic_MCParticleGenerator_hh_
-#define slic_MCParticleGenerator_hh_ 1
+#ifndef SLIC_MCPARTICLEGENERATOR_HH_
+#define SLIC_MCPARTICLEGENERATOR_HH_ 1
// LCIO
#include "EVENT/LCEvent.h"
@@ -25,7 +25,7 @@
class MCParticleManager;
/**
- * @class MCParticle
+ * @class MCParticleGenerator
* @brief Converts from MCParticle collection into a G4Event
*/
class MCParticleGenerator {
projects/slic/trunk/include
--- projects/slic/trunk/include/MCParticleManager.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/MCParticleManager.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef slic_MCParticleManager_hh_
-#define slic_MCParticleManager_hh_ 1
+#ifndef SLIC_MCPARTICLE_MANAGER_HH_
+#define SLIC_MCPARTICLE_MANAGER_HH_ 1
// SLIC
#include "Module.hh"
@@ -37,6 +37,7 @@
/**
* @class MCParticleManager
+ * @brief Management of global MCParticle information
*
* @note
* This class is responsible for management of MCParticle information
projects/slic/trunk/include
--- projects/slic/trunk/include/Module.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/Module.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/Module.hh,v 1.13 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_MODULE_HH_
+#define SLIC_MODULE_HH_ 1
-#ifndef SLIC_MODULE_HH
-#define SLIC_MODULE_HH 1
-
// slic
#include "LogManager.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/ModuleRegistry.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/ModuleRegistry.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,5 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/ModuleRegistry.hh,v 1.8 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_MODULEREGISTRY_HH_
+#define SLIC_MODULEREGISTRY_HH_ 1
// std
#include <map>
@@ -76,3 +77,5 @@
ModuleMap m_modules;
};
}
+
+#endif
projects/slic/trunk/include
--- projects/slic/trunk/include/PackageInfo.hh.in 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/PackageInfo.hh.in 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,6 +1,5 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/PackageInfo.hh.in,v 1.8 2013-11-06 00:23:35 jeremy Exp $
-#ifndef SLIC_PACKAGE_INFO_HH
-#define SLIC_PACKAGE_INFO_HH 1
+#ifndef SLIC_PACKAGE_INFO_HH_
+#define SLIC_PACKAGE_INFO_HH_ 1
#include "lcdd/util/StringUtil.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/ParticleGunEventSource.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/ParticleGunEventSource.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/ParticleGunEventSource.hh,v 1.9 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_PARTICLEGUNEVENTSOURCE_HH_
+#define SLIC_PARTICLEGUNEVENTSOURCE_HH_ 1
-#ifndef SLIC_PARTICLEGUNEVENTSOURCE_HH
-#define SLIC_PARTICLEGUNEVENTSOURCE_HH 1
-
// slic
#include "EventSource.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/PhysicsListManager.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/PhysicsListManager.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/PhysicsListManager.hh,v 1.24 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_PHYSICSLISTMANAGER_HH_
+#define SLIC_PHYSICSLISTMANAGER_HH_ 1
-#ifndef SLIC_PHYSICSLISTMANAGER_HH
-#define SLIC_PHYSICSLISTMANAGER_HH 1
-
// lcdd
#include "Module.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/PhysicsMessenger.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/PhysicsMessenger.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/PhysicsMessenger.hh,v 1.14 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_PHYSICSMESSENGER_HH_
+#define SLIC_PHYSICSMESSENGER_HH_ 1
-#ifndef SLIC_PHYSICSMESSENGER_HH
-#define SLIC_PHYSICSMESSENGER_HH 1
-
// geant4
#include "G4UImessenger.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/PrimaryGeneratorAction.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/PrimaryGeneratorAction.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/PrimaryGeneratorAction.hh,v 1.25 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_PRIMARYGENERATORACTION_HH_
+#define SLIC_PRIMARYGENERATORACTION_HH_ 1
-#ifndef SLIC_PRIMARYGENERATORACTION_HH
-#define SLIC_PRIMARYGENERATORACTION_HH 1
-
// SLIC
#include "EventSourceManager.hh"
#include "Module.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/RunAction.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/RunAction.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/RunAction.hh,v 1.14 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_RUNACTION_HH_
+#define SLIC_RUNACTION_HH_ 1
-#ifndef SLIC_RUNACTION_HH
-#define SLIC_RUNACTION_HH 1
-
// slic
#include "Module.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/RunManager.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/RunManager.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/RunManager.hh,v 1.18 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_RUNMANAGER_HH_
+#define SLIC_RUNMANAGER_HH_ 1
-#ifndef SLIC_RUNMANAGER_HH
-#define SLIC_RUNMANAGER_HH 1
-
// geant4
#include "G4RunManager.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/Singleton.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/Singleton.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Id: Singleton.hh,v 1.5 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_SINGLETON_HH_
+#define SLIC_SINGLETON_HH_ 1
-#ifndef SLIC_SINGLETON_HH
-#define SLIC_SINGLETON_HH 1
-
/**
* @class Singleton<T>
* @note A templated class for creating Singletons.
projects/slic/trunk/include
--- projects/slic/trunk/include/SlicApplication.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/SlicApplication.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/SlicApplication.hh,v 1.44 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_SLICAPPLICATION_HH_
+#define SLIC_SLICAPPLICATION_HH_ 1
-#ifndef SLIC_SLICAPPLICATION_HH
-#define SLIC_SLICAPPLICATION_HH 1
-
// SLIC
#include "Singleton.hh"
#include "Module.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/SlicApplicationMessenger.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/SlicApplicationMessenger.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,9 +1,7 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/SlicApplicationMessenger.hh,v 1.3 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_SLICAPPLICATIONMESSENGER_HH_
+#define SLIC_SLICAPPLICATIONMESSENGER_HH_ 1
-#ifndef SLIC_SLICAPPLICATIONMESSENGER_HH
-#define SLIC_SLICAPPLICATIONMESSENGER_HH 1
-
-// geant4
+// Geant4
#include "G4UImessenger.hh"
#include "G4UIdirectory.hh"
#include "G4UIcommand.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/SlicMain.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/SlicMain.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,6 +1,5 @@
-// $Id: SlicMain.hh,v 1.3 2013-11-06 00:23:35 jeremy Exp $
-#ifndef SLIC_SLICMAIN_HH
-#define SLIC_SLICMAIN_HH 1
+#ifndef SLIC_SLICMAIN_HH_
+#define SLIC_SLICMAIN_HH_ 1
#include "Module.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/StackingAction.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/StackingAction.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,10 +1,15 @@
-#ifndef SLIC_STACKINGACTION_HH
-#define SLIC_STACKINGACTION_HH 1
+#ifndef SLIC_STACKINGACTION_HH_
+#define SLIC_STACKINGACTION_HH_ 1
#include "globals.hh"
#include "G4UserStackingAction.hh"
/**
+ * @class StackingAction
+ *
+ * @brief Implemention of Geant4's G4UserStackingAction
+ *
+ * @note
* Implementation of G4UserStackingAction for SLIC.
* This is copied from Mokka and right now it just
* suspends backscattering tracks until the end
projects/slic/trunk/include
--- projects/slic/trunk/include/StdHepEventSource.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/StdHepEventSource.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/StdHepEventSource.hh,v 1.11 2013-11-06 00:23:35 jeremy Exp $
+#ifndef SLIC_STDHEPEVENTSOURCE_HH_
+#define SLIC_STDHEPEVENTSOURCE_HH_ 1
-#ifndef SLIC_STDHEPEVENTSOURCE_HH
-#define SLIC_STDHEPEVENTSOURCE_HH 1
-
// SLIC
#include "EventSourceWithInputFile.hh"
#include "StdHepGenerator.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/StdHepGenerator.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/StdHepGenerator.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef slic_StdhepGenerator_hh_
-#define slic_StdhepGenerator_hh_ 1
+#ifndef SLIC_STDHEPGENERATOR_HH_
+#define SLIC_STDHEPGENERATOR_HH_ 1
// SLIC
#include "MCParticleManager.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/SteppingAction.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/SteppingAction.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/SteppingAction.hh,v 1.17 2013-11-06 00:23:36 jeremy Exp $
+#ifndef SLIC_STEPPINGACTION_HH_
+#define SLIC_STEPPINGACTION_HH_ 1
-#ifndef SLIC_STEPPINGACTION_HH
-#define SLIC_STEPPINGACTION_HH 1
-
// SLIC
#include "Module.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/TimeUtil.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/TimeUtil.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/TimeUtil.hh,v 1.12 2013-11-06 00:23:36 jeremy Exp $
#ifndef SLIC_TIMEUTIL_HH
#define SLIC_TIMEUTIL_HH 1
@@ -8,6 +7,8 @@
#include <iostream>
#include <string>
+namespace slic {
+
/**
* @class TimeUtil
* @brief Miscellaneous time-related utilities.
@@ -51,4 +52,6 @@
}
};
+} // namespace slic
+
#endif
projects/slic/trunk/include
--- projects/slic/trunk/include/TrackManager.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/TrackManager.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef slic_TrackManager_hh_
-#define slic_TrackManager_hh_ 1
+#ifndef SLIC_TRACKMANAGER_HH_
+#define SLIC_TRACKMANAGER_HH_ 1
// SLIC
#include "Module.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/TrackSummary.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/TrackSummary.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef slic_TrackSummary_hh
-#define slic_TrackSummary_hh 1
+#ifndef SLIC_TRACKSUMMARY_HH_
+#define SLIC_TRACKSUMMARY_HH_ 1
// LCIO
#include "lcio.h"
projects/slic/trunk/include
--- projects/slic/trunk/include/TrackUtil.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/TrackUtil.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef slic_TrackUtil_hh_
-#define slic_TrackUtil_hh_ 1
+#ifndef SLIC_TRACKUTIL_HH_
+#define SLIC_TRACKUTIL_HH_ 1
// LCDD
#include "lcdd/geant4/UserRegionInformation.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/TrackingAction.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/TrackingAction.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,7 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/TrackingAction.hh,v 1.10 2013-11-06 00:23:36 jeremy Exp $
-#ifndef SLIC_TRACKINGACTION_HH
-#define SLIC_TRACKINGACTION_HH 1
+#ifndef SLIC_TRACKINGACTION_HH_
+#define SLIC_TRACKINGACTION_HH_ 1
-// geant4
+// Geant4
#include "G4UserTrackingAction.hh"
#include "G4TrackingManager.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/UserTrackInformation.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/UserTrackInformation.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef slic_UserTrackInformation_hh_
-#define slic_UserTrackInformation_hh_ 1
+#ifndef SLIC_USERTRACKINFORMATION_HH_
+#define SLIC_USERTRACKINFORMATION_HH_ 1
// LCDD
#include "lcdd/geant4/VUserTrackInformation.hh"
projects/slic/trunk/include
--- projects/slic/trunk/include/VRML2Writer.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/VRML2Writer.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,5 @@
-#ifndef SLIC_VRML2WRITER_HH
-#define SLIC_VRML2WRITER_HH 1
+#ifndef SLIC_VRML2WRITER_HH_
+#define SLIC_VRML2WRITER_HH_ 1
#include <fstream>
#include <iostream>
projects/slic/trunk/include
--- projects/slic/trunk/include/VRML2WriterMessenger.hh 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/include/VRML2WriterMessenger.hh 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/include/VRML2WriterMessenger.hh,v 1.3 2013-11-06 00:23:36 jeremy Exp $
+#ifndef SLIC_VRML2WRITERMESSENGER_HH_
+#define SLIC_VRML2WRITERMESSENGER_HH_ 1
-#ifndef SLIC_VRML2WRITERMESSENGER_HH
-#define SLIC_VRML2WRITERMESSENGER_HH 1
-
#include "G4UImessenger.hh"
class G4UIcommand;
projects/slic/trunk
--- projects/slic/trunk/slic.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/slic.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,23 +1,22 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/slic.cc,v 1.23 2013-11-06 00:23:35 jeremy Exp $
-
-/**
- * @mainpage
+/*!
+ * @mainpage Simulator for the Linear Collider (SLIC) Documentation
*
+ * @par
* The SLIC simulator is a Geant4 package that uses LCDD as its geometry input.
*
+ * @par
* To see the available command line options, execute the following from the shell:
- * @verbatim
- * slic --help
- * @endverbatim
+ * @verbatim slic --help @endverbatim
*
+ * @par
* To print the version of the application, execute the following:
- * @verbatim
- * slic --version
- * @endverbatim
+ * @verbatim slic --version @endverbatim
*
+ * @par
* The primary source of documentation for SLIC is its
* <a href="https://confluence.slac.stanford.edu/display/ilc/SLIC">Confluence Wiki page</a>.
*
+ * @par
* Any questions can be directed to <a href="mailto:[log in to unmask]">Jeremy McCormick</a>
* or posted in the <a href="http://forum.linearcollider.org/index.php?t=threadt&frm_id=7&rid=0&S=012b8714798313e7abf7c4d092eb9d0a">Full Simulations Area</a>
* of the <a href="http://forum.linearcollider.org/">LinearCollider.org Forum</a>.
projects/slic/trunk/src
--- projects/slic/trunk/src/CommandLineProcessor.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/CommandLineProcessor.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -2,7 +2,7 @@
#include "CommandLineProcessor.hh"
-// slic
+// SLIC
#include "PackageInfo.hh"
#include "CommandQueue.hh"
#include "CommandLineOption.hh"
@@ -10,7 +10,7 @@
// getopt
#include "getopt.h"
-// stl
+// STL
#include <sstream>
#include <cassert>
projects/slic/trunk/src
--- projects/slic/trunk/src/CommandQueue.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/CommandQueue.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,8 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/CommandQueue.cc,v 1.5 2013-11-06 00:23:36 jeremy Exp $
-
#include "CommandQueue.hh"
-// geant4
+// Geant4
#include "G4UImanager.hh"
namespace slic {
projects/slic/trunk/src
--- projects/slic/trunk/src/EventAction.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/EventAction.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,7 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/EventAction.cc,v 1.32 2013-06-26 01:57:02 jeremy Exp $
+#include "EventAction.hh"
// LCDD
-#include "EventAction.hh"
#include "lcdd/util/StringUtil.hh"
// SLIC
@@ -10,7 +9,6 @@
#include "LcioManager.hh"
#include "MCParticleManager.hh"
#include "RunManager.hh"
-//#include "SlicApplication.hh"
#include "TrackManager.hh"
// Geant4
projects/slic/trunk/src
--- projects/slic/trunk/src/EventMessenger.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/EventMessenger.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,10 +1,9 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/EventMessenger.cc,v 1.5 2012-11-27 19:32:19 jeremy Exp $
#include "EventMessenger.hh"
-// slic
+// SLIC
#include "EventAction.hh"
-// geant4
+// Geant4
#include "G4UIcmdWithABool.hh"
namespace slic {
projects/slic/trunk/src
--- projects/slic/trunk/src/EventSource.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/EventSource.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,7 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/EventSource.cc,v 1.8 2012-11-27 19:32:19 jeremy Exp $
#include "EventSource.hh"
-// geant4
+// Geant4
#include "G4Run.hh"
#include "G4Event.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/EventSourceManager.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/EventSourceManager.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,13 +1,10 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/EventSourceManager.cc,v 1.26 2013-06-26 01:57:02 jeremy Exp $
#include "EventSourceManager.hh"
// SLIC
#include "FileUtil.hh"
-
#include "EventAction.hh"
#include "RunManager.hh"
#include "SlicApplication.hh"
-
#include "GPSEventSource.hh"
#include "LcioEventSource.hh"
#include "ParticleGunEventSource.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/EventSourceWithInputFile.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/EventSourceWithInputFile.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,7 +1,7 @@
// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/EventSourceWithInputFile.cc,v 1.10 2012-11-27 19:32:19 jeremy Exp $
#include "EventSourceWithInputFile.hh"
-// slic
+// SLIC
#include "EventSourceManager.hh"
namespace slic {
projects/slic/trunk/src
--- projects/slic/trunk/src/FieldManager.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/FieldManager.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,6 +1,7 @@
#include "FieldManager.hh"
namespace slic {
+
FieldManager::FieldManager() :
Module("FieldManager") {
m_messenger = new FieldMessenger(this);
projects/slic/trunk/src
--- projects/slic/trunk/src/FieldMessenger.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/FieldMessenger.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,11 +1,10 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/FieldMessenger.cc,v 1.9 2012-11-27 19:32:19 jeremy Exp $
#include "FieldMessenger.hh"
-// slic
+// SLIC
#include "FieldManager.hh"
#include "G4MagIntegratorStepperFactory.hh"
-// geant4
+// Geant4
#include "G4UIcmdWithADoubleAndUnit.hh"
#include "G4FieldManager.hh"
#include "G4UIcommand.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/FileUtil.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/FileUtil.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,7 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/FileUtil.cc,v 1.14 2012-11-27 19:32:19 jeremy Exp $
#include "FileUtil.hh"
-// std
+// STL
#include <iostream>
#include <stdio.h>
#include <fstream>
projects/slic/trunk/src
--- projects/slic/trunk/src/G4MagIntegratorStepperFactory.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/G4MagIntegratorStepperFactory.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,7 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/G4MagIntegratorStepperFactory.cc,v 1.8 2012-11-27 19:32:19 jeremy Exp $
#include "G4MagIntegratorStepperFactory.hh"
-// G4
+// Geant4
#include "G4SystemOfUnits.hh"
#include "G4Mag_UsualEqRhs.hh"
#include "G4ChordFinder.hh"
@@ -13,7 +12,6 @@
#include "G4HelixImplicitEuler.hh"
#include "G4HelixSimpleRunge.hh"
#include "G4ImplicitEuler.hh"
-//#include "G4RKG3_Stepper.hh"
#include "G4SimpleHeum.hh"
#include "G4SimpleRunge.hh"
#include "G4CashKarpRKF45.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/GPSEventSource.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/GPSEventSource.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/GPSEventSource.cc,v 1.9 2012-11-27 19:32:19 jeremy Exp $
#include "GPSEventSource.hh"
// geant4
projects/slic/trunk/src
--- projects/slic/trunk/src/GeneratorMessenger.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/GeneratorMessenger.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,7 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/GeneratorMessenger.cc,v 1.19 2013-06-26 01:57:02 jeremy Exp $
+#include "GeneratorMessenger.hh"
// SLIC
-#include "GeneratorMessenger.hh"
#include "EventSourceManager.hh"
// LCDD
projects/slic/trunk/src
--- projects/slic/trunk/src/HitsCollectionUtil.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/HitsCollectionUtil.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/HitsCollectionUtil.cc,v 1.7 2013-07-01 21:01:31 jeremy Exp $
#include "HitsCollectionUtil.hh"
// LCDD
projects/slic/trunk/src
--- projects/slic/trunk/src/LCOpticalPhysics.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/LCOpticalPhysics.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,13 +1,3 @@
-//
-////////////////////////////////////////////////////////////////
-// //
-// Title: Optical physics for a Linear Collider Detector //
-// Date: //
-// Author: //
-// //
-////////////////////////////////////////////////////////////////
-//
-
#include "LCOpticalPhysics.hh"
// Geant4
@@ -27,7 +17,6 @@
void LCOpticalPhysics::ConstructProcess() {
ConstructOp();
-
}
void LCOpticalPhysics::ConstructOp() {
@@ -37,23 +26,9 @@
theRayleighScatteringProcess = new G4OpRayleigh();
theBoundaryProcess = new G4OpBoundaryProcess();
-// theCerenkovProcess->DumpPhysicsTable();
-// theScintillationProcess->DumpPhysicsTable();
-// theAbsorptionProcess->DumpPhysicsTable();
-// theRayleighScatteringProcess->DumpPhysicsTable();
-
-//#ifdef debug
-// G4cout << "VERBOSE = " << theCerenkovProcess->GetVerboseLevel() << G4endl;
-// G4cout << "Inside LCOpticalPhysics::ConstructOp()" << G4endl;
- //#endif
-
theCerenkovProcess->SetMaxNumPhotonsPerStep(300);
-
theScintillationProcess->SetScintillationYieldFactor(1.);
- // theScintillationProcess->SetTrackSecondariesFirst(true);
- //G4OpticalSurfaceModel themodel = unified;
- //theBoundaryProcess->SetModel(themodel);
#if ( G4VERSION_NUMBER < 960 )
G4ParticleTable::G4PTblDicIterator* aParticleIterator = G4ParticleTable::GetParticleTable()->GetIterator();
#endif
@@ -66,13 +41,8 @@
G4String particleName = particle->GetParticleName();
if (theCerenkovProcess->IsApplicable(*particle)) {
- //if (Geant4VersionInfo::getMajorVersion() >= 9 && Geant4VersionInfo::getMinorVersion() >= 1) {
- // Geant4 9.1 changes Cerenkov to be a post-step process.
pmanager->AddProcess(theCerenkovProcess);
pmanager->SetProcessOrderingToLast(theCerenkovProcess, idxPostStep);
- //} else {
- // pmanager->AddContinuousProcess(theCerenkovProcess);
- //}
}
if (theScintillationProcess->IsApplicable(*particle)) {
pmanager->AddProcess(theScintillationProcess);
projects/slic/trunk/src
--- projects/slic/trunk/src/LcioEventSource.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/LcioEventSource.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/LcioEventSource.cc,v 1.9 2012-11-27 19:32:19 jeremy Exp $
#include "LcioEventSource.hh"
// SLIC
projects/slic/trunk/src
--- projects/slic/trunk/src/LcioFileNamer.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/LcioFileNamer.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/LcioFileNamer.cc,v 1.24 2013-11-06 00:23:37 jeremy Exp $
-
// SLIC
#include "LcioFileNamer.hh"
#include "EventSourceManager.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/LcioHitsCollectionBuilder.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/LcioHitsCollectionBuilder.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,7 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/LcioHitsCollectionBuilder.cc,v 1.33 2013-11-06 00:23:37 jeremy Exp $
+#include "LcioHitsCollectionBuilder.hh"
// SLIC
-#include "LcioHitsCollectionBuilder.hh"
#include "HitsCollectionUtil.hh"
#include "MCParticleManager.hh"
#include "SlicApplication.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/LcioManager.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/LcioManager.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/LcioManager.cc,v 1.96 2013-11-06 00:23:37 jeremy Exp $
#include "LcioManager.hh"
// SLIC
projects/slic/trunk/src
--- projects/slic/trunk/src/LcioMessenger.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/LcioMessenger.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/LcioMessenger.cc,v 1.38 2013-06-26 01:57:02 jeremy Exp $
-
// SLIC
#include "LcioMessenger.hh"
#include "LcioManager.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/Module.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/Module.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,10 +1,9 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/Module.cc,v 1.9 2013-06-26 01:57:02 jeremy Exp $
-
// SLIC
#include "Module.hh"
#include "ModuleRegistry.hh"
namespace slic {
+
Module::Module(const std::string& name, bool deleteOnExit, bool autoRegister) :
m_deleteOnExit(deleteOnExit) {
m_name = name;
projects/slic/trunk/src
--- projects/slic/trunk/src/ModuleRegistry.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/ModuleRegistry.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/ModuleRegistry.cc,v 1.7 2012-11-27 19:32:19 jeremy Exp $
#include "ModuleRegistry.hh"
// slic
projects/slic/trunk/src
--- projects/slic/trunk/src/ParticleGunEventSource.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/ParticleGunEventSource.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/ParticleGunEventSource.cc,v 1.6 2012-11-27 19:32:19 jeremy Exp $
#include "ParticleGunEventSource.hh"
// geant4
projects/slic/trunk/src
--- projects/slic/trunk/src/PhysicsListManager.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/PhysicsListManager.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/PhysicsListManager.cc,v 1.29 2013-11-06 16:24:10 jeremy Exp $
#include "PhysicsListManager.hh"
// geant4
projects/slic/trunk/src
--- projects/slic/trunk/src/PhysicsMessenger.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/PhysicsMessenger.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/PhysicsMessenger.cc,v 1.27 2013-06-26 01:57:02 jeremy Exp $
-
// SLIC
#include "PhysicsMessenger.hh"
#include "PhysicsListManager.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/PrimaryGeneratorAction.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/PrimaryGeneratorAction.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/PrimaryGeneratorAction.cc,v 1.38 2013-06-26 01:57:02 jeremy Exp $
-
// SLIC
#include "EventSourceManager.hh"
#include "LcioManager.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/RunAction.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/RunAction.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,10 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/RunAction.cc,v 1.23 2013-06-26 01:57:02 jeremy Exp $
-
// SLIC
-//#include "LcioManager.hh"
#include "EventSourceManager.hh"
#include "LcioManager.hh"
-//#include "EventDebugger.hh"
#include "TrackManager.hh"
// LCDD
@@ -41,9 +37,6 @@
// Execute GeometryManager's beginRun action.
GeometryManager::instance()->beginRun(aRun);
-
- // Execute EventDebugger's beginRun action.
- //EventDebugger::instance()->beginRun( aRun );
}
void RunAction::EndOfRunAction(const G4Run *run) {
projects/slic/trunk/src
--- projects/slic/trunk/src/RunManager.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/RunManager.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/RunManager.cc,v 1.23 2013-06-26 01:57:02 jeremy Exp $
-
// SLIC
#include "RunManager.hh"
#include "EventAction.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/SlicApplication.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/SlicApplication.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/SlicApplication.cc,v 1.61 2013-10-29 20:29:43 jeremy Exp $
-
// SLIC
#include "SlicApplication.hh"
#include "CommandLineProcessor.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/SlicApplicationMessenger.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/SlicApplicationMessenger.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/SlicApplicationMessenger.cc,v 1.2 2012-11-27 19:32:19 jeremy Exp $
#include "SlicApplicationMessenger.hh"
// slic
projects/slic/trunk/src
--- projects/slic/trunk/src/SlicMain.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/SlicMain.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,5 +1,3 @@
-// $Id: SlicMain.cc,v 1.7 2012-11-28 01:40:48 jeremy Exp $
-
#include "SlicMain.hh"
// slic
projects/slic/trunk/src
--- projects/slic/trunk/src/StackingAction.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/StackingAction.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,11 +1,6 @@
-/*
- * StackingAction.cc
- *
- * Created on: Jun 26, 2014
- * Author: jeremym
- */
-
#include "StackingAction.hh"
+
+// Geant4
#include "G4Track.hh"
#include "G4DecayProducts.hh"
#include "G4ios.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/StdHepEventSource.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/StdHepEventSource.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/StdHepEventSource.cc,v 1.10 2013-11-06 00:23:37 jeremy Exp $
#include "StdHepEventSource.hh"
// SLIC
projects/slic/trunk/src
--- projects/slic/trunk/src/SteppingAction.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/SteppingAction.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,7 +1,6 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/SteppingAction.cc,v 1.16 2013-07-01 21:01:31 jeremy Exp $
+#include "SteppingAction.hh"
// SLIC
-#include "SteppingAction.hh"
#include "UserTrackInformation.hh"
#include "TrackUtil.hh"
projects/slic/trunk/src
--- projects/slic/trunk/src/TrackingAction.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/TrackingAction.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/TrackingAction.cc,v 1.14 2012-11-27 19:32:19 jeremy Exp $
#include "TrackingAction.hh"
// LCDD
projects/slic/trunk/src
--- projects/slic/trunk/src/UserTrackInformation.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/UserTrackInformation.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,6 +1,8 @@
#include "UserTrackInformation.hh"
namespace slic {
+
G4Allocator<UserTrackInformation> UserTrackInformationAllocator;
+
}
projects/slic/trunk/src
--- projects/slic/trunk/src/VRML2Writer.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/VRML2Writer.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,4 +1,3 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/VRML2Writer.cc,v 1.7 2012-11-27 19:32:19 jeremy Exp $
#include "VRML2Writer.hh"
// stl
projects/slic/trunk/src
--- projects/slic/trunk/src/VRML2WriterMessenger.cc 2014-07-30 21:49:11 UTC (rev 3206)
+++ projects/slic/trunk/src/VRML2WriterMessenger.cc 2014-07-30 21:52:22 UTC (rev 3207)
@@ -1,11 +1,9 @@
-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/VRML2WriterMessenger.cc,v 1.2 2012-11-27 19:32:19 jeremy Exp $
-
#include "VRML2WriterMessenger.hh"
-// slic
+// SLIC
#include "VRML2Writer.hh"
-// geant4
+// Geant4
#include "G4UIcommand.hh"
#include "G4UIdirectory.hh"
#include "G4UIcmdWithAString.hh"
SVNspam 0.1