Commit in slic on MAIN
include/EventAction.hh+5-61.11 -> 1.12
       /LCDD.hh+4-21.2 -> 1.3
       /LcioHitsCollectionBuilder.hh+4-41.7 -> 1.8
       /LcioManager.hh+4-41.59 -> 1.60
       /LcioMcpPrinter.hh+5-61.19 -> 1.20
       /SlicApplication.hh+3-71.42 -> 1.43
       /TrajectoryManager.hh+6-61.33 -> 1.34
src/EventAction.cc+5-61.31 -> 1.32
   /EventDebuggerMessenger.cc+2-21.5 -> 1.6
   /EventSourceManager.cc+5-51.25 -> 1.26
   /GeneratorMessenger.cc+7-71.18 -> 1.19
   /HitsCollectionUtil.cc+3-31.5 -> 1.6
   /LcioFileNamer.cc+9-91.22 -> 1.23
   /LcioHitsCollectionBuilder.cc+7-101.25 -> 1.26
   /LcioManager.cc+5-51.93 -> 1.94
   /LcioMcpManager.cc+2-21.73 -> 1.74
   /LcioMcpMessenger.cc+7-51.13 -> 1.14
   /LcioMcpPrinter.cc+6-41.20 -> 1.21
   /LcioMessenger.cc+7-71.37 -> 1.38
   /LcioPrimaryGenerator.cc+6-41.40 -> 1.41
   /LogMessenger.cc+6-51.12 -> 1.13
   /Module.cc+3-61.8 -> 1.9
   /PhysicsMessenger.cc+6-61.26 -> 1.27
   /PrimaryGeneratorAction.cc+7-81.37 -> 1.38
   /RunAction.cc+5-51.22 -> 1.23
   /RunManager.cc+8-81.22 -> 1.23
   /SlicApplication.cc+5-81.59 -> 1.60
   /StdHepLoader.cc+2-21.22 -> 1.23
   /SteppingAction.cc+7-71.14 -> 1.15
   /Trajectory.cc+2-21.16 -> 1.17
+153-161
30 modified files
update SLIC with new include directories from LCDD head
slic/include
EventAction.hh 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- EventAction.hh	27 Nov 2012 19:32:17 -0000	1.11
+++ EventAction.hh	26 Jun 2013 01:57:02 -0000	1.12
@@ -1,16 +1,16 @@

-// $Header: /cvs/lcd/slic/include/EventAction.hh,v 1.11 2012/11/27 19:32:17 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/EventAction.hh,v 1.12 2013/06/26 01:57:02 jeremy Exp $

 
 #ifndef SLIC_EVENTACTION_HH
 #define SLIC_EVENTACTION_HH 1
 

-// slic

+// SLIC

 #include "Module.hh"
 
 // LCDD

-#include "G4CalorimeterHit.hh"
-#include "G4TrackerHit.hh"

+#include "lcdd/hits/G4CalorimeterHit.hh"
+#include "lcdd/hits/G4TrackerHit.hh"

 

-// G4

+// Geant4

 #include "G4UserEventAction.hh"
 #include "G4Timer.hh"
 

