108 modified files
lcdd/src
diff -u -r1.2 -r1.3
--- CalorimeterHitProcessor.cc 24 Jun 2013 22:10:36 -0000 1.2
+++ CalorimeterHitProcessor.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,4 +1,7 @@
-#include "CalorimeterHitProcessor.hh"
+// $Header: /cvs/lcd/lcdd/src/CalorimeterHitProcessor.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/detectors/CalorimeterHitProcessor.hh"
// STL
#include <iostream>
lcdd/src
diff -u -r1.2 -r1.3
--- Cartesian3DMagneticFieldMap.cc 9 Oct 2012 19:47:57 -0000 1.2
+++ Cartesian3DMagneticFieldMap.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -3,10 +3,14 @@
// S.Larsson and J. Generowicz.
//
-#include "Cartesian3DMagneticFieldMap.hh"
+// LCDD
+#include "lcdd/bfield/Cartesian3DMagneticFieldMap.hh"
+
+// STL
#include <fstream>
#include <iostream>
#include <cmath>
+
using namespace std;
Cartesian3DMagneticFieldMap::Cartesian3DMagneticFieldMap( const char* filename, double xOffset, double yOffset, double zOffset )
lcdd/src
diff -u -r1.1 -r1.2
--- CellReadout.cc 18 Jun 2013 19:59:34 -0000 1.1
+++ CellReadout.cc 26 Jun 2013 01:36:23 -0000 1.2
@@ -1,4 +1,6 @@
-#include "CellReadout.hh"
+// $Header: /cvs/lcd/lcdd/src/CellReadout.cc,v 1.2 2013/06/26 01:36:23 jeremy Exp $
+
+#include "lcdd/detectors/CellReadout.hh"
CellReadout::CellReadout()
{
lcdd/src
diff -u -r1.4 -r1.5
--- CellReadout2D.cc 24 Jun 2013 22:10:36 -0000 1.4
+++ CellReadout2D.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,5 +1,9 @@
-#include "CellReadout2D.hh"
+// $Header: /cvs/lcd/lcdd/src/CellReadout2D.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
+// LCDD
+#include "lcdd/detectors/CellReadout2D.hh"
+
+// STL
#include <cmath>
#include <iostream>
#include <stdexcept>
lcdd/src
diff -u -r1.4 -r1.5
--- CellReadout2DSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.4
+++ CellReadout2DSegmentation.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,12 +1,13 @@
-#include "CellReadout2DSegmentation.hh"
+// $Header: /cvs/lcd/lcdd/src/CellReadout2DSegmentation.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/detectors/CellReadout2DSegmentation.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
// Geant4
#include "G4Step.hh"
#include "G4Box.hh"
-// LCDD
-#include "ReadoutUtil.hh"
-
// STL
#include <cmath>
lcdd/src
diff -u -r1.2 -r1.3
--- Cerenkov.cc 24 Jun 2013 22:10:36 -0000 1.2
+++ Cerenkov.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -8,10 +8,15 @@
// but since we are only interested in the number of photons created don't need to
// actually create optical phtons and put them on the stack.
//--------------------------------------------------------------------------------------
-#include "Cerenkov.hh"
+
+// LCDD
+#include "lcdd/detectors/Cerenkov.hh"
+
+// Geant4
#include "G4Step.hh"
#include "G4ThreeVector.hh"
-#include<iomanip>
+
+#include <iomanip>
Cerenkov::Cerenkov()
{
lcdd/src
diff -u -r1.2 -r1.3
--- G4BoxDipole.cc 24 Jun 2013 22:10:36 -0000 1.2
+++ G4BoxDipole.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,8 +1,7 @@
-// $Id: G4BoxDipole.cc,v 1.2 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4BoxDipole.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
-#include "G4BoxDipole.hh"
-
-//#include <iostream>
+// LCDD
+#include "lcdd/bfield/G4BoxDipole.hh"
G4BoxDipole::G4BoxDipole(double x, double y, double z, double dx, double dy, double dz, double bx, double by, double bz) :
_x(x), _y(y), _z(z), _dx(dx), _dy(dy), _dz(dz), _bx(bx), _by(by), _bz(bz)
lcdd/src
diff -u -r1.14 -r1.15
--- G4CalorimeterHit.cc 24 Jun 2013 22:10:36 -0000 1.14
+++ G4CalorimeterHit.cc 26 Jun 2013 01:36:23 -0000 1.15
@@ -1,7 +1,7 @@
-// $Header: /cvs/lcd/lcdd/src/G4CalorimeterHit.cc,v 1.14 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4CalorimeterHit.cc,v 1.15 2013/06/26 01:36:23 jeremy Exp $
// LCDD
-#include "G4CalorimeterHit.hh"
+#include "lcdd/hits/G4CalorimeterHit.hh"
// Geant4
#ifdef G4VIS_USE
lcdd/src
diff -u -r1.41 -r1.42
--- G4CalorimeterSD.cc 24 Jun 2013 22:10:36 -0000 1.41
+++ G4CalorimeterSD.cc 26 Jun 2013 01:36:23 -0000 1.42
@@ -1,21 +1,21 @@
-// $Header: /cvs/lcd/lcdd/src/G4CalorimeterSD.cc,v 1.41 2013/06/24 22:10:36 jeremy Exp $
-#include "G4CalorimeterSD.hh"
+// $Header: /cvs/lcd/lcdd/src/G4CalorimeterSD.cc,v 1.42 2013/06/26 01:36:23 jeremy Exp $
-// lcdd
-#include "G4Segmentation.hh"
-#include "ReadoutUtil.hh"
-#include "McpHitContrib.hh"
-#include "IdFactory.hh"
-#include "IdManager.hh"
-#include "PositionComparator.hh"
+// LCDD
+#include "lcdd/detectors/G4CalorimeterSD.hh"
+#include "lcdd/detectors/G4Segmentation.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
+#include "lcdd/detectors/PositionComparator.hh"
+#include "lcdd/hits/McpHitContrib.hh"
+#include "lcdd/id/IdFactory.hh"
+#include "lcdd/id/IdManager.hh"
-// geant4
+// Geant4
#include "G4Track.hh"
#include "G4StepPoint.hh"
#include "G4Timer.hh"
#include "G4Geantino.hh"
-// stl
+// STL
#include <iostream>
#include <string>
#include <vector>
lcdd/src
diff -u -r1.6 -r1.7
--- G4Dipole.cc 24 Jun 2013 22:10:36 -0000 1.6
+++ G4Dipole.cc 26 Jun 2013 01:36:23 -0000 1.7
@@ -1,7 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/G4Dipole.cc,v 1.6 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4Dipole.cc,v 1.7 2013/06/26 01:36:23 jeremy Exp $
-#include "G4Dipole.hh"
+// LCDD
+#include "lcdd/bfield/G4Dipole.hh"
+// STL
#include <iostream>
#include <cmath>
lcdd/src
diff -u -r1.2 -r1.3
--- G4GlobalGridXYSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.2
+++ G4GlobalGridXYSegmentation.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,8 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/G4GlobalGridXYSegmentation.cc,v 1.2 2013/06/24 22:10:36 jeremy Exp $
-#include "G4GlobalGridXYSegmentation.hh"
+// $Header: /cvs/lcd/lcdd/src/G4GlobalGridXYSegmentation.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
-#include "ReadoutUtil.hh"
+// LCDD
+#include "lcdd/detectors/G4GlobalGridXYSegmentation.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
+// Geant4
#include "G4NavigationHistory.hh"
G4GlobalGridXYSegmentation::G4GlobalGridXYSegmentation(double gridSizeX, double gridSizeY) :
lcdd/src
diff -u -r1.8 -r1.9
--- G4GridXYZSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.8
+++ G4GridXYZSegmentation.cc 26 Jun 2013 01:36:23 -0000 1.9
@@ -1,8 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/G4GridXYZSegmentation.cc,v 1.8 2013/06/24 22:10:36 jeremy Exp $
-#include "G4GridXYZSegmentation.hh"
+// $Header: /cvs/lcd/lcdd/src/G4GridXYZSegmentation.cc,v 1.9 2013/06/26 01:36:23 jeremy Exp $
-#include "ReadoutUtil.hh"
+// LCDD
+#include "lcdd/detectors/G4GridXYZSegmentation.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
+// Geant4
#include "G4NavigationHistory.hh"
G4GridXYZSegmentation::G4GridXYZSegmentation(double gridSizeX, double gridSizeY, double gridSizeZ) :
lcdd/src
diff -u -r1.3 -r1.4
--- G4LimitSet.cc 24 Jun 2013 22:10:36 -0000 1.3
+++ G4LimitSet.cc 26 Jun 2013 01:36:23 -0000 1.4
@@ -1,5 +1,9 @@
-#include "G4LimitSet.hh"
+// $Header: /cvs/lcd/lcdd/src/G4LimitSet.cc,v 1.4 2013/06/26 01:36:23 jeremy Exp $
+// LCDD
+#include "lcdd/geant4/G4LimitSet.hh"
+
+// Geant4
#include "G4Track.hh"
/* Code for any particle. */
lcdd/src
diff -u -r1.15 -r1.16
--- G4NonprojectiveCylinderSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.15
+++ G4NonprojectiveCylinderSegmentation.cc 26 Jun 2013 01:36:23 -0000 1.16
@@ -1,10 +1,13 @@
-// $Header: /cvs/lcd/lcdd/src/G4NonprojectiveCylinderSegmentation.cc,v 1.15 2013/06/24 22:10:36 jeremy Exp $
-#include "G4NonprojectiveCylinderSegmentation.hh"
+// $Header: /cvs/lcd/lcdd/src/G4NonprojectiveCylinderSegmentation.cc,v 1.16 2013/06/26 01:36:23 jeremy Exp $
-#include "ReadoutUtil.hh"
+// LCDD
+#include "lcdd/detectors/G4NonprojectiveCylinderSegmentation.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
+// Geant4
#include "G4Tubs.hh"
+// STL
#include <cmath>
G4NonprojectiveCylinderSegmentation::G4NonprojectiveCylinderSegmentation(double gridSizePhi, double gridSizeZ) :
lcdd/src
diff -u -r1.9 -r1.10
--- G4OpticalCalorimeter.cc 24 Jun 2013 22:10:36 -0000 1.9
+++ G4OpticalCalorimeter.cc 26 Jun 2013 01:36:23 -0000 1.10
@@ -1,15 +1,16 @@
-// $Header: /cvs/lcd/lcdd/src/G4OpticalCalorimeter.cc,v 1.9 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4OpticalCalorimeter.cc,v 1.10 2013/06/26 01:36:23 jeremy Exp $
-#include "G4OpticalCalorimeterSD.hh"
+// LCDD
+#include "lcdd/detectors/G4OpticalCalorimeterSD.hh"
+#include "lcdd/detectors/G4Segmentation.hh"
+#include "lcdd/detectors/Cerenkov.hh"
-// geant4
+// Geant4
#include "G4OpticalPhoton.hh"
#include "G4TransportationManager.hh"
#include "G4VProcess.hh"
#include "G4Poisson.hh"
-// lcdd
-#include "G4Segmentation.hh"
-#include "Cerenkov.hh"
+
using std::vector;
/**
@@ -97,9 +98,8 @@
hits_vector[eCerenkov].push_back(thisHit);
// add to the HC
m_hitsCollections[eCerenkov]->insert(thisHit);
- }
- // found a hit
- else {
+ } else {
+ // found a hit
// don't need to insert thisHit, so delete it
delete thisHit;
thisHit = 0;
lcdd/src
diff -u -r1.10 -r1.11
--- G4ProjectiveCylinderSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.10
+++ G4ProjectiveCylinderSegmentation.cc 26 Jun 2013 01:36:23 -0000 1.11
@@ -1,7 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/G4ProjectiveCylinderSegmentation.cc,v 1.10 2013/06/24 22:10:36 jeremy Exp $
-#include "G4ProjectiveCylinderSegmentation.hh"
-#include "ReadoutUtil.hh"
+// $Header: /cvs/lcd/lcdd/src/G4ProjectiveCylinderSegmentation.cc,v 1.11 2013/06/26 01:36:23 jeremy Exp $
+// LCDD
+#include "lcdd/detectors/G4ProjectiveCylinderSegmentation.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
+
+// Geant4
#include "G4StepPoint.hh"
#include "G4NavigationHistory.hh"
#include "G4VPhysicalVolume.hh"
lcdd/src
diff -u -r1.11 -r1.12
--- G4ProjectiveSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.11
+++ G4ProjectiveSegmentation.cc 26 Jun 2013 01:36:23 -0000 1.12
@@ -1,8 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/G4ProjectiveSegmentation.cc,v 1.11 2013/06/24 22:10:36 jeremy Exp $
-#include "G4ProjectiveSegmentation.hh"
+// $Header: /cvs/lcd/lcdd/src/G4ProjectiveSegmentation.cc,v 1.12 2013/06/26 01:36:23 jeremy Exp $
-#include "ReadoutUtil.hh"
+// LCDD
+#include "lcdd/detectors/G4ProjectiveSegmentation.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
+// Geant4
#include "G4StepPoint.hh"
#include "G4NavigationHistory.hh"
#include "G4VPhysicalVolume.hh"
lcdd/src
diff -u -r1.4 -r1.5
--- G4ProjectiveZPlaneSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.4
+++ G4ProjectiveZPlaneSegmentation.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,8 +1,8 @@
-// $Header: /cvs/lcd/lcdd/src/G4ProjectiveZPlaneSegmentation.cc,v 1.4 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4ProjectiveZPlaneSegmentation.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
-#include "G4ProjectiveZPlaneSegmentation.hh"
-
-#include "ReadoutUtil.hh"
+// LCDD
+#include "lcdd/detectors/G4ProjectiveZPlaneSegmentation.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
G4ProjectiveZPlaneSegmentation::G4ProjectiveZPlaneSegmentation(G4int ntheta, G4int nphi) :
G4ProjectiveSegmentation(ntheta, nphi)
@@ -15,43 +15,27 @@
double G4ProjectiveZPlaneSegmentation::getRadius(const G4Step* aStep)
{
- //G4cout << "G4ProjectiveZPlaneSegmentation::getRadius()" << G4endl;
-
double zcell = getZ(aStep);
-
double ctheta = G4ProjectiveSegmentation::getThetaDim(aStep);
-
double rcyl = zcell * tan(ctheta);
-
return rcyl;
}
double G4ProjectiveZPlaneSegmentation::getRadius(const G4StepPoint* aPreStepPoint)
{
- //G4cout << "G4ProjectiveZPlaneSegmentation::getRadius()" << G4endl;
-
double zcell = getZ(aPreStepPoint);
-
double ctheta = G4ProjectiveSegmentation::getThetaDim(aPreStepPoint);
-
double rcyl = zcell * tan(ctheta);
-
return rcyl;
}
double G4ProjectiveZPlaneSegmentation::getZ(const G4Step* aStep)
{
-
- //G4cout << "G4ProjectiveZPlaneSegmentation::getZ()" << G4endl;
-
G4ThreeVector gpos = ReadoutUtil::getVolumeGlobalPosition(aStep->GetPreStepPoint(), G4ThreeVector());
return gpos.z();
}
double G4ProjectiveZPlaneSegmentation::getZ(const G4StepPoint* aPreStepPoint)
{
-
- //G4cout << "G4ProjectiveZPlaneSegmentation::getZ()" << G4endl;
-
G4ThreeVector gpos = ReadoutUtil::getVolumeGlobalPosition(aPreStepPoint, G4ThreeVector());
return gpos.z();
}
lcdd/src
diff -u -r1.12 -r1.13
--- G4RZFieldMap.cc 24 Jun 2013 22:10:36 -0000 1.12
+++ G4RZFieldMap.cc 26 Jun 2013 01:36:23 -0000 1.13
@@ -1,8 +1,12 @@
-// $Header: /cvs/lcd/lcdd/src/G4RZFieldMap.cc,v 1.12 2013/06/24 22:10:36 jeremy Exp $
-#include "G4RZFieldMap.hh"
+// $Header: /cvs/lcd/lcdd/src/G4RZFieldMap.cc,v 1.13 2013/06/26 01:36:23 jeremy Exp $
+// LCDD
+#include "lcdd/bfield/G4RZFieldMap.hh"
+
+// Geant4
#include "globals.hh"
+// STL
#include <cmath>
// Set this preprocessor symbol for lots of debugging output.
lcdd/src
diff -u -r1.4 -r1.5
--- G4ScorerSD.cc 24 Jun 2013 22:10:36 -0000 1.4
+++ G4ScorerSD.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,6 +1,9 @@
-#include "G4ScorerSD.hh"
+// $Header: /cvs/lcd/lcdd/src/G4ScorerSD.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
-#include "TrackInformation.hh"
+// LCDD
+#include "lcdd/detectors/G4ScorerSD.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
+#include "lcdd/hits/TrackInformation.hh"
G4ScorerSD::G4ScorerSD(G4String sdName, G4String hcName) :
G4TrackerSD(sdName, hcName), m_currentTrackID(-1)
lcdd/src
diff -u -r1.13 -r1.14
--- G4Segmentation.cc 24 Jun 2013 22:10:36 -0000 1.13
+++ G4Segmentation.cc 26 Jun 2013 01:36:23 -0000 1.14
@@ -1,7 +1,8 @@
-// $Header: /cvs/lcd/lcdd/src/G4Segmentation.cc,v 1.13 2013/06/24 22:10:36 jeremy Exp $
-#include "G4Segmentation.hh"
+// $Header: /cvs/lcd/lcdd/src/G4Segmentation.cc,v 1.14 2013/06/26 01:36:23 jeremy Exp $
-#include "ReadoutUtil.hh"
+// LCDD
+#include "lcdd/detectors/G4Segmentation.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
G4Segmentation::G4Segmentation(EType segType, int nbins) :
m_numBins(nbins), m_type(segType)
lcdd/src
diff -u -r1.12 -r1.13
--- G4SegmentationFactory.cc 24 Jun 2013 22:10:36 -0000 1.12
+++ G4SegmentationFactory.cc 26 Jun 2013 01:36:23 -0000 1.13
@@ -1,30 +1,27 @@
-// $Header: /cvs/lcd/lcdd/src/G4SegmentationFactory.cc,v 1.12 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4SegmentationFactory.cc,v 1.13 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/detectors/G4SegmentationFactory.hh"
+#include "lcdd/schema/grid_xyz.hh"
+#include "lcdd/schema/global_grid_xy.hh"
+#include "lcdd/schema/nonprojective_cylinder.hh"
+#include "lcdd/schema/projective_cylinder.hh"
+#include "lcdd/schema/projective_zplane.hh"
+#include "lcdd/schema/cell_readout_2d.hh"
+#include "lcdd/detectors/G4Segmentation.hh"
+#include "lcdd/detectors/G4GridXYZSegmentation.hh"
+#include "lcdd/detectors/G4GlobalGridXYSegmentation.hh"
+#include "lcdd/detectors/G4ProjectiveCylinderSegmentation.hh"
+#include "lcdd/detectors/G4ProjectiveZPlaneSegmentation.hh"
+#include "lcdd/detectors/G4NonprojectiveCylinderSegmentation.hh"
+#include "lcdd/detectors/CellReadout2DSegmentation.hh"
// GDML
#include "Saxana/SAXObject.h"
#include "G4Processor/GDMLProcessor.h"
#include "G4Evaluator/GDMLExpressionEvaluator.h"
-// LCDD
-#include "G4SegmentationFactory.hh"
-
-// LCDD segmentation elements
-#include "grid_xyz.hh"
-#include "global_grid_xy.hh"
-#include "nonprojective_cylinder.hh"
-#include "projective_cylinder.hh"
-#include "projective_zplane.hh"
-#include "cell_readout_2d.hh"
-
-// LCDD G4 segmentation bindings
-#include "G4Segmentation.hh"
-#include "G4GridXYZSegmentation.hh"
-#include "G4GlobalGridXYSegmentation.hh"
-#include "G4ProjectiveCylinderSegmentation.hh"
-#include "G4ProjectiveZPlaneSegmentation.hh"
-#include "G4NonprojectiveCylinderSegmentation.hh"
-#include "CellReadout2DSegmentation.hh"
-
+// STL
#include <iostream>
G4Segmentation* G4SegmentationFactory::createSegmentation(SAXObject* obj, const std::string& tag)
lcdd/src
diff -u -r1.19 -r1.20
--- G4SensitiveDetector.cc 24 Jun 2013 22:10:36 -0000 1.19
+++ G4SensitiveDetector.cc 26 Jun 2013 01:36:23 -0000 1.20
@@ -1,14 +1,13 @@
-// $Header: /cvs/lcd/lcdd/src/G4SensitiveDetector.cc,v 1.19 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4SensitiveDetector.cc,v 1.20 2013/06/26 01:36:23 jeremy Exp $
-#include "G4SensitiveDetector.hh"
+// LCDD
+#include "lcdd/detectors/G4SensitiveDetector.hh"
+#include "lcdd/id/IdManager.hh"
+#include "lcdd/id/IdFactory.hh"
+#include "lcdd/detectors/SensitiveDetectorMessenger.hh"
+#include "lcdd/hits/TrackInformation.hh"
-// lcdd
-#include "IdManager.hh"
-#include "IdFactory.hh"
-#include "SensitiveDetectorMessenger.hh"
-#include "TrackInformation.hh"
-
-// geant4
+// Geant4
#include "G4EventManager.hh"
#include "G4Event.hh"
#include "G4SDManager.hh"
@@ -17,7 +16,7 @@
#include "G4LogicalVolumeStore.hh"
#include "G4UnitsTable.hh"
-// stl
+// STL
#include <iostream>
#include <vector>
lcdd/src
diff -u -r1.9 -r1.10
--- G4Solenoid.cc 24 Jun 2013 22:10:36 -0000 1.9
+++ G4Solenoid.cc 26 Jun 2013 01:36:23 -0000 1.10
@@ -1,11 +1,11 @@
-// $Header: /cvs/lcd/lcdd/src/G4Solenoid.cc,v 1.9 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4Solenoid.cc,v 1.10 2013/06/26 01:36:23 jeremy Exp $
-#include "G4Solenoid.hh"
+// LCDD
+#include "lcdd/bfield/G4Solenoid.hh"
+// Geant4
#include "globals.hh"
-//#include <iostream>
-
G4Solenoid::G4Solenoid() :
_innerField(0), _outerField(0), _innerR(0), _outerR(0), _innerZ(0), _outerZ(0)
{
lcdd/src
diff -u -r1.7 -r1.8
--- G4StoreManager.cc 24 Jun 2013 22:10:36 -0000 1.7
+++ G4StoreManager.cc 26 Jun 2013 01:36:23 -0000 1.8
@@ -1,7 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/G4StoreManager.cc,v 1.7 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4StoreManager.cc,v 1.8 2013/06/26 01:36:23 jeremy Exp $
-// lcdd
-#include "G4StoreManager.hh"
+// LCDD
+#include "lcdd/core/G4StoreManager.hh"
+
+// Geant4
#include "G4UIdirectory.hh"
G4StoreManager *G4StoreManager::_instance = 0;
lcdd/src
diff -u -r1.13 -r1.14
--- G4TrackerCombineSD.cc 24 Jun 2013 22:10:36 -0000 1.13
+++ G4TrackerCombineSD.cc 26 Jun 2013 01:36:23 -0000 1.14
@@ -1,10 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/G4TrackerCombineSD.cc,v 1.13 2013/06/24 22:10:36 jeremy Exp $
-#include "G4TrackerCombineSD.hh"
+// $Header: /cvs/lcd/lcdd/src/G4TrackerCombineSD.cc,v 1.14 2013/06/26 01:36:23 jeremy Exp $
// LCDD
-#include "ReadoutUtil.hh"
-
-#include "TrackInformation.hh"
+#include "lcdd/detectors/G4TrackerCombineSD.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
+#include "lcdd/hits/TrackInformation.hh"
G4TrackerCombineSD::G4TrackerCombineSD(G4String sdName, G4String hcName) :
G4TrackerSD(sdName, hcName), m_combineHits(false), m_currentTrackID(-1), m_currentPV(0), m_edepTotal(0), m_minTime(0), m_startedHit(false), m_currentTrack(false)
lcdd/src
diff -u -r1.9 -r1.10
--- G4TrackerHit.cc 24 Jun 2013 22:10:36 -0000 1.9
+++ G4TrackerHit.cc 26 Jun 2013 01:36:23 -0000 1.10
@@ -1,4 +1,7 @@
-#include "G4TrackerHit.hh"
+// $Header: /cvs/lcd/lcdd/src/G4TrackerHit.cc,v 1.10 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/hits/G4TrackerHit.hh"
// for Draw() method
#ifdef G4VIS_USE
lcdd/src
diff -u -r1.41 -r1.42
--- G4TrackerSD.cc 24 Jun 2013 22:10:36 -0000 1.41
+++ G4TrackerSD.cc 26 Jun 2013 01:36:23 -0000 1.42
@@ -1,16 +1,18 @@
-// $Header: /cvs/lcd/lcdd/src/G4TrackerSD.cc,v 1.41 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4TrackerSD.cc,v 1.42 2013/06/26 01:36:23 jeremy Exp $
// LCDD
-#include "IdManager.hh"
-#include "IdFactory.hh"
-#include "IdVec.hh"
-
-// G4
-#include "G4TrackerSD.hh"
-#include "G4TrackerHit.hh"
-#include "TrackInformation.hh"
+#include "lcdd/id/IdManager.hh"
+#include "lcdd/id/IdFactory.hh"
+#include "lcdd/id/IdVec.hh"
+#include "lcdd/detectors/G4TrackerSD.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
+#include "lcdd/hits/G4TrackerHit.hh"
+#include "lcdd/hits/TrackInformation.hh"
+
+// Geant4
#include "G4Geantino.hh"
+// STL
#include <iostream>
G4TrackerSD::G4TrackerSD(G4String sdName, G4String hcName) :
lcdd/src
diff -u -r1.5 -r1.6
--- G4UnsegmentedCalorimeterSD.cc 24 Jun 2013 22:10:36 -0000 1.5
+++ G4UnsegmentedCalorimeterSD.cc 26 Jun 2013 01:36:23 -0000 1.6
@@ -1,5 +1,7 @@
-// $Id: G4UnsegmentedCalorimeterSD.cc,v 1.5 2013/06/24 22:10:36 jeremy Exp $
-#include "G4UnsegmentedCalorimeterSD.hh"
+// $Id: G4UnsegmentedCalorimeterSD.cc,v 1.6 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/detectors/G4UnsegmentedCalorimeterSD.hh"
G4UnsegmentedCalorimeterSD::G4UnsegmentedCalorimeterSD(G4String sdName, G4String hcName, G4Segmentation* seg) :
G4CalorimeterSD(sdName, hcName, seg)
lcdd/src
diff -u -r1.4 -r1.5
--- GDMLWriter.cc 24 Jun 2013 22:10:36 -0000 1.4
+++ GDMLWriter.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,10 +1,12 @@
-// $Header: /cvs/lcd/lcdd/src/GDMLWriter.cc,v 1.4 2013/06/24 22:10:36 jeremy Exp $
-#include "GDMLWriter.hh"
+// $Header: /cvs/lcd/lcdd/src/GDMLWriter.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
-// gdml
+// LCDD
+#include "lcdd/util/GDMLWriter.hh"
+
+// GDML
#include "G4Writer/G4GDMLWriter.h"
-// geant4
+// Geant4
#include "G4VPhysicalVolume.hh"
#include "G4TransportationManager.hh"
lcdd/src
diff -u -r1.4 -r1.5
--- GDMLWriterMessenger.cc 24 Jun 2013 22:10:36 -0000 1.4
+++ GDMLWriterMessenger.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,11 +1,11 @@
-// $Header: /cvs/lcd/lcdd/src/GDMLWriterMessenger.cc,v 1.4 2013/06/24 22:10:36 jeremy Exp $
-#include "GDMLWriterMessenger.hh"
+// $Header: /cvs/lcd/lcdd/src/GDMLWriterMessenger.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
-// geant4
-#include "G4UIcmdWithAString.hh"
+// LCDD
+#include "lcdd/util/GDMLWriterMessenger.hh"
+#include "lcdd/util/GDMLWriter.hh"
-// lcdd
-#include "GDMLWriter.hh"
+// Geant4
+#include "G4UIcmdWithAString.hh"
GDMLWriterMessenger::GDMLWriterMessenger()
{
lcdd/src
diff -u -r1.13 -r1.14
--- GeometryManager.cc 24 Jun 2013 22:10:36 -0000 1.13
+++ GeometryManager.cc 26 Jun 2013 01:36:23 -0000 1.14
@@ -1,14 +1,16 @@
-// $Header: /cvs/lcd/lcdd/src/GeometryManager.cc,v 1.13 2013/06/24 22:10:36 jeremy Exp $
-#include "GeometryManager.hh"
+// $Header: /cvs/lcd/lcdd/src/GeometryManager.cc,v 1.14 2013/06/26 01:36:23 jeremy Exp $
// LCDD
-#include "G4UserRegionInformation.hh"
-#include "G4StoreManager.hh"
+#include "lcdd/core/GeometryManager.hh"
+
+// LCDD
+#include "lcdd/geant4/G4UserRegionInformation.hh"
+#include "lcdd/core/G4StoreManager.hh"
// GDML
#include "G4Processor/GDMLProcessor.h"
-// G4
+// Geant4
#include "G4Run.hh"
#include "G4LogicalVolume.hh"
#include "G4VisAttributes.hh"
lcdd/src
diff -u -r1.29 -r1.30
--- IdFactory.cc 24 Jun 2013 22:10:36 -0000 1.29
+++ IdFactory.cc 26 Jun 2013 01:36:23 -0000 1.30
@@ -1,21 +1,21 @@
-// $Header: /cvs/lcd/lcdd/src/IdFactory.cc,v 1.29 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/IdFactory.cc,v 1.30 2013/06/26 01:36:23 jeremy Exp $
-// set for verbose output from this class
+// Uncomment to enable verbose debug output from this class.
//#define ID_DEBUG 1
-// G4
+// LCDD
+#include "lcdd/detectors/G4SensitiveDetector.hh"
+#include "lcdd/detectors/G4CalorimeterSD.hh"
+#include "lcdd/detectors/G4Segmentation.hh"
+#include "lcdd/id/IdManager.hh"
+#include "lcdd/id/IdFactory.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
+
+// Geant4
#include "G4Step.hh"
#include "G4VPhysicalVolume.hh"
#include "G4NavigationHistory.hh"
-// LCDD
-#include "G4SensitiveDetector.hh"
-#include "G4CalorimeterSD.hh"
-#include "G4Segmentation.hh"
-#include "IdManager.hh"
-#include "IdFactory.hh"
-#include "ReadoutUtil.hh"
-
using namespace std;
IdFactory::Bits const IdFactory::MASK_ON = 0xFFFFFFFF;
lcdd/src
diff -u -r1.7 -r1.8
--- IdFieldProcess.cc 24 Jun 2013 22:10:36 -0000 1.7
+++ IdFieldProcess.cc 26 Jun 2013 01:36:23 -0000 1.8
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/IdFieldProcess.cc,v 1.7 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/IdFieldProcess.cc,v 1.8 2013/06/26 01:36:23 jeremy Exp $
// GDML
#include "Saxana/ProcessingConfigurator.h"
@@ -10,7 +10,7 @@
#include "Saxana/SAXComponentFactory.h"
// LCDD
-#include "idfieldElem.hh"
+#include "lcdd/schema/idfieldElem.hh"
// std
#include <iostream>
lcdd/src
diff -u -r1.7 -r1.8
--- IdManager.cc 24 Jun 2013 22:10:36 -0000 1.7
+++ IdManager.cc 26 Jun 2013 01:36:23 -0000 1.8
@@ -1,6 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/IdManager.cc,v 1.7 2013/06/24 22:10:36 jeremy Exp $
-#include "IdManager.hh"
+// $Header: /cvs/lcd/lcdd/src/IdManager.cc,v 1.8 2013/06/26 01:36:23 jeremy Exp $
+// LCDD
+#include "lcdd/id/IdManager.hh"
+
+// Geant4
#include "G4LogicalVolume.hh"
IdManager* IdManager::m_instance = 0;
lcdd/src
diff -u -r1.5 -r1.6
--- IdSpec.cc 24 Jun 2013 22:10:36 -0000 1.5
+++ IdSpec.cc 26 Jun 2013 01:36:23 -0000 1.6
@@ -1,6 +1,7 @@
-// $Header: /cvs/lcd/lcdd/src/IdSpec.cc,v 1.5 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/IdSpec.cc,v 1.6 2013/06/26 01:36:23 jeremy Exp $
-#include "IdSpec.hh"
+// LCDD
+#include "lcdd/id/IdSpec.hh"
// STL
#include <sstream>
lcdd/src
diff -u -r1.3 -r1.4
--- IdVec.cc 24 Jun 2013 22:10:36 -0000 1.3
+++ IdVec.cc 26 Jun 2013 01:36:23 -0000 1.4
@@ -1,5 +1,7 @@
-// $Header: /cvs/lcd/lcdd/src/IdVec.cc,v 1.3 2013/06/24 22:10:36 jeremy Exp $
-#include "IdVec.hh"
+// $Header: /cvs/lcd/lcdd/src/IdVec.cc,v 1.4 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/id/IdVec.hh"
IdVec::IdVec()
{
lcdd/src
diff -u -r1.15 -r1.16
--- LCDDDetectorConstruction.cc 24 Jun 2013 22:10:36 -0000 1.15
+++ LCDDDetectorConstruction.cc 26 Jun 2013 01:36:23 -0000 1.16
@@ -1,15 +1,15 @@
-// $Header: /cvs/lcd/lcdd/src/LCDDDetectorConstruction.cc,v 1.15 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/LCDDDetectorConstruction.cc,v 1.16 2013/06/26 01:36:23 jeremy Exp $
// LCDD
-#include "LCDDDetectorConstruction.hh"
-#include "LCDDProcessor.hh"
-#include "LCDDMessenger.hh"
-#include "LCDDObjectStoreInspector.hh"
-#include "GDMLWriterMessenger.hh"
-#include "LCDDParser.hh"
-#include "GeometryManager.hh"
+#include "lcdd/core/LCDDDetectorConstruction.hh"
+#include "lcdd/core/LCDDParser.hh"
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/core/LCDDMessenger.hh"
+#include "lcdd/core/LCDDObjectStoreInspector.hh"
+#include "lcdd/util/GDMLWriterMessenger.hh"
+#include "lcdd/core/GeometryManager.hh"
-// G4
+// Geant4
#include "G4VPhysicalVolume.hh"
#include "G4UImanager.hh"
#include "G4Timer.hh"
lcdd/src
diff -u -r1.6 -r1.7
--- LCDDFieldManager.cc 24 Jun 2013 22:10:36 -0000 1.6
+++ LCDDFieldManager.cc 26 Jun 2013 01:36:23 -0000 1.7
@@ -1,4 +1,8 @@
-#include "LCDDFieldManager.hh"
+// $Header: /cvs/lcd/lcdd/src/LCDDFieldManager.cc,v 1.7 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/bfield/LCDDFieldManager.hh"
+#include "lcdd/core/LCDDProcessor.hh"
LCDDFieldManager* LCDDFieldManager::m_instance = 0;
lcdd/src
diff -u -r1.10 -r1.11
--- LCDDMessenger.cc 24 Jun 2013 22:10:36 -0000 1.10
+++ LCDDMessenger.cc 26 Jun 2013 01:36:23 -0000 1.11
@@ -1,17 +1,18 @@
-// $Header: /cvs/lcd/lcdd/src/LCDDMessenger.cc,v 1.10 2013/06/24 22:10:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/LCDDMessenger.cc,v 1.11 2013/06/26 01:36:23 jeremy Exp $
// LCDD
-#include "LCDDMessenger.hh"
-#include "LCDDParser.hh"
-#include "GeometryManager.hh"
-#include "NistElementsDump.hh"
-#include "StringUtil.hh"
+#include "lcdd/core/LCDDMessenger.hh"
+#include "lcdd/core/LCDDParser.hh"
+#include "lcdd/core/GeometryManager.hh"
+#include "lcdd/util/NistElementsDump.hh"
+#include "lcdd/util/StringUtil.hh"
// Geant4
#include "G4UImessenger.hh"
#include "G4UIcommand.hh"
#include "G4UIdirectory.hh"
+// STL
#include <cassert>
LCDDMessenger::LCDDMessenger()
lcdd/src
diff -u -r1.13 -r1.14
--- LCDDParser.cc 24 Jun 2013 22:10:36 -0000 1.13
+++ LCDDParser.cc 26 Jun 2013 01:36:23 -0000 1.14
@@ -1,14 +1,18 @@
-// $Header: /cvs/lcd/lcdd/src/LCDDParser.cc,v 1.13 2013/06/24 22:10:36 jeremy Exp $
-#include "LCDDParser.hh"
+// $Header: /cvs/lcd/lcdd/src/LCDDParser.cc,v 1.14 2013/06/26 01:36:23 jeremy Exp $
-// lcdd
-#include "LCDDFieldManager.hh"
+// LCDD
+#include "lcdd/core/LCDDParser.hh"
+#include "lcdd/bfield/LCDDFieldManager.hh"
+#include "lcdd/subscribers/volumeExtendedSubscriber.hh"
-// gdml
+// GDML
#include "G4Processor/GDMLProcessor.h"
#include "Saxana/SAXComponentFactoryTable.h"
+#include "Saxana/RCObjectHandle.h"
+#include "Saxana/SAXSubscriber.h"
+#include "Saxana/SAXSubscriberPool.h"
-// geant4
+// Geant4
#include "G4VPhysicalVolume.hh"
extern "C" void LCDDLibLoad();
@@ -158,12 +162,6 @@
return valid;
}
-#include "Saxana/RCObjectHandle.h"
-#include "Saxana/SAXSubscriber.h"
-#include "Saxana/SAXSubscriberPool.h"
-
-#include "volumeExtendedSubscriber.hh"
-
void LCDDParser::addVolumeExtendedSubscriber()
{
RCObjectHandle<SAXSubscriber> obj;
lcdd/src
diff -u -r1.18 -r1.19
--- LCDDProcessor.cc 24 Jun 2013 22:10:36 -0000 1.18
+++ LCDDProcessor.cc 26 Jun 2013 01:36:23 -0000 1.19
@@ -1,7 +1,11 @@
-#include "LCDDProcessor.hh"
+// $Header: /cvs/lcd/lcdd/src/LCDDProcessor.cc,v 1.19 2013/06/26 01:36:23 jeremy Exp $
-#include "LCDDFieldManager.hh"
+// LCDD
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/bfield/LCDDFieldManager.hh"
+#include "lcdd/bfield/MagneticFieldOverlay.hh"
+// Geant4
#include "G4TransportationManager.hh"
#include "G4FieldManager.hh"
#include "G4EventManager.hh"
@@ -9,8 +13,6 @@
#include "G4SDManager.hh"
#include "G4HCtable.hh"
-#include "MagneticFieldOverlay.hh"
-
LCDDProcessor* LCDDProcessor::sInstance = 0;
LCDDProcessor::LCDDProcessor() :
lcdd/src
diff -u -r1.5 -r1.6
--- MagneticFieldOverlay.cc 24 Jun 2013 22:10:37 -0000 1.5
+++ MagneticFieldOverlay.cc 26 Jun 2013 01:36:23 -0000 1.6
@@ -1,6 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/MagneticFieldOverlay.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
-#include "MagneticFieldOverlay.hh"
+// $Header: /cvs/lcd/lcdd/src/MagneticFieldOverlay.cc,v 1.6 2013/06/26 01:36:23 jeremy Exp $
+// LCDD
+#include "lcdd/bfield/MagneticFieldOverlay.hh"
+
+// STL
#include <iostream>
MagneticFieldOverlay::MagneticFieldOverlay()
lcdd/src
diff -u -r1.5 -r1.6
--- McpHitContrib.cc 24 Jun 2013 22:10:37 -0000 1.5
+++ McpHitContrib.cc 26 Jun 2013 01:36:23 -0000 1.6
@@ -1,7 +1,8 @@
-// $Header: /cvs/lcd/lcdd/src/McpHitContrib.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/McpHitContrib.cc,v 1.6 2013/06/26 01:36:23 jeremy Exp $
-#include "McpHitContrib.hh"
-#include "TrackInformation.hh"
+// LCDD
+#include "lcdd/hits/McpHitContrib.hh"
+#include "lcdd/hits/TrackInformation.hh"
// Geant4
#include "G4Track.hh"
lcdd/src
diff -u -r1.2 -r1.3
--- NistElementsDump.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ NistElementsDump.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,18 +1,17 @@
-// $Id: NistElementsDump.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
+// $Id: NistElementsDump.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
-#include "NistElementsDump.hh"
+// LCDD
+#include "lcdd/util/NistElementsDump.hh"
+#include "lcdd/util/StringUtil.hh"
-// G4
-#include "G4String.hh"
-#include "G4NistManager.hh"
-
-// gdml
+// GDML
#include "Writer/Element.h"
-// lcdd
-#include "StringUtil.hh"
+// Geant4
+#include "G4String.hh"
+#include "G4NistManager.hh"
-// stl
+// STL
#include <vector>
#include <fstream>
@@ -20,7 +19,7 @@
using namespace std;
-#include "ElementNames.icc"
+#include "lcdd/util/ElementNames.icc"
void NistElementsDump::writeXml(const std::string& filename)
{
lcdd/src
diff -u -r1.15 -r1.16
--- ReadoutUtil.cc 24 Jun 2013 22:10:37 -0000 1.15
+++ ReadoutUtil.cc 26 Jun 2013 01:36:23 -0000 1.16
@@ -1,13 +1,16 @@
-// $Header: /cvs/lcd/lcdd/src/ReadoutUtil.cc,v 1.15 2013/06/24 22:10:37 jeremy Exp $
-#include "ReadoutUtil.hh"
+// $Header: /cvs/lcd/lcdd/src/ReadoutUtil.cc,v 1.16 2013/06/26 01:36:23 jeremy Exp $
-#include <cmath>
+// LCDD
+#include "lcdd/detectors/ReadoutUtil.hh"
-// geant4
+// Geant4
#include "G4ParticleDefinition.hh"
#include "G4Geantino.hh"
#include "G4ChargedGeantino.hh"
+// STL
+#include <cmath>
+
const double ReadoutUtil::PI = acos(-1);
G4ThreeVector ReadoutUtil::computeThreeVectorMean(const G4ThreeVector& vec1, const G4ThreeVector& vec2)
@@ -179,9 +182,8 @@
else {
vnum = theTouchable->GetReplicaNumber(historyDepth);
}
- }
- // copy num: placement
- else {
+ } else {
+ // copy num: placement
vnum = pv->GetCopyNo();
}
lcdd/src
diff -u -r1.25 -r1.26
--- SensitiveDetectorFactory.cc 24 Jun 2013 22:10:37 -0000 1.25
+++ SensitiveDetectorFactory.cc 26 Jun 2013 01:36:23 -0000 1.26
@@ -1,16 +1,15 @@
-// $Header: /cvs/lcd/lcdd/src/SensitiveDetectorFactory.cc,v 1.25 2013/06/24 22:10:37 jeremy Exp $
-#include "SensitiveDetectorFactory.hh"
+// $Header: /cvs/lcd/lcdd/src/SensitiveDetectorFactory.cc,v 1.26 2013/06/26 01:36:23 jeremy Exp $
-// lcdd
-#include "G4TrackerCombineSD.hh"
-#include "G4ScorerSD.hh"
-#include "G4TrackerSD.hh"
-#include "G4OpticalCalorimeterSD.hh"
-#include "G4UnsegmentedCalorimeterSD.hh"
-//#include "G4CalorimeterSD.hh"
-#include "PositionComparator.hh"
-#include "IdComparator.hh"
-#include "StringUtil.hh"
+// LCDD
+#include "lcdd/detectors/SensitiveDetectorFactory.hh"
+#include "lcdd/detectors/G4TrackerCombineSD.hh"
+#include "lcdd/detectors/G4ScorerSD.hh"
+#include "lcdd/detectors/G4TrackerSD.hh"
+#include "lcdd/detectors/G4OpticalCalorimeterSD.hh"
+#include "lcdd/detectors/G4UnsegmentedCalorimeterSD.hh"
+#include "lcdd/detectors/PositionComparator.hh"
+#include "lcdd/id/IdComparator.hh"
+#include "lcdd/util/StringUtil.hh"
G4SensitiveDetector* SensitiveDetectorFactory::createSensitiveDetector(const SAXObject* object)
{
lcdd/src
diff -u -r1.3 -r1.4
--- SensitiveDetectorMessenger.cc 24 Jun 2013 22:10:37 -0000 1.3
+++ SensitiveDetectorMessenger.cc 26 Jun 2013 01:36:23 -0000 1.4
@@ -1,7 +1,9 @@
-// $Id: SensitiveDetectorMessenger.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
-#include "SensitiveDetectorMessenger.hh"
+// $Id: SensitiveDetectorMessenger.cc,v 1.4 2013/06/26 01:36:23 jeremy Exp $
-// geant4
+// LCDD
+#include "lcdd/detectors/SensitiveDetectorMessenger.hh"
+
+// Geant4
#include "G4UIcommand.hh"
#include "G4UIcmdWithAnInteger.hh"
#include "G4UIcmdWithABool.hh"
lcdd/src
diff -u -r1.4 -r1.5
--- StepReadout.cc 24 Jun 2013 22:10:37 -0000 1.4
+++ StepReadout.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,9 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/StepReadout.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
-#include "StepReadout.hh"
+// $Header: /cvs/lcd/lcdd/src/StepReadout.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
// LCDD
-#include "ReadoutUtil.hh"
-#include "TrackInformation.hh"
+#include "lcdd/detectors/StepReadout.hh"
+#include "lcdd/detectors/ReadoutUtil.hh"
+#include "lcdd/hits/TrackInformation.hh"
// G4
#include "G4Step.hh"
lcdd/src
diff -u -r1.11 -r1.12
--- StringUtil.cc 24 Jun 2013 22:10:37 -0000 1.11
+++ StringUtil.cc 26 Jun 2013 01:36:23 -0000 1.12
@@ -1,7 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/StringUtil.cc,v 1.11 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/StringUtil.cc,v 1.12 2013/06/26 01:36:23 jeremy Exp $
-#include "StringUtil.hh"
+// LCDD
+#include "lcdd/util/StringUtil.hh"
+// STL
#include <cctype>
#include <iostream>
#include <algorithm>
lcdd/src
diff -u -r1.9 -r1.10
--- TrackInformation.cc 24 Jun 2013 22:10:37 -0000 1.9
+++ TrackInformation.cc 26 Jun 2013 01:36:23 -0000 1.10
@@ -1,6 +1,7 @@
-// $Header: /cvs/lcd/lcdd/src/TrackInformation.cc,v 1.9 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/TrackInformation.cc,v 1.10 2013/06/26 01:36:23 jeremy Exp $
-#include "TrackInformation.hh"
+// LCDD
+#include "lcdd/hits/TrackInformation.hh"
G4Allocator<TrackInformation> TrackInformationAllocator;
lcdd/src
diff -u -r1.1 -r1.2
--- Verbose.cc 19 Apr 2005 22:56:00 -0000 1.1
+++ Verbose.cc 26 Jun 2013 01:36:23 -0000 1.2
@@ -1,4 +1,6 @@
-// $Header: /cvs/lcd/lcdd/src/Verbose.cc,v 1.1 2005/04/19 22:56:00 jeremy Exp $
-#include "Verbose.hh"
+// $Header: /cvs/lcd/lcdd/src/Verbose.cc,v 1.2 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/util/Verbose.hh"
const Verbose::LevelType Verbose::m_defaultLevel = 0;
lcdd/src
diff -u -r1.7 -r1.8
--- authorProcess.cc 24 Jun 2013 22:10:37 -0000 1.7
+++ authorProcess.cc 26 Jun 2013 01:36:23 -0000 1.8
@@ -1,5 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/authorProcess.cc,v 1.7 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/authorProcess.cc,v 1.8 2013/06/26 01:36:23 jeremy Exp $
+// LCDD
+#include "lcdd/schema/author.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -8,8 +12,7 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "author.hh"
-
+// STL
#include <iostream>
/**
@@ -17,11 +20,14 @@
*/
class authorProcess: public SAXStateProcess
{
+
public:
+
authorProcess(const ProcessingContext* context = 0) :
SAXStateProcess(context), m_obj(0)
{
}
+
virtual ~authorProcess()
{
}
lcdd/src
diff -u -r1.2 -r1.3
--- box_dipoleProcess.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ box_dipoleProcess.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,3 +1,6 @@
+// $Header: /cvs/lcd/lcdd/src/box_dipoleProcess.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -6,9 +9,11 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "box_dipole.hh"
-#include "FieldTypeProcess.hh"
+// LCDD
+#include "lcdd/schema/box_dipole.hh"
+#include "lcdd/schema/FieldTypeProcess.hh"
+// STL
#include <iostream>
class box_dipoleProcess: public FieldTypeProcess
lcdd/src
diff -u -r1.2 -r1.3
--- box_dipoleSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ box_dipoleSubscriber.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,16 +1,16 @@
+// $Header: /cvs/lcd/lcdd/src/box_dipoleSubscriber.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/bfield/G4BoxDipole.hh"
+#include "lcdd/schema/box_dipole.hh"
+
+// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-
#include "G4Processor/GDMLProcessor.h"
#include "G4Evaluator/GDMLExpressionEvaluator.h"
-// lcdd
-#include "LCDDProcessor.hh"
-#include "G4BoxDipole.hh"
-
-// element
-#include "box_dipole.hh"
-
class box_dipoleSubscriber: virtual public SAXSubscriber
{
lcdd/src
diff -u -r1.8 -r1.9
--- calorimeterProcess.cc 24 Jun 2013 22:10:37 -0000 1.8
+++ calorimeterProcess.cc 26 Jun 2013 01:36:23 -0000 1.9
@@ -1,12 +1,8 @@
-// $Header: /cvs/lcd/lcdd/src/calorimeterProcess.cc,v 1.8 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/calorimeterProcess.cc,v 1.9 2013/06/26 01:36:23 jeremy Exp $
-#include "calorimeterProcess.hh"
+// LCDD
+#include "lcdd/schema/calorimeterProcess.hh"
-/**
- @class calorimeterProcess
- @brief SAX process for calorimeter element.
- @note Calls SAX processor for SensitiveDetectorTypeProcess parent class.
- */
calorimeterProcess::calorimeterProcess(const ProcessingContext* context) :
SensitiveDetectorTypeProcess(context)
{
lcdd/src
diff -u -r1.16 -r1.17
--- calorimeterSubscriber.cc 30 May 2013 00:04:12 -0000 1.16
+++ calorimeterSubscriber.cc 26 Jun 2013 01:36:23 -0000 1.17
@@ -1,23 +1,20 @@
-// $Header: /cvs/lcd/lcdd/src/calorimeterSubscriber.cc,v 1.16 2013/05/30 00:04:12 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/calorimeterSubscriber.cc,v 1.17 2013/06/26 01:36:23 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-
#include "G4Processor/GDMLProcessor.h"
// LCDD
-#include "calorimeter.hh"
-
-#include "LCDDProcessor.hh"
-#include "G4CalorimeterSD.hh"
-
-#include "G4SegmentationFactory.hh"
-#include "SensitiveDetectorFactory.hh"
-
-#include "IdManager.hh"
-#include "IdSpec.hh"
+#include "lcdd/schema/calorimeter.hh"
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/detectors/G4CalorimeterSD.hh"
+#include "lcdd/detectors/G4SegmentationFactory.hh"
+#include "lcdd/detectors/SensitiveDetectorFactory.hh"
+#include "lcdd/id/IdManager.hh"
+#include "lcdd/id/IdSpec.hh"
+// STL
#include <iostream>
#include <sstream>
lcdd/src
diff -u -r1.2 -r1.3
--- cell_readout_2dProcess.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ cell_readout_2dProcess.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/cell_readout_2dProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/cell_readout_2dProcess.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
// GDML
#include "Saxana/ProcessingConfigurator.h"
@@ -10,9 +10,9 @@
#include "Saxana/SAXComponentFactory.h"
// LCDD
-#include "cell_readout_2d.hh"
+#include "lcdd/schema/cell_readout_2d.hh"
-// std
+// STL
#include <iostream>
class cell_readout_2dProcess: public SAXStateProcess
lcdd/src
diff -u -r1.5 -r1.6
--- colorProcess.cc 24 Jun 2013 22:10:37 -0000 1.5
+++ colorProcess.cc 26 Jun 2013 01:36:23 -0000 1.6
@@ -1,4 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/colorProcess.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/colorProcess.cc,v 1.6 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/schema/color.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -7,8 +12,7 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "color.hh"
-
+// STL
#include <iostream>
/**
lcdd/src
diff -u -r1.6 -r1.7
--- commentProcess.cc 24 Jun 2013 22:10:37 -0000 1.6
+++ commentProcess.cc 26 Jun 2013 01:36:23 -0000 1.7
@@ -1,5 +1,6 @@
-// $Header: /cvs/lcd/lcdd/src/commentProcess.cc,v 1.6 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/commentProcess.cc,v 1.7 2013/06/26 01:36:23 jeremy Exp $
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -8,8 +9,10 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "comment.hh"
+// LCDD
+#include "lcdd/schema/comment.hh"
+// STL
#include <iostream>
/**
lcdd/src
diff -u -r1.6 -r1.7
--- detectorProcess.cc 24 Jun 2013 22:10:37 -0000 1.6
+++ detectorProcess.cc 26 Jun 2013 01:36:23 -0000 1.7
@@ -1,5 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/detectorProcess.cc,v 1.6 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/detectorProcess.cc,v 1.7 2013/06/26 01:36:23 jeremy Exp $
+// LCDD
+#include "lcdd/schema/detector.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -8,13 +12,11 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "detector.hh"
-
+// STL
#include <iostream>
/**
- @class detectorProcess
- @brief SAX process for detector element.
+ * @brief SAX process for detector element.
*/
class detectorProcess: public SAXStateProcess
{
@@ -35,8 +37,6 @@
virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
{
- //std::cout << "detectorProcess::StartElement" << std::endl;
-
SAXObject** obj = Context()->GetTopObject();
detector* d = new detector;
lcdd/src
diff -u -r1.4 -r1.5
--- dipoleProcess.cc 24 Jun 2013 22:10:37 -0000 1.4
+++ dipoleProcess.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,6 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/dipoleProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/dipoleProcess.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
-// gdml
+// LCDD
+#include "lcdd/schema/dipole.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -9,10 +12,7 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "dipole.hh"
-
/**
- * @class dipoleProcess
* @brief SAX process for the dipole element.
*/
class dipoleProcess: public SAXStateProcess
lcdd/src
diff -u -r1.5 -r1.6
--- dipoleSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.5
+++ dipoleSubscriber.cc 26 Jun 2013 01:36:23 -0000 1.6
@@ -1,23 +1,19 @@
-// $Header: /cvs/lcd/lcdd/src/dipoleSubscriber.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/dipoleSubscriber.cc,v 1.6 2013/06/26 01:36:23 jeremy Exp $
+
+// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-
#include "G4Processor/GDMLProcessor.h"
#include "G4Evaluator/GDMLExpressionEvaluator.h"
-// processor
-#include "LCDDProcessor.hh"
-
-// element
-#include "dipole.hh"
-#include "dipole_coeff.hh"
-
-// lcdd
-#include "G4Dipole.hh"
+// LCDD
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/schema/dipole.hh"
+#include "lcdd/schema/dipole_coeff.hh"
+#include "lcdd/bfield/G4Dipole.hh"
/**
- * @class dipoleSubscriber
- * @brief Creates G4Dipole objects from dipole elements.
+ * @brief Creates G4Dipole runtime objects in Geant4 from dipole elements.
*/
class dipoleSubscriber: virtual public SAXSubscriber
{
lcdd/src
diff -u -r1.2 -r1.3
--- dipole_coeffProcess.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ dipole_coeffProcess.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/dipole_coeffProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/dipole_coeffProcess.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
// GDML
#include "Saxana/ProcessingConfigurator.h"
@@ -10,9 +10,9 @@
#include "Saxana/SAXComponentFactory.h"
// LCDD
-#include "dipole_coeff.hh"
+#include "lcdd/schema/dipole_coeff.hh"
-// std
+// STL
#include <iostream>
/**
lcdd/src
diff -u -r1.4 -r1.5
--- field_map_3dProcess.cc 24 Jun 2013 22:10:37 -0000 1.4
+++ field_map_3dProcess.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,12 +1,16 @@
-// $Header: /cvs/lcd/lcdd/src/field_map_3dProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/field_map_3dProcess.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
-#include "FieldMapTypeProcess.hh"
+// LCDD
+#include "lcdd/schema/FieldMapTypeProcess.hh"
+#include "lcdd/schema/field_map_3d.hh"
+
+// STL
#include <iostream>
+
+// Geant4
#include "globals.hh"
-#include "field_map_3d.hh"
/**
- * @class
* @brief
*/
class field_map_3dProcess: public FieldMapTypeProcess
lcdd/src
diff -u -r1.3 -r1.4
--- field_map_3dSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.3
+++ field_map_3dSubscriber.cc 26 Jun 2013 01:36:23 -0000 1.4
@@ -1,17 +1,18 @@
-// $Header: /cvs/lcd/lcdd/src/field_map_3dSubscriber.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/field_map_3dSubscriber.cc,v 1.4 2013/06/26 01:36:23 jeremy Exp $
-// gdml
+// lcdd
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/schema/field_map_3d.hh"
+#include "lcdd/bfield/Cartesian3DMagneticFieldMap.hh"
+
+// GDML
#include "Saxana/SAXSubscriber.h"
+#include "Saxana/SAXComponentObject.h"
#include "Saxana/SAXComponentFactory.h"
-// geant4
+// Geant4
#include "G4Processor/GDMLProcessor.h"
-// lcdd
-#include "LCDDProcessor.hh"
-#include "field_map_3d.hh"
-#include "Cartesian3DMagneticFieldMap.hh"
-
/*
* @class
* @brief
lcdd/src
diff -u -r1.6 -r1.7
--- fieldrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.6
+++ fieldrefProcess.cc 26 Jun 2013 01:36:23 -0000 1.7
@@ -1,12 +1,13 @@
-// $Header: /cvs/lcd/lcdd/src/fieldrefProcess.cc,v 1.6 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/fieldrefProcess.cc,v 1.7 2013/06/26 01:36:23 jeremy Exp $
+// GDML
#include "Processes/ReferenceTypeProcess.h"
-#include "FieldType.hh"
+// LCDD
+#include "lcdd/schema/FieldType.hh"
/**
- @class fieldrefProcess
- @brief SAX process for fieldref element.
+ * @brief SAX process for fieldref element.
*/
class fieldrefProcess: public ReferenceTypeProcess
{
lcdd/src
diff -u -r1.7 -r1.8
--- generatorProcess.cc 24 Jun 2013 22:10:37 -0000 1.7
+++ generatorProcess.cc 26 Jun 2013 01:36:23 -0000 1.8
@@ -1,5 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/generatorProcess.cc,v 1.7 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/generatorProcess.cc,v 1.8 2013/06/26 01:36:23 jeremy Exp $
+// LCDD
+#include "lcdd/schema/generator.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -8,13 +12,11 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "generator.hh"
-
+// STL
#include <iostream>
/**
- @class generatorProcess
- @brief SAX process for generator element.
+ * @brief SAX process for generator element.
*/
class generatorProcess: public SAXStateProcess
{
@@ -35,8 +37,6 @@
virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
{
- //std::cout << "generatorProcess::StartElement" << std::endl;
-
SAXObject** obj = Context()->GetTopObject();
generator* g = new generator;
lcdd/src
diff -u -r1.4 -r1.5
--- global_fieldProcess.cc 24 Jun 2013 22:10:37 -0000 1.4
+++ global_fieldProcess.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,5 +1,6 @@
-// $Header: /cvs/lcd/lcdd/src/global_fieldProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/global_fieldProcess.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -8,14 +9,15 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "global_field.hh"
-#include "SensitiveDetectorTypeProcess.hh"
+// LCDD
+#include "lcdd/schema/global_field.hh"
+#include "lcdd/schema/SensitiveDetectorTypeProcess.hh"
+// STL
#include <iostream>
/**
- @class global_fieldProcess
- @brief SAX process for global_field element.
+ * @brief SAX process for global_field element.
*/
class global_fieldProcess: public SAXStateProcess
{
lcdd/src
diff -u -r1.11 -r1.12
--- global_fieldSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.11
+++ global_fieldSubscriber.cc 26 Jun 2013 01:36:23 -0000 1.12
@@ -1,25 +1,24 @@
-// $Id: global_fieldSubscriber.cc,v 1.11 2013/06/24 22:10:37 jeremy Exp $
+// $Id: global_fieldSubscriber.cc,v 1.12 2013/06/26 01:36:23 jeremy Exp $
-// lcdd
-#include "LCDDProcessor.hh"
-#include "global_field.hh"
-#include "FieldType.hh"
+// LCDD
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/schema/global_field.hh"
+#include "lcdd/schema/FieldType.hh"
-// gdml
+// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
#include "G4Processor/GDMLProcessor.h"
-// std
-#include <iostream>
-
// Geant4
#include "G4MagneticField.hh"
+// STL
+#include <iostream>
+
/**
- @class global_fieldSubscriber
- @brief SAX subscriber for global_field element.
- @note Resolves fieldref and sets global field in LCDDProcessor.
+ * @brief SAX subscriber for global_field element.
+ * @note Resolves fieldref and sets global field in LCDDProcessor.
*/
class global_fieldSubscriber: virtual public SAXSubscriber
{
@@ -41,8 +40,6 @@
virtual void Activate(const SAXObject* object)
{
- //std::cout << "global_field Subscriber" << std::endl;
-
const global_field* fobj = 0;
G4MagneticField* mag = 0;
LCDDProcessor* proc = LCDDProcessor::instance();
lcdd/src
diff -u -r1.2 -r1.3
--- global_grid_xyProcess.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ global_grid_xyProcess.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,4 +1,6 @@
-// $Header: /cvs/lcd/lcdd/src/global_grid_xyProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/global_grid_xyProcess.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -7,8 +9,10 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "global_grid_xy.hh"
+// LCDD
+#include "lcdd/schema/global_grid_xy.hh"
+// STL
#include <iostream>
/**
lcdd/src
diff -u -r1.3 -r1.4
--- grid_xyzProcess.cc 24 Jun 2013 22:10:37 -0000 1.3
+++ grid_xyzProcess.cc 26 Jun 2013 01:36:23 -0000 1.4
@@ -1,4 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/grid_xyzProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/grid_xyzProcess.cc,v 1.4 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/schema/grid_xyz.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -7,13 +12,11 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "grid_xyz.hh"
-
+// STL
#include <iostream>
/**
- @class grid_xyzProcess
- @brief SAX process for grid_xyz element.
+ * @brief SAX process for grid_xyz element.
*/
class grid_xyzProcess: public SAXStateProcess
{
lcdd/src
diff -u -r1.6 -r1.7
--- headerProcess.cc 24 Jun 2013 22:10:37 -0000 1.6
+++ headerProcess.cc 26 Jun 2013 01:36:23 -0000 1.7
@@ -1,5 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/headerProcess.cc,v 1.6 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/headerProcess.cc,v 1.7 2013/06/26 01:36:23 jeremy Exp $
+// LCDD
+#include "lcdd/schema/header.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -8,13 +12,11 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "header.hh"
-
+// STL
#include <iostream>
/**
- @class headerProcess
- @brief SAX process for header element.
+ * @brief SAX process for header element.
*/
class headerProcess: public SAXStateProcess
{
lcdd/src
diff -u -r1.10 -r1.11
--- headerSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.10
+++ headerSubscriber.cc 26 Jun 2013 01:36:23 -0000 1.11
@@ -1,19 +1,18 @@
-// $Header: /cvs/lcd/lcdd/src/headerSubscriber.cc,v 1.10 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/headerSubscriber.cc,v 1.11 2013/06/26 01:36:23 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-
#include "G4Processor/GDMLProcessor.h"
// LCDD
-#include "LCDDProcessor.hh"
-#include "LCDDHeaderRecord.hh"
-#include "header.hh"
-#include "detector.hh"
-#include "generator.hh"
-#include "comment.hh"
-#include "author.hh"
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/geant4/LCDDHeaderRecord.hh"
+#include "lcdd/schema/header.hh"
+#include "lcdd/schema/detector.hh"
+#include "lcdd/schema/generator.hh"
+#include "lcdd/schema/comment.hh"
+#include "lcdd/schema/author.hh"
// std
#include <iostream>
lcdd/src
diff -u -r1.3 -r1.4
--- idspecProcess.cc 24 Jun 2013 22:10:37 -0000 1.3
+++ idspecProcess.cc 26 Jun 2013 01:36:23 -0000 1.4
@@ -1,4 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/idspecProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/idspecProcess.cc,v 1.4 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/schema/idspecElem.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -7,13 +12,11 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "idspecElem.hh"
-
+// STL
#include <iostream>
/**
- @class idspecProcess
- @brief SAX process for idspec element.
+ * @brief SAX process for idspec element.
*/
class idspecProcess: public SAXStateProcess
{
lcdd/src
diff -u -r1.9 -r1.10
--- idspecSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.9
+++ idspecSubscriber.cc 26 Jun 2013 01:36:23 -0000 1.10
@@ -1,23 +1,17 @@
-// $Header: /cvs/lcd/lcdd/src/idspecSubscriber.cc,v 1.9 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/idspecSubscriber.cc,v 1.10 2013/06/26 01:36:23 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-
#include "G4Processor/GDMLProcessor.h"
// LCDD
-#include "LCDDProcessor.hh"
-
-// class to instantiate...
-#include "IdSpec.hh"
-
-// from this SAXObject
-#include "idspecElem.hh"
-
-#include "idfieldElem.hh"
-#include "IdManager.hh"
-#include "StringUtil.hh"
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/id/IdSpec.hh"
+#include "lcdd/schema/idspecElem.hh"
+#include "lcdd/schema/idfieldElem.hh"
+#include "lcdd/id/IdManager.hh"
+#include "lcdd/util/StringUtil.hh"
/**
@class idspecSubscriber
lcdd/src
diff -u -r1.4 -r1.5
--- idspecrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.4
+++ idspecrefProcess.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,18 +1,17 @@
-// $Header: /cvs/lcd/lcdd/src/idspecrefProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
-
-// LCDD
-#include "IdSpecType.hh"
+// $Header: /cvs/lcd/lcdd/src/idspecrefProcess.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
// GDML
#include "Processes/ReferenceTypeProcess.h"
-// std
+// LCDD
+#include "lcdd/schema/IdSpecType.hh"
+
+// STL
#include <iostream>
/**
- @class idspecrefProcess
- @brief SAX process for idspecref element.
- @note Extends ReferenceTypeProcess for reference to idspec element.
+ * @brief SAX process for idspecref element.
+ * @note Extends ReferenceTypeProcess for reference to idspec element.
*/
class idspecrefProcess: public ReferenceTypeProcess
{
lcdd/src
diff -u -r1.5 -r1.6
--- limitProcess.cc 24 Jun 2013 22:10:37 -0000 1.5
+++ limitProcess.cc 26 Jun 2013 01:36:23 -0000 1.6
@@ -1,4 +1,7 @@
-// $Header: /cvs/lcd/lcdd/src/limitProcess.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitProcess.cc,v 1.6 2013/06/26 01:36:23 jeremy Exp $
+
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -7,7 +10,8 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "limit.hh"
+// LCDD
+#include "lcdd/schema/limit.hh"
/**
*
lcdd/src
diff -u -r1.4 -r1.5
--- limitrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.4
+++ limitrefProcess.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,12 +1,13 @@
-// $Header: /cvs/lcd/lcdd/src/limitrefProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitrefProcess.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
+// GDML
#include "Processes/ReferenceTypeProcess.h"
-#include "LimitType.hh"
+// LCDD
+#include "lcdd/schema/LimitType.hh"
/**
- @class limitrefProcess
- @brief SAX process for limitref element.
+ * @brief SAX process for limitref element.
*/
class limitrefProcess: public ReferenceTypeProcess
{
lcdd/src
diff -u -r1.4 -r1.5
--- limitsetProcess.cc 24 Jun 2013 22:10:37 -0000 1.4
+++ limitsetProcess.cc 26 Jun 2013 01:36:23 -0000 1.5
@@ -1,6 +1,8 @@
-// $Header: /cvs/lcd/lcdd/src/limitsetProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
-#include "limitset.hh"
-#include "limit.hh"
+// $Header: /cvs/lcd/lcdd/src/limitsetProcess.cc,v 1.5 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/schema/limitset.hh"
+#include "lcdd/schema/limit.hh"
// GDML
#include "Saxana/ProcessingConfigurator.h"
lcdd/src
diff -u -r1.5 -r1.6
--- limitsetSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.5
+++ limitsetSubscriber.cc 26 Jun 2013 01:36:23 -0000 1.6
@@ -1,17 +1,16 @@
-// $Header: /cvs/lcd/lcdd/src/limitsetSubscriber.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitsetSubscriber.cc,v 1.6 2013/06/26 01:36:23 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-
#include "G4Processor/GDMLProcessor.h"
// LCDD
-#include "limit.hh"
-#include "limitset.hh"
-#include "LCDDProcessor.hh"
-#include "G4LimitSet.hh"
-#include "StringUtil.hh"
+#include "lcdd/schema/limit.hh"
+#include "lcdd/schema/limitset.hh"
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/geant4/G4LimitSet.hh"
+#include "lcdd/util/StringUtil.hh"
#include <string>
#include <iostream>
lcdd/src
diff -u -r1.3 -r1.4
--- limitsetrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.3
+++ limitsetrefProcess.cc 26 Jun 2013 01:36:23 -0000 1.4
@@ -1,12 +1,13 @@
-// $Header: /cvs/lcd/lcdd/src/limitsetrefProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitsetrefProcess.cc,v 1.4 2013/06/26 01:36:23 jeremy Exp $
+// GDML
#include "Processes/ReferenceTypeProcess.h"
-#include "LimitSetType.hh"
+// LCDD
+#include "lcdd/schema/LimitSetType.hh"
/**
- @class limitsetrefProcess
- @brief SAX process for limitsetref element.
+ * @brief SAX process for limitsetref element.
*/
class limitsetrefProcess: public ReferenceTypeProcess
{
lcdd/src
diff -u -r1.3 -r1.4
--- nonprojective_cylinderProcess.cc 24 Jun 2013 22:10:37 -0000 1.3
+++ nonprojective_cylinderProcess.cc 26 Jun 2013 01:36:23 -0000 1.4
@@ -1,4 +1,6 @@
-// $Header: /cvs/lcd/lcdd/src/nonprojective_cylinderProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/nonprojective_cylinderProcess.cc,v 1.4 2013/06/26 01:36:23 jeremy Exp $
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -7,8 +9,10 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "nonprojective_cylinder.hh"
+// LCDD
+#include "lcdd/schema/nonprojective_cylinder.hh"
+// STL
#include <iostream>
/**
lcdd/src
diff -u -r1.2 -r1.3
--- optical_calorimeterProcess.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ optical_calorimeterProcess.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,5 +1,6 @@
-// $Header: /cvs/lcd/lcdd/src/optical_calorimeterProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/optical_calorimeterProcess.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -8,9 +9,11 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "optical_calorimeter.hh"
-#include "calorimeterProcess.hh"
+// LCDD
+#include "lcdd/schema/optical_calorimeter.hh"
+#include "lcdd/schema/calorimeterProcess.hh"
+// STL
#include <iostream>
/**
lcdd/src
diff -u -r1.2 -r1.3
--- optical_calorimeterSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ optical_calorimeterSubscriber.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,30 +1,26 @@
-// $Header: /cvs/lcd/lcdd/src/optical_calorimeterSubscriber.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/optical_calorimeterSubscriber.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-
#include "G4Processor/GDMLProcessor.h"
// LCDD
-#include "calorimeter.hh"
-
-#include "LCDDProcessor.hh"
-#include "G4CalorimeterSD.hh"
-
-#include "G4SegmentationFactory.hh"
-#include "SensitiveDetectorFactory.hh"
-
-#include "IdManager.hh"
-#include "IdSpec.hh"
+#include "lcdd/schema/calorimeter.hh"
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/detectors/G4CalorimeterSD.hh"
+#include "lcdd/detectors/G4SegmentationFactory.hh"
+#include "lcdd/detectors/SensitiveDetectorFactory.hh"
+#include "lcdd/id/IdManager.hh"
+#include "lcdd/id/IdSpec.hh"
+// STL
#include <iostream>
#include <sstream>
/**
- @class calorimeterSubscriber
- @brief SAX subscriber for calorimeter element.
- @note Delegates to SensitiveDetectorFactory to create G4CalorimeterSD object.
+ * @brief SAX subscriber for calorimeter element.
+ * @note Delegates to SensitiveDetectorFactory for creation of G4CalorimeterSD objects.
*/
class optical_calorimeterSubscriber: virtual public SAXSubscriber
{
lcdd/src
diff -u -r1.8 -r1.9
--- physvolidProcess.cc 24 Jun 2013 22:10:37 -0000 1.8
+++ physvolidProcess.cc 26 Jun 2013 01:36:23 -0000 1.9
@@ -1,5 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/physvolidProcess.cc,v 1.8 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/physvolidProcess.cc,v 1.9 2013/06/26 01:36:23 jeremy Exp $
+// LCDD
+#include "lcdd/schema/physvolidElem.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -8,13 +12,11 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "physvolidElem.hh"
-
+// STL
#include <iostream>
/**
- @class physvolidProcess
- @brief SAX process for physvolid element.
+ * @brief SAX process for physvolid element.
*/
class physvolidProcess: public SAXStateProcess
{
@@ -30,8 +32,6 @@
virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
{
- //std::cout << "physvolidProcess::StartElement: " << name << std::endl;
-
SAXObject** obj = Context()->GetTopObject();
physvolidElem* pvid = new physvolidElem;
@@ -45,7 +45,6 @@
virtual void EndElement(const std::string&)
{
- //std::cout << "physvolidProcess::EndElement: " << name << " " << std::endl;
}
virtual void Characters(const std::string&)
lcdd/src
diff -u -r1.2 -r1.3
--- projective_cylinderProcess.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ projective_cylinderProcess.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,4 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/projective_cylinderProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/projective_cylinderProcess.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/schema/projective_cylinder.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -7,13 +12,11 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "projective_cylinder.hh"
-
+// STL
#include <iostream>
/**
- @class projective_cylinderProcess
- @brief SAX process for projective_cylinder element.
+ * @brief SAX process for projective_cylinder element.
*/
class projective_cylinderProcess: public SAXStateProcess
{
lcdd/src
diff -u -r1.2 -r1.3
--- projective_zplaneProcess.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ projective_zplaneProcess.cc 26 Jun 2013 01:36:23 -0000 1.3
@@ -1,5 +1,6 @@
-// $Header: /cvs/lcd/lcdd/src/projective_zplaneProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/projective_zplaneProcess.cc,v 1.3 2013/06/26 01:36:23 jeremy Exp $
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -8,8 +9,10 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "projective_zplane.hh"
+// LCDD
+#include "lcdd/schema/projective_zplane.hh"
+// STL
#include <iostream>
/**
lcdd/src
diff -u -r1.9 -r1.10
--- regionProcess.cc 24 Jun 2013 22:10:37 -0000 1.9
+++ regionProcess.cc 26 Jun 2013 01:36:23 -0000 1.10
@@ -1,4 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/regionProcess.cc,v 1.9 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/regionProcess.cc,v 1.10 2013/06/26 01:36:23 jeremy Exp $
+
+// LCDD
+#include "lcdd/schema/region.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -7,12 +12,10 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "region.hh"
-
+// STL
#include <iostream>
/**
- * @class regionProcess
* @brief SAX process for region element.
*/
class regionProcess: public SAXStateProcess
lcdd/src
diff -u -r1.18 -r1.19
--- regionSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.18
+++ regionSubscriber.cc 26 Jun 2013 01:36:23 -0000 1.19
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/regionSubscriber.cc,v 1.18 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/regionSubscriber.cc,v 1.19 2013/06/26 01:36:23 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
@@ -6,13 +6,15 @@
#include "G4Processor/GDMLProcessor.h"
// LCDD
-#include "region.hh"
-#include "LCDDProcessor.hh"
+#include "lcdd/schema/region.hh"
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/geant4/G4UserRegionInformation.hh"
+#include "lcdd/schema/LimitSetType.hh"
+#include "lcdd/util/StringUtil.hh"
+
+// Geant4
#include "G4Region.hh"
-#include "G4UserRegionInformation.hh"
#include "G4ProductionCuts.hh"
-#include "LimitSetType.hh"
-#include "StringUtil.hh"
// std
#include <iostream>
lcdd/src
diff -u -r1.5 -r1.6
--- regionrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.5
+++ regionrefProcess.cc 26 Jun 2013 01:36:24 -0000 1.6
@@ -1,13 +1,14 @@
-// $Header: /cvs/lcd/lcdd/src/regionrefProcess.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/regionrefProcess.cc,v 1.6 2013/06/26 01:36:24 jeremy Exp $
+// GDML
#include "Processes/ReferenceTypeProcess.h"
-#include "RegionType.hh"
+// LCDD
+#include "lcdd/schema/RegionType.hh"
/**
- @class regionrefProcess
- @brief SAX process for regionref element.
- @note Extends ReferenceTypeProcess for reference to region element.
+ * @brief SAX process for regionref element.
+ * @note Extends ReferenceTypeProcess for reference to region element.
*/
class regionrefProcess: public ReferenceTypeProcess
{
lcdd/src
diff -u -r1.5 -r1.6
--- rz_field_mapProcess.cc 24 Jun 2013 22:10:37 -0000 1.5
+++ rz_field_mapProcess.cc 26 Jun 2013 01:36:24 -0000 1.6
@@ -1,11 +1,16 @@
-// $Header: /cvs/lcd/lcdd/src/rz_field_mapProcess.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
-#include "FieldMapTypeProcess.hh"
-#include "rz_field_map.hh"
-#include <iostream>
+// $Header: /cvs/lcd/lcdd/src/rz_field_mapProcess.cc,v 1.6 2013/06/26 01:36:24 jeremy Exp $
+
+// LCDD
+#include "lcdd/schema/FieldMapTypeProcess.hh"
+#include "lcdd/schema/rz_field_map.hh"
+
+// Geant4
#include "globals.hh"
+// STL
+#include <iostream>
+
/**
- * @class rz_field_map_Process
* @brief Processor for rz_field_map elements.
*/
class rz_field_mapProcess: public FieldMapTypeProcess
lcdd/src
diff -u -r1.8 -r1.9
--- rz_field_mapSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.8
+++ rz_field_mapSubscriber.cc 26 Jun 2013 01:36:24 -0000 1.9
@@ -1,14 +1,15 @@
-// $Header: /cvs/lcd/lcdd/src/rz_field_mapSubscriber.cc,v 1.8 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/rz_field_mapSubscriber.cc,v 1.9 2013/06/26 01:36:24 jeremy Exp $
+// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-
#include "G4Processor/GDMLProcessor.h"
-#include "LCDDProcessor.hh"
-#include "rz_field_map.hh"
-#include "rzb.hh"
-#include "G4RZFieldMap.hh"
+// LCDD
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/schema/rz_field_map.hh"
+#include "lcdd/schema/rzb.hh"
+#include "lcdd/bfield/G4RZFieldMap.hh"
/*
* @class rz_field_mapSubscriber
lcdd/src
diff -u -r1.3 -r1.4
--- rzbProcess.cc 24 Jun 2013 22:10:37 -0000 1.3
+++ rzbProcess.cc 26 Jun 2013 01:36:24 -0000 1.4
@@ -1,4 +1,6 @@
-// $Header: /cvs/lcd/lcdd/src/rzbProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/rzbProcess.cc,v 1.4 2013/06/26 01:36:24 jeremy Exp $
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -7,15 +9,15 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "rzb.hh"
+// LCDD
+#include "lcdd/schema/rzb.hh"
+// STL
#include <iostream>
/**
- * @class rzbProcess
* @brief Processor for rzB elements.
*/
-
class rzbProcess: public SAXStateProcess
{
lcdd/src
diff -u -r1.2 -r1.3
--- scorerProcess.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ scorerProcess.cc 26 Jun 2013 01:36:24 -0000 1.3
@@ -1,3 +1,6 @@
+// $Header: /cvs/lcd/lcdd/src/scorerProcess.cc,v 1.3 2013/06/26 01:36:24 jeremy Exp $
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -6,14 +9,15 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "scorer.hh"
-#include "SensitiveDetectorTypeProcess.hh"
+// LCDD
+#include "lcdd/schema/scorer.hh"
+#include "lcdd/schema/SensitiveDetectorTypeProcess.hh"
+// STL
#include <iostream>
/**
- @class scorerProcess
- @brief SAX process for scorer element.
+ * @brief SAX process for scorer element.
*/
class scorerProcess: public SensitiveDetectorTypeProcess
{
lcdd/src
diff -u -r1.3 -r1.4
--- scorerSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.3
+++ scorerSubscriber.cc 26 Jun 2013 01:36:24 -0000 1.4
@@ -1,18 +1,22 @@
+// $Header: /cvs/lcd/lcdd/src/scorerSubscriber.cc,v 1.4 2013/06/26 01:36:24 jeremy Exp $
+
+// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-#include "LCDDProcessor.hh"
-#include "scorer.hh"
-#include "G4SensitiveDetector.hh"
-#include "G4ScorerSD.hh"
-#include "SensitiveDetectorFactory.hh"
+// LCDD
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/schema/scorer.hh"
+#include "lcdd/detectors/G4SensitiveDetector.hh"
+#include "lcdd/detectors/G4ScorerSD.hh"
+#include "lcdd/detectors/SensitiveDetectorFactory.hh"
+// STL
#include <iostream>
/**
- @class scorerSubscriber
- @brief SAX subscriber for scorer element.
- @note Delegates to SensitiveDetectorFactory to create G4ScorerSD.
+ * @brief SAX subscriber for scorer element.
+ * @note Delegates to SensitiveDetectorFactory to create G4ScorerSD.
*/
class scorerSubscriber: virtual public SAXSubscriber
{
lcdd/src
diff -u -r1.6 -r1.7
--- sdrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.6
+++ sdrefProcess.cc 26 Jun 2013 01:36:24 -0000 1.7
@@ -1,8 +1,12 @@
-// $Header: /cvs/lcd/lcdd/src/sdrefProcess.cc,v 1.6 2013/06/24 22:10:37 jeremy Exp $
-#include "Processes/ReferenceTypeProcess.h"
+// $Header: /cvs/lcd/lcdd/src/sdrefProcess.cc,v 1.7 2013/06/26 01:36:24 jeremy Exp $
+
+// LCDD
+#include "lcdd/schema/SensitiveDetectorType.hh"
-#include "SensitiveDetectorType.hh"
+// GDML
+#include "Processes/ReferenceTypeProcess.h"
+// STL
#include <iostream>
/**
lcdd/src
diff -u -r1.5 -r1.6
--- solenoidProcess.cc 24 Jun 2013 22:10:37 -0000 1.5
+++ solenoidProcess.cc 26 Jun 2013 01:36:24 -0000 1.6
@@ -1,5 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/solenoidProcess.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/solenoidProcess.cc,v 1.6 2013/06/26 01:36:24 jeremy Exp $
+// LCDD
+#include "lcdd/schema/solenoid.hh"
+#include "lcdd/schema/FieldTypeProcess.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -8,15 +13,11 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "solenoid.hh"
-#include "FieldTypeProcess.hh"
-
+// STL
#include <iostream>
/**
- @class solenoidProcess
- @brief SAX process for solenoid element.
- @note Extends FieldTypeProcess.
+ * @brief SAX process for solenoid element.
*/
class solenoidProcess: public FieldTypeProcess
{
lcdd/src
diff -u -r1.8 -r1.9
--- solenoidSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.8
+++ solenoidSubscriber.cc 26 Jun 2013 01:36:24 -0000 1.9
@@ -1,24 +1,19 @@
-// $Header: /cvs/lcd/lcdd/src/solenoidSubscriber.cc,v 1.8 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/solenoidSubscriber.cc,v 1.9 2013/06/26 01:36:24 jeremy Exp $
+// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-
#include "G4Processor/GDMLProcessor.h"
#include "G4Evaluator/GDMLExpressionEvaluator.h"
// processor
-#include "LCDDProcessor.hh"
-
-// element
-#include "solenoid.hh"
-
-// Geant4
-#include "G4Solenoid.hh"
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/schema/solenoid.hh"
+#include "lcdd/bfield/G4Solenoid.hh"
/**
- @class solenoidSubscriber
- @brief SAX subscriber for solenoid element.
- @note Creates a G4Solenoid object and registers with LCDDProcessor.
+ * @brief SAX subscriber for solenoid element.
+ * @note Creates a G4Solenoid object and registers with LCDDProcessor.
*/
class solenoidSubscriber: virtual public SAXSubscriber
{
lcdd/src
diff -u -r1.7 -r1.8
--- trackerProcess.cc 24 Jun 2013 22:10:37 -0000 1.7
+++ trackerProcess.cc 26 Jun 2013 01:36:24 -0000 1.8
@@ -1,5 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/trackerProcess.cc,v 1.7 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/trackerProcess.cc,v 1.8 2013/06/26 01:36:24 jeremy Exp $
+// LCDD
+#include "lcdd/schema/tracker.hh"
+#include "lcdd/schema/SensitiveDetectorTypeProcess.hh"
+
+// GDML
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -8,9 +13,7 @@
#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
-#include "tracker.hh"
-#include "SensitiveDetectorTypeProcess.hh"
-
+// STL
#include <iostream>
/**
@@ -32,8 +35,6 @@
virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
{
- //std::cout << "PROCESS::START OF TAG : " << name << std::endl;
-
SAXObject** obj = Context()->GetTopObject();
tracker* trk = new tracker;
@@ -47,9 +48,6 @@
virtual void EndElement(const std::string&)
{
- //std::cout << "PROCESS::END OF TAG : " << name << " " << std::endl;
-
- //SensitiveDetectorTypeProcess::EndElement( name );
}
virtual void StackPopNotify(const std::string& name)
lcdd/src
diff -u -r1.9 -r1.10
--- trackerSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.9
+++ trackerSubscriber.cc 26 Jun 2013 01:36:24 -0000 1.10
@@ -1,12 +1,17 @@
+// $Header: /cvs/lcd/lcdd/src/trackerSubscriber.cc,v 1.10 2013/06/26 01:36:24 jeremy Exp $
+
+// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-#include "LCDDProcessor.hh"
-#include "tracker.hh"
-#include "G4SensitiveDetector.hh"
-#include "G4TrackerSD.hh"
-#include "SensitiveDetectorFactory.hh"
+// LCDD
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/schema/tracker.hh"
+#include "lcdd/detectors/G4SensitiveDetector.hh"
+#include "lcdd/detectors/G4TrackerSD.hh"
+#include "lcdd/detectors/SensitiveDetectorFactory.hh"
+// STL
#include <iostream>
/**
lcdd/src
diff -u -r1.2 -r1.3
--- unsegmented_calorimeterProcess.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ unsegmented_calorimeterProcess.cc 26 Jun 2013 01:36:24 -0000 1.3
@@ -1,23 +1,17 @@
-// $Header: /cvs/lcd/lcdd/src/unsegmented_calorimeterProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/unsegmented_calorimeterProcess.cc,v 1.3 2013/06/26 01:36:24 jeremy Exp $
-#include "calorimeterProcess.hh"
+// LCDD
+#include "lcdd/schema/calorimeterProcess.hh"
+#include "lcdd/schema/unsegmented_calorimeter.hh"
-#include "unsegmented_calorimeter.hh"
-
-//#include "Saxana/ProcessingConfigurator.h"
+// GDML
#include "Saxana/ProcessingContext.h"
-//#include "Saxana/SAXProcessor.h"
-//#include "Saxana/StateStack.h"
-//#include "Saxana/SAXProcessingState.h"
-//#include "Saxana/SAXStateProcess.h"
#include "Saxana/SAXComponentFactory.h"
#include <iostream>
/**
- @class unsegmented_calorimeterProcess
- @brief SAX process for unsegmented_calorimeter element.
- @note Calls SAX processor for SensitiveDetectorTypeProcess parent class.
+ * @brief SAX process for unsegmented_calorimeter element.@note Calls SAX processor for SensitiveDetectorTypeProcess parent class.
*/
class unsegmented_calorimeterProcess: public calorimeterProcess
{
lcdd/src
diff -u -r1.3 -r1.4
--- unsegmented_calorimeterSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.3
+++ unsegmented_calorimeterSubscriber.cc 26 Jun 2013 01:36:24 -0000 1.4
@@ -1,15 +1,15 @@
-// $Header: /cvs/lcd/lcdd/src/unsegmented_calorimeterSubscriber.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/unsegmented_calorimeterSubscriber.cc,v 1.4 2013/06/26 01:36:24 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-#include "SensitiveDetectorFactory.hh"
+// LCDD
+#include "lcdd/detectors/SensitiveDetectorFactory.hh"
/**
- @class calorimeterSubscriber
- @brief SAX subscriber for calorimeter element.
- @note Delegates to SensitiveDetectorFactory to create G4CalorimeterSD object.
+ * @brief SAX subscriber for calorimeter element.
+ * @note Delegates to SensitiveDetectorFactory to create G4CalorimeterSD object.
*/
class unsegmented_calorimeterSubscriber: virtual public SAXSubscriber
{
lcdd/src
diff -u -r1.2 -r1.3
--- visProcess.cc 24 Jun 2013 22:10:37 -0000 1.2
+++ visProcess.cc 26 Jun 2013 01:36:24 -0000 1.3
@@ -1,7 +1,7 @@
-// $Header: /cvs/lcd/lcdd/src/visProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/visProcess.cc,v 1.3 2013/06/26 01:36:24 jeremy Exp $
// LCDD
-#include "vis.hh"
+#include "lcdd/schema/vis.hh"
// GDML
#include "Saxana/ProcessingConfigurator.h"
@@ -16,8 +16,7 @@
#include <iostream>
/**
- @class visProcess
- @brief SAX process for vis element.
+ * @brief SAX process for vis element.
*/
class visProcess: public SAXStateProcess
{
lcdd/src
diff -u -r1.3 -r1.4
--- visSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.3
+++ visSubscriber.cc 26 Jun 2013 01:36:24 -0000 1.4
@@ -1,18 +1,18 @@
-// $Header: /cvs/lcd/lcdd/src/visSubscriber.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/visSubscriber.cc,v 1.4 2013/06/26 01:36:24 jeremy Exp $
+
+// LCDD
+#include "lcdd/core/LCDDProcessor.hh"
+#include "lcdd/schema/vis.hh"
+#include "lcdd/schema/color.hh"
+#include "lcdd/util/StringUtil.hh"
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
-// G4
+// Geant4
#include "G4VisAttributes.hh"
-// LCDD
-#include "LCDDProcessor.hh"
-#include "vis.hh"
-#include "color.hh"
-#include "StringUtil.hh"
-
/**
@class visSubscriber
@brief SAX subscriber for vis element.
lcdd/src
diff -u -r1.3 -r1.4
--- visrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.3
+++ visrefProcess.cc 26 Jun 2013 01:36:24 -0000 1.4
@@ -1,13 +1,14 @@
-// $Header: /cvs/lcd/lcdd/src/visrefProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/visrefProcess.cc,v 1.4 2013/06/26 01:36:24 jeremy Exp $
-#include "Processes/ReferenceTypeProcess.h"
+// LCDD
+#include "lcdd/schema/VisType.hh"
-#include "VisType.hh"
+// GDML
+#include "Processes/ReferenceTypeProcess.h"
/**
- @class visrefProcess
- @brief SAX process for visref element.
- @note Extends ReferenceTypeProcess for referencing mechanism to vis.
+ * @brief SAX process for visref element.
+ * @note Extends ReferenceTypeProcess for referencing the vis elements.
*/
class visrefProcess: public ReferenceTypeProcess
{
lcdd/src
diff -u -r1.8 -r1.9
--- volumeExtendedProcess.cc 24 Jun 2013 22:10:37 -0000 1.8
+++ volumeExtendedProcess.cc 26 Jun 2013 01:36:24 -0000 1.9
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/volumeExtendedProcess.cc,v 1.8 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/volumeExtendedProcess.cc,v 1.9 2013/06/26 01:36:24 jeremy Exp $
#ifndef VolumeExtendedProcess_hh
#define VolumeExtendedProcess_hh 1
@@ -13,11 +13,10 @@
#include "Schema/volume.h"
/**
- @class volumeExtendedProcess
- @brief SAX process for the volume element, as extended by LCDD.
- @note This is mostly a cut and paste job of volumeProcess,
- as this class does not appear to be extendable. It is
- only defined in a cpp file with no include guards!
+ * @brief SAX process for the volume element, as extended by LCDD.
+ * @note This is mostly a cut and paste job of GDML's volumeProcess class,
+ * as this class does not appear to be extendable. It is only defined in a cpp
+ * file with no include guards!
*/
class volumeExtendedProcess: public SAXStateProcess
{
@@ -39,7 +38,6 @@
// Analogical to SAX startElement callback
virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
{
- //std::cout << "VOLUME EXTENDED PROCESS::START OF TAG : " << name << std::endl;
SAXObject** obj = Context()->GetTopObject();
volume* vo = new volume;
@@ -52,7 +50,6 @@
virtual void EndElement(const std::string&)
{
- //std::cout << "PROCESS::END OF TAG : " << name << " " << std::endl;
}
virtual void Characters(const std::string&)
lcdd/src
diff -u -r1.31 -r1.32
--- volumeExtendedSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.31
+++ volumeExtendedSubscriber.cc 26 Jun 2013 01:36:24 -0000 1.32
@@ -1,11 +1,11 @@
-// $Header: /cvs/lcd/lcdd/src/volumeExtendedSubscriber.cc,v 1.31 2013/06/24 22:10:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/volumeExtendedSubscriber.cc,v 1.32 2013/06/26 01:36:24 jeremy Exp $
-#include "volumeExtendedSubscriber.hh"
+// LCDD
+#include "lcdd/subscribers/volumeExtendedSubscriber.hh"
/**
- @class volumeExtendedSubscriber
- @brief SAX subscriber to handle extra LCDD tags on volume element.
- @note This is the major subscriber extension class for the LCDD package.
+ * @brief SAX subscriber to handle extra LCDD tags on volume element.
+ * @note This is the major subscriber extension class for the LCDD package.
*/
const SAXComponentObject* volumeExtendedSubscriber::Build() const
{
CVSspam 0.2.12