@@ -19,7 +19,6 @@

 namespace slic {
 
 /**

- * @class EventAction.

  * @brief Implementation of G4UserEventAction.
  * @note  Calls actions of TrajectoryManager and LcioManager.
  */
slic/include
LCDD.hh 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- LCDD.hh	27 Nov 2012 19:32:17 -0000	1.2
+++ LCDD.hh	26 Jun 2013 01:57:02 -0000	1.3
@@ -1,10 +1,12 @@

-// $Id: LCDD.hh,v 1.2 2012/11/27 19:32:17 jeremy Exp $

+// $Id: LCDD.hh,v 1.3 2013/06/26 01:57:02 jeremy Exp $

 #ifndef SLIC_LCDD_HH
 #define SLIC_LCDD_HH 1
 

+// SLIC

 #include "Module.hh"
 

-#include "LCDDDetectorConstruction.hh"

+// LCDD
+#include "lcdd/core/LCDDDetectorConstruction.hh"

 
 namespace slic {
 /**
slic/include
LcioHitsCollectionBuilder.hh 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- LcioHitsCollectionBuilder.hh	27 Nov 2012 19:32:17 -0000	1.7
+++ LcioHitsCollectionBuilder.hh	26 Jun 2013 01:57:02 -0000	1.8
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/include/LcioHitsCollectionBuilder.hh,v 1.7 2012/11/27 19:32:17 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/LcioHitsCollectionBuilder.hh,v 1.8 2013/06/26 01:57:02 jeremy Exp $

 
 #ifndef SLIC_LCIOHITSCOLLECTIONBUILDER_HH
 #define SLIC_LCIOHITSCOLLECTIONBUILDER_HH

@@ -7,9 +7,9 @@

 #include "Module.hh"
 
 // lcdd

-#include "G4SensitiveDetector.hh"
-#include "G4CalorimeterHit.hh"
-#include "G4TrackerHit.hh"

+#include "lcdd/detectors/G4SensitiveDetector.hh"
+#include "lcdd/hits/G4CalorimeterHit.hh"
+#include "lcdd/hits/G4TrackerHit.hh"

 
 // lcio
 #include "EVENT/LCEvent.h"
slic/include
LcioManager.hh 1.59 -> 1.60
diff -u -r1.59 -r1.60
--- LcioManager.hh	27 Nov 2012 19:32:17 -0000	1.59
+++ LcioManager.hh	26 Jun 2013 01:57:02 -0000	1.60
@@ -1,12 +1,12 @@

-// $Header: /cvs/lcd/slic/include/LcioManager.hh,v 1.59 2012/11/27 19:32:17 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/LcioManager.hh,v 1.60 2013/06/26 01:57:02 jeremy Exp $

 
 #ifndef SLIC_LCIOMANAGER_HH
 #define SLIC_LCIOMANAGER_HH 1
 
 // lcdd

-#include "G4SensitiveDetector.hh"
-#include "G4CalorimeterHit.hh"
-#include "G4TrackerHit.hh"

+#include "lcdd/detectors/G4SensitiveDetector.hh"
+#include "lcdd/hits/G4CalorimeterHit.hh"
+#include "lcdd/hits/G4TrackerHit.hh"

 
 // slic
 #include "LcioPrimaryGenerator.hh"
slic/include
LcioMcpPrinter.hh 1.19 -> 1.20
diff -u -r1.19 -r1.20
--- LcioMcpPrinter.hh	27 Nov 2012 19:32:18 -0000	1.19
+++ LcioMcpPrinter.hh	26 Jun 2013 01:57:02 -0000	1.20
@@ -1,23 +1,22 @@

-// $Header: /cvs/lcd/slic/include/LcioMcpPrinter.hh,v 1.19 2012/11/27 19:32:18 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/LcioMcpPrinter.hh,v 1.20 2013/06/26 01:57:02 jeremy Exp $

 
 #ifndef SLIC_LCIOMCPPRINTER_HH
 #define SLIC_LCIOMCPPRINTER_HH 1
 

-// lcio

+// LCIO

 #include "EVENT/LCCollection.h"
 #include "EVENT/MCParticle.h"
 

-// slic

+// SLIC

 #include "LcioMcpManager.hh"
 

-// std

+// STL

 #include <map>
 
 namespace slic {
 
 /**

- @class LcioMcpPrinter
- @brief Mcp printer, mostly for debugging output of MCParticle collection.

+ * @brief Prints MCParticle information for debugging.

  */
 class LcioMcpPrinter: public Module {
 public:
slic/include
SlicApplication.hh 1.42 -> 1.43
diff -u -r1.42 -r1.43
--- SlicApplication.hh	29 Nov 2012 00:32:45 -0000	1.42
+++ SlicApplication.hh	26 Jun 2013 01:57:02 -0000	1.43
@@ -1,20 +1,16 @@

-// $Header: /cvs/lcd/slic/include/SlicApplication.hh,v 1.42 2012/11/29 00:32:45 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/SlicApplication.hh,v 1.43 2013/06/26 01:57:02 jeremy Exp $

 
 #ifndef SLIC_SLICAPPLICATION_HH
 #define SLIC_SLICAPPLICATION_HH 1
 

-// slic

+// SLIC

 #include "Singleton.hh"
 #include "Module.hh"
 

-// geant4

+// Geant4

 #include "G4UIsession.hh"
 #include "G4ApplicationState.hh"
 

-// std
-//#include <cstdlib>
-
-// geant4

 class G4RunManager;
 class G4UIExecutive;
slic/include
TrajectoryManager.hh 1.33 -> 1.34
diff -u -r1.33 -r1.34
--- TrajectoryManager.hh	27 Nov 2012 19:32:18 -0000	1.33
+++ TrajectoryManager.hh	26 Jun 2013 01:57:02 -0000	1.34
@@ -1,16 +1,16 @@

-// $Header: /cvs/lcd/slic/include/TrajectoryManager.hh,v 1.33 2012/11/27 19:32:18 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/TrajectoryManager.hh,v 1.34 2013/06/26 01:57:02 jeremy Exp $

 
 #ifndef SLIC_TRAJECTORYMANAGER_HH
 #define SLIC_TRAJECTORYMANAGER_HH 1
 

-// lcdd
-#include "G4UserRegionInformation.hh"
-#include "TrackInformation.hh"
-#include "Trajectory.hh"

+// LCDD
+#include "lcdd/geant4/G4UserRegionInformation.hh"
+#include "lcdd/hits/TrackInformation.hh"

 

-// slic

+// SLIC

 #include "Module.hh"
 #include "Singleton.hh"

+#include "Trajectory.hh"

 
 // geant4
 #include "G4Track.hh"
slic/src
EventAction.cc 1.31 -> 1.32
diff -u -r1.31 -r1.32
--- EventAction.cc	27 Nov 2012 19:32:19 -0000	1.31
+++ EventAction.cc	26 Jun 2013 01:57:02 -0000	1.32
@@ -1,11 +1,10 @@

-// $Header: /cvs/lcd/slic/src/EventAction.cc,v 1.31 2012/11/27 19:32:19 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/EventAction.cc,v 1.32 2013/06/26 01:57:02 jeremy Exp $

 

+// LCDD

 #include "EventAction.hh"

+#include "lcdd/util/StringUtil.hh"

 

-// lcdd
-#include "StringUtil.hh"
-
-// slic

+// SLIC

 #include "LcioManager.hh"
 #include "TrajectoryManager.hh"
 #include "EventSourceManager.hh"

@@ -13,7 +12,7 @@

 #include "EventMessenger.hh"
 #include "EventDebugger.hh"
 

-// G4

+// Geant4

 #include "G4RunManager.hh"
 #include "G4SDManager.hh"
 #include "G4Event.hh"
slic/src
EventDebuggerMessenger.cc 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- EventDebuggerMessenger.cc	27 Nov 2012 19:32:19 -0000	1.5
+++ EventDebuggerMessenger.cc	26 Jun 2013 01:57:02 -0000	1.6
@@ -1,11 +1,11 @@

-// $Header: /cvs/lcd/slic/src/EventDebuggerMessenger.cc,v 1.5 2012/11/27 19:32:19 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/EventDebuggerMessenger.cc,v 1.6 2013/06/26 01:57:02 jeremy Exp $

 #include "EventDebuggerMessenger.hh"
 
 // slic
 #include "EventDebugger.hh"
 
 // lcdd

-#include "StringUtil.hh"

+#include "lcdd/util/StringUtil.hh"

 
 // geant4
 #include "G4UIcmdWithAString.hh"
slic/src
EventSourceManager.cc 1.25 -> 1.26
diff -u -r1.25 -r1.26
--- EventSourceManager.cc	29 Nov 2012 00:32:45 -0000	1.25
+++ EventSourceManager.cc	26 Jun 2013 01:57:02 -0000	1.26
@@ -1,7 +1,7 @@

-// $Header: /cvs/lcd/slic/src/EventSourceManager.cc,v 1.25 2012/11/29 00:32:45 jeremy Exp $
-#include "EventSourceManager.hh"

+// $Header: /cvs/lcd/slic/src/EventSourceManager.cc,v 1.26 2013/06/26 01:57:02 jeremy Exp $

 

-// slic

+// SLIC
+#include "EventSourceManager.hh"

 #include "GPSEventSource.hh"
 #include "ParticleGunEventSource.hh"
 #include "StdHepEventSource.hh"

@@ -11,8 +11,8 @@

 #include "SlicApplication.hh"
 #include "RunManager.hh"
 

-// lcdd
-#include "StringUtil.hh"

+// LCDD
+#include "lcdd/util/StringUtil.hh"

 
 namespace slic {
slic/src
GeneratorMessenger.cc 1.18 -> 1.19
diff -u -r1.18 -r1.19
--- GeneratorMessenger.cc	27 Nov 2012 19:32:19 -0000	1.18
+++ GeneratorMessenger.cc	26 Jun 2013 01:57:02 -0000	1.19
@@ -1,20 +1,20 @@

-// $Header: /cvs/lcd/slic/src/GeneratorMessenger.cc,v 1.18 2012/11/27 19:32:19 jeremy Exp $
-#include "GeneratorMessenger.hh"

+// $Header: /cvs/lcd/slic/src/GeneratorMessenger.cc,v 1.19 2013/06/26 01:57:02 jeremy Exp $

 

-// slic

+// SLIC
+#include "GeneratorMessenger.hh"

 #include "EventSourceManager.hh"
 

-// lcdd
-#include "StringUtil.hh"

+// LCDD
+#include "lcdd/util/StringUtil.hh"

 

-// geant4

+// Geant4

 #include "G4UIcommand.hh"
 #include "G4UIdirectory.hh"
 #include "G4UIcmdWithAnInteger.hh"
 #include "G4UIcmdWithADoubleAndUnit.hh"
 #include "G4UIcmdWithADouble.hh"
 

-// clhep

+// CLHEP

 #include "CLHEP/Random/Random.h"
 #include "CLHEP/Random/Randomize.h"
slic/src
HitsCollectionUtil.cc 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- HitsCollectionUtil.cc	27 Nov 2012 19:32:19 -0000	1.5
+++ HitsCollectionUtil.cc	26 Jun 2013 01:57:02 -0000	1.6
@@ -1,9 +1,9 @@

-// $Header: /cvs/lcd/slic/src/HitsCollectionUtil.cc,v 1.5 2012/11/27 19:32:19 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/HitsCollectionUtil.cc,v 1.6 2013/06/26 01:57:02 jeremy Exp $

 #include "HitsCollectionUtil.hh"
 
 // lcdd

-#include "LCDDProcessor.hh"
-#include "G4SensitiveDetector.hh"

+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/detectors/G4SensitiveDetector.hh"

 
 // geant4
 #include "G4SDManager.hh"
slic/src
LcioFileNamer.cc 1.22 -> 1.23
diff -u -r1.22 -r1.23
--- LcioFileNamer.cc	27 Nov 2012 19:32:19 -0000	1.22
+++ LcioFileNamer.cc	26 Jun 2013 01:57:02 -0000	1.23
@@ -1,20 +1,20 @@

-// $Header: /cvs/lcd/slic/src/LcioFileNamer.cc,v 1.22 2012/11/27 19:32:19 jeremy Exp $
-#include "LcioFileNamer.hh"
-
-// lcdd
-#include "FileUtil.hh"
-#include "LCDDProcessor.hh"
-#include "StringUtil.hh"

+// $Header: /cvs/lcd/slic/src/LcioFileNamer.cc,v 1.23 2013/06/26 01:57:02 jeremy Exp $

 

-// slic

+// SLIC
+#include "LcioFileNamer.hh"

 #include "EventSourceManager.hh"

+#include "FileUtil.hh"

 #include "SlicApplication.hh"
 #include "PackageInfo.hh"
 #include "RunManager.hh"
 #include "TimeUtil.hh"
 #include "PhysicsListManager.hh"
 

-// geant4

+// LCDD
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/util/StringUtil.hh"
+
+// Geant4

 #include "G4Run.hh"
 #include "G4RunManager.hh"
slic/src
LcioHitsCollectionBuilder.cc 1.25 -> 1.26
diff -u -r1.25 -r1.26
--- LcioHitsCollectionBuilder.cc	27 Nov 2012 19:32:19 -0000	1.25
+++ LcioHitsCollectionBuilder.cc	26 Jun 2013 01:57:02 -0000	1.26
@@ -1,25 +1,22 @@

-// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.25 2012/11/27 19:32:19 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.26 2013/06/26 01:57:02 jeremy Exp $

 
 // SLIC
 #include "LcioHitsCollectionBuilder.hh"

-
-// LCDD
-#include "StringUtil.hh"
-
-// SLIC

 #include "LcioMcpManager.hh"
 #include "HitsCollectionUtil.hh"
 #include "SlicApplication.hh"
 

-// lcio
-#include "IMPL/LCCollectionVec.h"
-#include "IMPL/LCFlagImpl.h"
-#include "IMPL/MCParticleImpl.h"

+// LCDD
+#include "lcdd/util/StringUtil.hh"

 
 // Geant4
 #include "G4SDManager.hh"
 
 // LCIO

+#include "IMPL/LCCollectionVec.h"
+#include "IMPL/LCFlagImpl.h"
+#include "IMPL/MCParticleImpl.h"
+

 using IMPL::SimCalorimeterHitImpl;
 using IMPL::SimTrackerHitImpl;
 using IMPL::MCParticleImpl;
slic/src
LcioManager.cc 1.93 -> 1.94
diff -u -r1.93 -r1.94
--- LcioManager.cc	29 Nov 2012 00:32:45 -0000	1.93
+++ LcioManager.cc	26 Jun 2013 01:57:02 -0000	1.94
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.93 2012/11/29 00:32:45 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.94 2013/06/26 01:57:02 jeremy Exp $

 #include "LcioManager.hh"
 
 // slic

@@ -15,10 +15,10 @@

 #include "RunManager.hh"
 
 // lcdd

-#include "G4CalorimeterHit.hh"
-#include "G4TrackerHit.hh"
-#include "LCDDProcessor.hh"
-#include "StringUtil.hh"

+#include "lcdd/hits/G4CalorimeterHit.hh"
+#include "lcdd/hits/G4TrackerHit.hh"
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/util/StringUtil.hh"

 
 // lcio
 #include "EVENT/LCIO.h"
slic/src
LcioMcpManager.cc 1.73 -> 1.74
diff -u -r1.73 -r1.74
--- LcioMcpManager.cc	27 Nov 2012 19:32:19 -0000	1.73
+++ LcioMcpManager.cc	26 Jun 2013 01:57:02 -0000	1.74
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioMcpManager.cc,v 1.73 2012/11/27 19:32:19 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioMcpManager.cc,v 1.74 2013/06/26 01:57:02 jeremy Exp $

 #include "LcioMcpManager.hh"
 
 // slic

@@ -11,7 +11,7 @@

 #include "EventSourceManager.hh"
 
 // lcdd

-#include "StringUtil.hh"

+#include "lcdd/util/StringUtil.hh"

 
 // lcio
 #include "IMPL/LCCollectionVec.h"
slic/src
LcioMcpMessenger.cc 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- LcioMcpMessenger.cc	27 Nov 2012 19:32:19 -0000	1.13
+++ LcioMcpMessenger.cc	26 Jun 2013 01:57:02 -0000	1.14
@@ -1,13 +1,15 @@

-// $Header: /cvs/lcd/slic/src/LcioMcpMessenger.cc,v 1.13 2012/11/27 19:32:19 jeremy Exp $
-#include "LcioMcpMessenger.hh"

+// $Header: /cvs/lcd/slic/src/LcioMcpMessenger.cc,v 1.14 2013/06/26 01:57:02 jeremy Exp $

 

-// slic

+// SLIC
+#include "LcioMcpMessenger.hh"

 #include "LcioManager.hh"
 #include "LcioMcpManager.hh"
 #include "TrajectoryManager.hh"

-#include "StringUtil.hh"

 

-// geant4

+// LCDD
+#include "lcdd/util/StringUtil.hh"
+
+// Geant4

 #include "G4UIparameter.hh"
 
 namespace slic {
slic/src
LcioMcpPrinter.cc 1.20 -> 1.21
diff -u -r1.20 -r1.21
--- LcioMcpPrinter.cc	27 Nov 2012 19:32:19 -0000	1.20
+++ LcioMcpPrinter.cc	26 Jun 2013 01:57:02 -0000	1.21
@@ -1,10 +1,12 @@

-// $Header: /cvs/lcd/slic/src/LcioMcpPrinter.cc,v 1.20 2012/11/27 19:32:19 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioMcpPrinter.cc,v 1.21 2013/06/26 01:57:02 jeremy Exp $
+
+// SLIC

 #include "LcioMcpPrinter.hh"
 

-// lcdd
-#include "StringUtil.hh"

+// LCDD
+#include "lcdd/util/StringUtil.hh"

 

-// lcio

+// LCIO

 #include "IMPL/LCCollectionVec.h"
 
 using EVENT::LCCollection;
slic/src
LcioMessenger.cc 1.37 -> 1.38
diff -u -r1.37 -r1.38
--- LcioMessenger.cc	27 Nov 2012 19:32:19 -0000	1.37
+++ LcioMessenger.cc	26 Jun 2013 01:57:02 -0000	1.38
@@ -1,23 +1,23 @@

-// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.37 2012/11/27 19:32:19 jeremy Exp $
-#include "LcioMessenger.hh"

+// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.38 2013/06/26 01:57:02 jeremy Exp $

 

-// slic

+// SLIC
+#include "LcioMessenger.hh"

 #include "LcioManager.hh"
 #include "LcioMcpManager.hh"
 #include "LcioFileNamer.hh"
 #include "TrajectoryManager.hh"
 

-// lcdd
-#include "StringUtil.hh"

+// LCDD
+#include "lcdd/util/StringUtil.hh"

 

-// geant4

+// Geant4

 #include "G4UIcommand.hh"
 #include "G4UIcmdWithAnInteger.hh"
 #include "G4UIcmdWithABool.hh"
 #include "G4UIdirectory.hh"
 #include "G4UImanager.hh"
 

-// std

+// STL

 #include <sstream>
 
 namespace slic {
slic/src
LcioPrimaryGenerator.cc 1.40 -> 1.41
diff -u -r1.40 -r1.41
--- LcioPrimaryGenerator.cc	27 Nov 2012 19:32:19 -0000	1.40
+++ LcioPrimaryGenerator.cc	26 Jun 2013 01:57:02 -0000	1.41
@@ -1,17 +1,19 @@

-// $Header: /cvs/lcd/slic/src/LcioPrimaryGenerator.cc,v 1.40 2012/11/27 19:32:19 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioPrimaryGenerator.cc,v 1.41 2013/06/26 01:57:02 jeremy Exp $

 

-// slic

+// SLIC

 #include "LogStream.hh"
 #include "LcioPrimaryGenerator.hh"
 #include "LcioManager.hh"
 #include "LcioMcpManager.hh"
 #include "LcioMcpUtil.hh"

-#include "StringUtil.hh"

+
+// LCDD
+#include "lcdd/util/StringUtil.hh"

 
 // Geant4
 #include "G4ParticleTable.hh"
 

-// std

+// STL

 #include <sstream>
 
 using IMPL::MCParticleImpl;
slic/src
LogMessenger.cc 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- LogMessenger.cc	27 Nov 2012 19:32:19 -0000	1.12
+++ LogMessenger.cc	26 Jun 2013 01:57:02 -0000	1.13
@@ -1,12 +1,13 @@

-// $Id: LogMessenger.cc,v 1.12 2012/11/27 19:32:19 jeremy Exp $

+// $Id: LogMessenger.cc,v 1.13 2013/06/26 01:57:02 jeremy Exp $

 

+// SLIC

 #include "LogMessenger.hh"

-
-// slic

 #include "LogStream.hh"

-#include "StringUtil.hh"

 

-// geant4

+// LCDD
+#include "lcdd/util/StringUtil.hh"
+
+// Geant4

 #include "G4UIcmdWithAnInteger.hh"
 #include "G4UIcmdWithAString.hh"
 #include "G4UIdirectory.hh"
slic/src
Module.cc 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- Module.cc	27 Nov 2012 19:32:19 -0000	1.8
+++ Module.cc	26 Jun 2013 01:57:02 -0000	1.9
@@ -1,10 +1,7 @@

-// $Header: /cvs/lcd/slic/src/Module.cc,v 1.8 2012/11/27 19:32:19 jeremy Exp $
-#include "Module.hh"
-
-// lcdd
-#include "StringUtil.hh"

+// $Header: /cvs/lcd/slic/src/Module.cc,v 1.9 2013/06/26 01:57:02 jeremy Exp $

 

-// slic

+// SLIC
+#include "Module.hh"

 #include "ModuleRegistry.hh"
 
 namespace slic {
slic/src
PhysicsMessenger.cc 1.26 -> 1.27
diff -u -r1.26 -r1.27
--- PhysicsMessenger.cc	27 Nov 2012 19:32:19 -0000	1.26
+++ PhysicsMessenger.cc	26 Jun 2013 01:57:02 -0000	1.27
@@ -1,14 +1,14 @@

-// $Header: /cvs/lcd/slic/src/PhysicsMessenger.cc,v 1.26 2012/11/27 19:32:19 jeremy Exp $
-#include "PhysicsMessenger.hh"

+// $Header: /cvs/lcd/slic/src/PhysicsMessenger.cc,v 1.27 2013/06/26 01:57:02 jeremy Exp $

 

-// slic

+// SLIC
+#include "PhysicsMessenger.hh"

 #include "PhysicsListManager.hh"
 #include "HepPDTManager.hh"
 

-// lcdd
-#include "StringUtil.hh"

+// LCDD
+#include "lcdd/util/StringUtil.hh"

 

-// geant4

+// Geant4

 #include "G4UIcmdWithABool.hh"
 #include "G4UIcmdWithoutParameter.hh"
 #include "G4UIdirectory.hh"
slic/src
PrimaryGeneratorAction.cc 1.37 -> 1.38
diff -u -r1.37 -r1.38
--- PrimaryGeneratorAction.cc	29 Nov 2012 00:32:45 -0000	1.37
+++ PrimaryGeneratorAction.cc	26 Jun 2013 01:57:02 -0000	1.38
@@ -1,11 +1,7 @@

-// $Header: /cvs/lcd/slic/src/PrimaryGeneratorAction.cc,v 1.37 2012/11/29 00:32:45 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/PrimaryGeneratorAction.cc,v 1.38 2013/06/26 01:57:02 jeremy Exp $

 

+// SLIC

 #include "PrimaryGeneratorAction.hh"

-
-// lcdd
-#include "StringUtil.hh"
-
-// slic

 #include "LcioManager.hh"
 #include "RunManager.hh"
 #include "SlicApplication.hh"

@@ -13,11 +9,14 @@

 #include "LcioMcpFilter.hh"
 #include "EventSourceManager.hh"
 

-// lcio

+// LCDD
+#include "lcdd/util/StringUtil.hh"
+
+// LCIO

 #include "IMPL/MCParticleImpl.h"
 #include "EVENT/LCCollection.h"
 

-// geant4

+// Geant4

 #include "G4Types.hh"
 #include "G4StateManager.hh"
slic/src
RunAction.cc 1.22 -> 1.23
diff -u -r1.22 -r1.23
--- RunAction.cc	27 Nov 2012 19:32:19 -0000	1.22
+++ RunAction.cc	26 Jun 2013 01:57:02 -0000	1.23
@@ -1,14 +1,14 @@

-// $Header: /cvs/lcd/slic/src/RunAction.cc,v 1.22 2012/11/27 19:32:19 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/RunAction.cc,v 1.23 2013/06/26 01:57:02 jeremy Exp $

 

-// slic

+// SLIC

 #include "LcioManager.hh"
 #include "EventSourceManager.hh"
 #include "EventDebugger.hh"
 

-// lcdd
-#include "GeometryManager.hh"

+// LCDD
+#include "lcdd/core/GeometryManager.hh"

 

-// geant4

+// Geant4

 #include "RunAction.hh"
 #include "G4Run.hh"
slic/src
RunManager.cc 1.22 -> 1.23
diff -u -r1.22 -r1.23
--- RunManager.cc	29 Nov 2012 00:32:45 -0000	1.22
+++ RunManager.cc	26 Jun 2013 01:57:02 -0000	1.23
@@ -1,11 +1,7 @@

-// $Header: /cvs/lcd/slic/src/RunManager.cc,v 1.22 2012/11/29 00:32:45 jeremy Exp $
-#include "RunManager.hh"
-
-// lcdd
-#include "LCDDParser.hh"
-#include "LCDDProcessor.hh"

+// $Header: /cvs/lcd/slic/src/RunManager.cc,v 1.23 2013/06/26 01:57:02 jeremy Exp $

 

-// slic

+// SLIC
+#include "RunManager.hh"

 #include "EventAction.hh"
 #include "EventSourceManager.hh"
 #include "ModuleRegistry.hh"

@@ -16,7 +12,11 @@

 #include "SteppingAction.hh"
 #include "TrackingAction.hh"
 

-// geant4

+// LCDD
+#include "lcdd/core/LCDDParser.hh"
+#include "lcdd/core/LCDDProcessor.hh"
+
+// Geant4

 #include "G4StateManager.hh"
 #include "G4UImanager.hh"
slic/src
SlicApplication.cc 1.59 -> 1.60
diff -u -r1.59 -r1.60
--- SlicApplication.cc	11 Apr 2013 18:43:18 -0000	1.59
+++ SlicApplication.cc	26 Jun 2013 01:57:02 -0000	1.60
@@ -1,8 +1,7 @@

-// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.59 2013/04/11 18:43:18 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.60 2013/06/26 01:57:02 jeremy Exp $

 

+// SLIC

 #include "SlicApplication.hh"

-
-// slic

 #include "CommandLineProcessor.hh"
 #include "CommandQueue.hh"
 #include "EventDebugger.hh"

@@ -13,16 +12,14 @@

 #include "ModuleRegistry.hh"
 #include "PackageInfo.hh"
 #include "RunManager.hh"

-#include "StringUtil.hh"

 #include "TimeUtil.hh"
 #include "TrajectoryManager.hh"
 #include "HepPDTManager.hh"

-
-// test VRML writer

 #include "VRML2WriterMessenger.hh"
 

-// lcdd
-#include "LCDDDetectorConstruction.hh"

+// LCDD
+#include "lcdd/util/StringUtil.hh"
+#include "lcdd/core/LCDDDetectorConstruction.hh"

 
 // geant4
 #include "G4ApplicationState.hh"
slic/src
StdHepLoader.cc 1.22 -> 1.23
diff -u -r1.22 -r1.23
--- StdHepLoader.cc	27 Nov 2012 19:32:19 -0000	1.22
+++ StdHepLoader.cc	26 Jun 2013 01:57:02 -0000	1.23
@@ -1,9 +1,9 @@

-// $Header: /cvs/lcd/slic/src/StdHepLoader.cc,v 1.22 2012/11/27 19:32:19 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/StdHepLoader.cc,v 1.23 2013/06/26 01:57:02 jeremy Exp $

 
 #include "StdHepLoader.hh"
 
 // lcdd

-#include "StringUtil.hh"

+#include "lcdd/util/StringUtil.hh"

 
 // geant4
 #include "G4PrimaryParticle.hh"
slic/src
SteppingAction.cc 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- SteppingAction.cc	30 Apr 2013 23:08:37 -0000	1.14
+++ SteppingAction.cc	26 Jun 2013 01:57:02 -0000	1.15
@@ -1,14 +1,14 @@

-// $Header: /cvs/lcd/slic/src/SteppingAction.cc,v 1.14 2013/04/30 23:08:37 jeremy Exp $
-#include "SteppingAction.hh"

+// $Header: /cvs/lcd/slic/src/SteppingAction.cc,v 1.15 2013/06/26 01:57:02 jeremy Exp $

 

-// slic

+// SLIC
+#include "SteppingAction.hh"

 #include "TrajectoryManager.hh"
 

-// lcdd
-#include "G4UserRegionInformation.hh"
-#include "TrackInformation.hh"

+// LCDD
+#include "lcdd/geant4/G4UserRegionInformation.hh"
+#include "lcdd/hits/TrackInformation.hh"

 

-// geant4

+// Geant4

 #include "G4UserSteppingAction.hh"
 #include "G4Track.hh"
slic/src
Trajectory.cc 1.16 -> 1.17
diff -u -r1.16 -r1.17
--- Trajectory.cc	27 Nov 2012 19:32:19 -0000	1.16
+++ Trajectory.cc	26 Jun 2013 01:57:02 -0000	1.17
@@ -1,8 +1,8 @@

-// $Header: /cvs/lcd/slic/src/Trajectory.cc,v 1.16 2012/11/27 19:32:19 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/Trajectory.cc,v 1.17 2013/06/26 01:57:02 jeremy Exp $

 #include "Trajectory.hh"
 
 // lcdd

-#include "TrackInformation.hh"

+#include "lcdd/hits/TrackInformation.hh"

 
 // geant4
 #include "G4TrajectoryPoint.hh"
CVSspam 0.2.12

Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1