Commit in `projects/lcdd/trunk/include/lcdd` on MAIN
`bfield/BoxDipole.hh`	+2	-2	3207 -> 3208
`/Cartesian3DMagneticFieldMap.hh`	+2	-4	3207 -> 3208
`/Dipole.hh`	+2	-4	3207 -> 3208
`/FieldManager.hh`	+2	-3	3207 -> 3208
`/MagneticFieldOverlay.hh`	+2	-3	3207 -> 3208
`/RZBData.hh`	+2	-4	3207 -> 3208
`/RZFieldMap.hh`	+2	-4	3207 -> 3208
`/Solenoid.hh`	+2	-4	3207 -> 3208
`core/GeometryManager.hh`	+2	-4	3207 -> 3208
`/LCDDDetectorConstruction.hh`	+2	-3	3207 -> 3208
`/LCDDMessenger.hh`	+2	-4	3207 -> 3208
`/LCDDObjectStoreInspector.hh`	+2	-3	3207 -> 3208
`/LCDDParser.hh`	+2	-4	3207 -> 3208
`/LCDDProcessor.hh`	+3	-4	3207 -> 3208
`detectors/BasicTrackerHitProcessor.hh`	+2	-4	3207 -> 3208
`/CalorimeterHitProcessor.hh`	+2	-4	3207 -> 3208
`/CalorimeterSD.hh`	+2	-4	3207 -> 3208
`/Cerenkov.hh`	+2	-4	3207 -> 3208
`/CurrentTrackState.hh`	+1	-9	3207 -> 3208
`/HitComparator.hh`	+2	-3	3207 -> 3208
`/HitProcessor.hh`	+2	-4	3207 -> 3208
`/HitProcessorFactory.hh`	+2	-4	3207 -> 3208
`/HitProcessorManager.hh`	+2	-4	3207 -> 3208
`/LegacyCalorimeterHitProcessor.hh`	+2	-4	3207 -> 3208
`/OpticalCalorimeterHitProcessor.hh`	+2	-2	3207 -> 3208
`/PositionComparator.hh`	+2	-3	3207 -> 3208
`/ReadoutUtil.hh`	+2	-4	3207 -> 3208
`/ScoringTrackerHitProcessor.hh`	+2	-4	3207 -> 3208
`/SensitiveDetector.hh`	+2	-4	3207 -> 3208
`/SensitiveDetectorFactory.hh`	+2	-4	3207 -> 3208
`/SensitiveDetectorMessenger.hh`	+2	-4	3207 -> 3208
`/StepCombiningTrackerHitProcessor.hh`	+2	-4	3207 -> 3208
`/StepReadout.hh`	+2	-4	3207 -> 3208
`/TrackerHitProcessor.hh`	+2	-4	3207 -> 3208
`/TrackerSD.hh`	+2	-4	3207 -> 3208
`/UnsegmentedCalorimeterHitProcessor.hh`	+3	-4	3207 -> 3208
`geant4/LCDDHeaderRecord.hh`	+2	-4	3207 -> 3208
`/PhysVolId.hh`	+2	-4	3207 -> 3208
`/PhysVolIdMap.hh`	+2	-4	3207 -> 3208
`/PhysicsLimitSet.hh`	+2	-4	3207 -> 3208
`/UserRegionInformation.hh`	+2	-4	3207 -> 3208
`/VUserTrackInformation.hh`	+1	-15	3207 -> 3208
`hits/CalorimeterHit.hh`	+2	-4	3207 -> 3208
`/CalorimeterHitMap.hh`	+2	-2	3207 -> 3208
`/HitContribution.hh`	+2	-3	3207 -> 3208
`/TrackerHit.hh`	+2	-4	3207 -> 3208
`id/Id64bit.hh`	+2	-3	3207 -> 3208
`/IdComparator.hh`	+3	-3	3207 -> 3208
`/IdFactory.hh`	+4	-18	3207 -> 3208
`/IdField.hh`	+2	-4	3207 -> 3208
`/IdManager.hh`	+2	-4	3207 -> 3208
`/IdSpec.hh`	+2	-4	3207 -> 3208
`/IdVec.hh`	+2	-3	3207 -> 3208
`processes/FieldMapTypeProcess.hh`	+2	-4	3207 -> 3208
`/FieldTypeProcess.hh`	+2	-4	3207 -> 3208
`/SensitiveDetectorTypeProcess.hh`	+2	-4	3207 -> 3208
`/calorimeterProcess.hh`	+2	-3	3207 -> 3208
`/hit_processorProcess.hh`	+2	-4	3207 -> 3208
`/hits_collectionProcess.hh`	+2	-4	3207 -> 3208
`schema/AuthorType.hh`	+2	-4	3207 -> 3208
`/BoxDipoleType.hh`	+2	-4	3207 -> 3208
`/CalorimeterType.hh`	+2	-4	3207 -> 3208
`/CellReadout2DSegmentationType.hh`	+2	-4	3207 -> 3208
`/ColorType.hh`	+2	-4	3207 -> 3208
`/CommentType.hh`	+2	-4	3207 -> 3208
`/DetectorType.hh`	+2	-4	3207 -> 3208
`/DipoleCoeffType.hh`	+2	-3	3207 -> 3208
`/DipoleType.hh`	+2	-4	3207 -> 3208
`/FieldMap3DType.hh`	+2	-3	3207 -> 3208
`/FieldMapType.hh`	+2	-3	3207 -> 3208
`/FieldType.hh`	+2	-3	3207 -> 3208
`/GeneratorType.hh`	+2	-4	3207 -> 3208
`/GlobalFieldType.hh`	+2	-4	3207 -> 3208
`/GlobalGridXYSegmentationType.hh`	+3	-5	3207 -> 3208
`/HeaderType.hh`	+2	-4	3207 -> 3208
`/HitProcessorType.hh`	+2	-4	3207 -> 3208
`/HitsCollectionType.hh`	+2	-4	3207 -> 3208
`/IdFieldType.hh`	+2	-4	3207 -> 3208
`/IdSpecType.hh`	+2	-4	3207 -> 3208
`/LimitParamType.hh`	+2	-3	3207 -> 3208
`/LimitSetType.hh`	+2	-3	3207 -> 3208
`/LimitType.hh`	+2	-3	3207 -> 3208
`/NonprojectiveCylinderSegmentationType.hh`	+2	-4	3207 -> 3208
`/NonprojectiveSegmentationType.hh`	+2	-4	3207 -> 3208
`/PhysVolIdType.hh`	+2	-4	3207 -> 3208
`/ProjectiveCylinderSegmentationType.hh`	+2	-4	3207 -> 3208
`/ProjectiveZPlaneSegmentationType.hh`	+2	-4	3207 -> 3208
`/RZBType.hh`	+2	-3	3207 -> 3208
`/RZFieldMapType.hh`	+2	-3	3207 -> 3208
`/RegionType.hh`	+2	-4	3207 -> 3208
`/SegmentationType.hh`	+2	-4	3207 -> 3208
`/SensitiveDetectorType.hh`	+2	-4	3207 -> 3208
`/SolenoidType.hh`	+2	-4	3207 -> 3208
`/TrackerType.hh`	+2	-4	3207 -> 3208
`/VisType.hh`	+2	-4	3207 -> 3208
`/author.hh`	+2	-4	3207 -> 3208
`/box_dipole.hh`	+2	-4	3207 -> 3208
`/calorimeter.hh`	+2	-3	3207 -> 3208
`/cell_readout_2d.hh`	+2	-4	3207 -> 3208
`/color.hh`	+2	-4	3207 -> 3208
`/comment.hh`	+2	-4	3207 -> 3208
`/detector.hh`	+2	-4	3207 -> 3208
`/dipole.hh`	+2	-3	3207 -> 3208
`/dipole_coeff.hh`	+2	-3	3207 -> 3208
`/field.hh`	+2	-4	3207 -> 3208
`/field_map_3d.hh`	+2	-3	3207 -> 3208
`/generator.hh`	+2	-4	3207 -> 3208
`/global_field.hh`	+2	-4	3207 -> 3208
`/global_grid_xy.hh`	+2	-3	3207 -> 3208
`/grid_xyz.hh`	+2	-4	3207 -> 3208
`/header.hh`	+2	-4	3207 -> 3208
`/hit_processor.hh`	+2	-4	3207 -> 3208
`/hits_collection.hh`	+2	-4	3207 -> 3208
`/idfieldElem.hh`	+2	-3	3207 -> 3208
`/idspecElem.hh`	+2	-3	3207 -> 3208
`/limit.hh`	+2	-3	3207 -> 3208
`/limitset.hh`	+2	-3	3207 -> 3208
`/nonprojective_cylinder.hh`	+2	-4	3207 -> 3208
`/physvolidElem.hh`	+2	-3	3207 -> 3208
`/projective_cylinder.hh`	+2	-4	3207 -> 3208
`/projective_zplane.hh`	+2	-4	3207 -> 3208
`/region.hh`	+2	-4	3207 -> 3208
`/rz_field_map.hh`	+2	-4	3207 -> 3208
`/rzb.hh`	+2	-3	3207 -> 3208
`/sensitive_detector.hh`	+2	-4	3207 -> 3208
`/solenoid.hh`	+2	-4	3207 -> 3208
`/tracker.hh`	+2	-4	3207 -> 3208
`/vis.hh`	+2	-4	3207 -> 3208
`segmentation/CellReadout.hh`	+2	-4	3207 -> 3208
`/CellReadout2D.hh`	+2	-4	3207 -> 3208
`/CellReadout2DSegmentation.hh`	+2	-2	3207 -> 3208
`/GlobalGridXYSegmentation.hh`	+2	-4	3207 -> 3208
`/GridXYZSegmentation.hh`	+2	-3	3207 -> 3208
`/NonprojectiveCylinderSegmentation.hh`	+2	-3	3207 -> 3208
`/ProjectiveCylinderSegmentation.hh`	+2	-3	3207 -> 3208
`/ProjectiveSegmentation.hh`	+2	-3	3207 -> 3208
`/ProjectiveZPlaneSegmentation.hh`	+2	-3	3207 -> 3208
`/Segmentation.hh`	+2	-4	3207 -> 3208
`/SegmentationFactory.hh`	+2	-4	3207 -> 3208
`subscribers/volumeExtendedSubscriber.hh`	+2	-4	3207 -> 3208
`util/GDMLWriter.hh`	+2	-3	3207 -> 3208
`/GDMLWriterMessenger.hh`	+2	-4	3207 -> 3208
`/NistElementsDump.hh`	+2	-4	3207 -> 3208
`/StoreInspector.hh`	+2	-4	3207 -> 3208
`/StringUtil.hh`	+2	-4	3207 -> 3208
`/TimerUtil.hh`	+3	-5	3207 -> 3208
`/Verbose.hh`	+2	-2	3207 -> 3208
	+299	-573

147 modified files

Normalize header include guards and other miscellaneous cleanup for release.

projects/lcdd/trunk/include/lcdd/bfield

BoxDipole.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/bfield/BoxDipole.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/bfield/BoxDipole.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,5 +1,5 @@

-#ifndef LCDD_BFIELD_BOXDIPOLE_HH
-#define LCDD_BFIELD_BOXDIPOLE_HH 1

+#ifndef LCDD_BFIELD_BOXDIPOLE_HH_
+#define LCDD_BFIELD_BOXDIPOLE_HH_ 1

 
 // Geant4
 #include "G4MagneticField.hh"

projects/lcdd/trunk/include/lcdd/bfield

Cartesian3DMagneticFieldMap.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/bfield/Cartesian3DMagneticFieldMap.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/bfield/Cartesian3DMagneticFieldMap.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/bfield/Cartesian3DMagneticFieldMap.hh,v 1.8 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_BFIELD_CARTESIAN3DMAGNETICFIELDMAP_HH_
+#define LCDD_BFIELD_CARTESIAN3DMAGNETICFIELDMAP_HH_ 1

-#ifndef LCDD_BFIELD_CARTESIAN3DMAGNETICFIELDMAP_HH
-#define LCDD_BFIELD_CARTESIAN3DMAGNETICFIELDMAP_HH 1
-

 // Geant4
 #include "G4MagneticField.hh"

projects/lcdd/trunk/include/lcdd/bfield

Dipole.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/bfield/Dipole.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/bfield/Dipole.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/bfield/Dipole.hh,v 1.7 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_BFIELD_DIPOLE_HH_
+#define LCDD_BFIELD_DIPOLE_HH_ 1

-#ifndef LCDD_BFIELD_DIPOLE_HH
-#define LCDD_BFIELD_DIPOLE_HH 1
-

 // Geant4
 #include "G4MagneticField.hh"

projects/lcdd/trunk/include/lcdd/bfield

FieldManager.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/bfield/FieldManager.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/bfield/FieldManager.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/bfield/FieldManager.hh,v 1.7 2013-11-14 00:47:19 jeremy Exp $
-#ifndef LCDD_BFIELD_FIELDMANAGER_HH
-#define LCDD_BFIELD_FIELDMANAGER_HH 1

+#ifndef LCDD_BFIELD_FIELDMANAGER_HH_
+#define LCDD_BFIELD_FIELDMANAGER_HH_ 1

 
 // LCDD
 #include "lcdd/bfield/MagneticFieldOverlay.hh"

projects/lcdd/trunk/include/lcdd/bfield

MagneticFieldOverlay.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/bfield/MagneticFieldOverlay.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/bfield/MagneticFieldOverlay.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/bfield/MagneticFieldOverlay.hh,v 1.8 2013-11-14 00:47:19 jeremy Exp $
-#ifndef LCDD_BFIELD_MAGNETICFIELDOVERLAY_HH
-#define LCDD_BFIELD_MAGNETICFIELDOVERLAY_HH 1

+#ifndef LCDD_BFIELD_MAGNETICFIELDOVERLAY_HH_
+#define LCDD_BFIELD_MAGNETICFIELDOVERLAY_HH_ 1

 
 // Geant4
 #include "G4MagneticField.hh"

projects/lcdd/trunk/include/lcdd/bfield

RZBData.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/bfield/RZBData.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/bfield/RZBData.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/bfield/RZBData.hh,v 1.8 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_BFIELD_RZBDATA_HH_
+#define LCDD_BFIELD_RZBDATA_HH_ 1

-#ifndef LCDD_BFIELD_RZBDATA_HH
-#define LCDD_BFIELD_RZBDATA_HH 1
-

 /**
  * @brief A single data row for the RZFieldMap.
  * @note Defines radius, z dimension, radial B-field component, and z B-field component.

projects/lcdd/trunk/include/lcdd/bfield

RZFieldMap.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/bfield/RZFieldMap.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/bfield/RZFieldMap.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/bfield/RZFieldMap.hh,v 1.5 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_BFIELD_RZFIELDMAP_HH_
+#define LCDD_BFIELD_RZFIELDMAP_HH_ 1

-#ifndef LCDD_BFIELD_RZFIELDMAP_HH
-#define LCDD_BFIELD_RZFIELDMAP_HH 1
-

 // Geant4
 #include "G4MagneticField.hh"

projects/lcdd/trunk/include/lcdd/bfield

Solenoid.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/bfield/Solenoid.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/bfield/Solenoid.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/bfield/Solenoid.hh,v 1.6 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_BFIELD_SOLENOID_HH_
+#define LCDD_BFIELD_SOLENOID_HH_ 1

-#ifndef LCDD_BFIELD_SOLENOID_HH
-#define LCDD_BFIELD_SOLENOID_HH 1
-

 // Geant4
 #include "G4MagneticField.hh"

projects/lcdd/trunk/include/lcdd/core

GeometryManager.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/core/GeometryManager.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/core/GeometryManager.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/core/GeometryManager.hh,v 1.6 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_CORE_GEOMETRYMANAGER_HH_
+#define LCDD_CORE_GEOMETRYMANAGER_HH_ 1

-#ifndef LCDD_GEOMETRYMANAGER_HH
-#define LCDD_GEOMETRYMANAGER_HH 1
-

 class G4Run;
 class G4LogicalVolume;
 class G4VPhysicalVolume;

projects/lcdd/trunk/include/lcdd/core

LCDDDetectorConstruction.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/core/LCDDDetectorConstruction.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/core/LCDDDetectorConstruction.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/core/LCDDDetectorConstruction.hh,v 1.6 2013-11-14 00:47:19 jeremy Exp $
-#ifndef LCDD_CORE_LCDDDETECTORCONSTRUCTION_HH
-#define LCDD_CORE_LCDDDETECTORCONSTRUCTION_HH 1

+#ifndef LCDD_CORE_LCDDDETECTORCONSTRUCTION_HH_
+#define LCDD_CORE_LCDDDETECTORCONSTRUCTION_HH_ 1

 
 // Geant4
 #include "G4VUserDetectorConstruction.hh"

projects/lcdd/trunk/include/lcdd/core

LCDDMessenger.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/core/LCDDMessenger.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/core/LCDDMessenger.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/core/LCDDMessenger.hh,v 1.7 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_CORE_LCDDMESSENGER_HH_
+#define LCDD_CORE_LCDDMESSENGER_HH_ 1

-#ifndef LCDD_CORE_LCDDMESSENGER_HH
-#define LCDD_CORE_LCDDMESSENGER_HH 1
-

 #include "G4UImessenger.hh"
 
 class G4UIcommand;

projects/lcdd/trunk/include/lcdd/core

LCDDObjectStoreInspector.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/core/LCDDObjectStoreInspector.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/core/LCDDObjectStoreInspector.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Id: LCDDObjectStoreInspector.hh,v 1.8 2013-11-14 00:47:19 jeremy Exp $
-#ifndef LCDD_CORE_LCDDOBJECTSTOREINSPECTOR_HH
-#define LCDD_CORE_LCDDOBJECTSTOREINSPECTOR_HH 1

+#ifndef LCDD_CORE_LCDDOBJECTSTOREINSPECTOR_HH_
+#define LCDD_CORE_LCDDOBJECTSTOREINSPECTOR_HH_ 1

 
 // LCDD
 #include "lcdd/util/StoreInspector.hh"

projects/lcdd/trunk/include/lcdd/core

LCDDParser.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/core/LCDDParser.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/core/LCDDParser.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/core/LCDDParser.hh,v 1.9 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_CORE_LCDDPARSER_HH_
+#define LCDD_CORE_LCDDPARSER_HH_ 1

-#ifndef LCDD_CORE_LCDDPARSER_HH
-#define LCDD_CORE_LCDDPARSER_HH 1
-

 // GDML
 #include "Saxana/SAXProcessor.h"
 #include "Saxana/ProcessingConfigurator.h"

projects/lcdd/trunk/include/lcdd/core

LCDDProcessor.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/core/LCDDProcessor.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/core/LCDDProcessor.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/core/LCDDProcessor.hh,v 1.7 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_CORE_LCDDPROCESSOR_HH_
+#define LCDD_CORE_LCDDPROCESSOR_HH_ 1

-#ifndef LCDD_CORE_LCDDPROCESSOR_HH
-#define LCDD_CORE_LCDDPROCESSOR_HH 1
-

 // Geant4
 #include "G4MagneticField.hh"
 #include "G4Region.hh"

@@ -13,6 +11,7 @@

 #include "lcdd/geant4/PhysicsLimitSet.hh"
 #include "lcdd/geant4/LCDDHeaderRecord.hh"

+// STL

 #include <string>
 #include <map>

projects/lcdd/trunk/include/lcdd/detectors

BasicTrackerHitProcessor.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/BasicTrackerHitProcessor.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/BasicTrackerHitProcessor.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/BasicTrackerHitProcessor.hh,v 1.3 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_BASICTRACKERHITPROCESSOR_HH_
+#define LCDD_DETECTORS_BASICTRACKERHITPROCESSOR_HH_ 1

-#ifndef LCDD_DETECTORS_BASICTRACKERHITPROCESSOR_HH
-#define LCDD_DETECTORS_BASICTRACKERHITPROCESSOR_HH 1
-

 // LCDD
 #include "lcdd/detectors/TrackerHitProcessor.hh"
 #include "lcdd/detectors/HitProcessorFactory.hh"

projects/lcdd/trunk/include/lcdd/detectors

CalorimeterHitProcessor.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/CalorimeterHitProcessor.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/CalorimeterHitProcessor.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/CalorimeterHitProcessor.hh,v 1.12 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_CALORIMETERHITPROCESSOR_HH_
+#define LCDD_DETECTORS_CALORIMETERHITPROCESSOR_HH_ 1

-#ifndef LCDD_DETECTORS_CALORIMETERHITPROCESSOR_HH
-#define LCDD_DETECTORS_CALORIMETERHITPROCESSOR_HH 1
-

 // Geant4
 #include "G4Step.hh"

projects/lcdd/trunk/include/lcdd/detectors

CalorimeterSD.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/CalorimeterSD.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/CalorimeterSD.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/CalorimeterSD.hh,v 1.12 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_CALORIMETERSD_HH_
+#define LCDD_DETECTORS_CALORIMETERSD_HH_ 1

-#ifndef LCDD_DETECTORS_CALORIMETERSD_HH
-#define LCDD_DETECTORS_CALORIMETERSD_HH 1
-

 // Geant4
 #include "lcdd/detectors/SensitiveDetector.hh"
 #include "lcdd/detectors/HitComparator.hh"

projects/lcdd/trunk/include/lcdd/detectors

Cerenkov.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/Cerenkov.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/Cerenkov.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/Cerenkov.hh,v 1.6 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_CERENKOV_HH_
+#define LCDD_DETECTORS_CERENKOV_HH_ 1

-#ifndef LCDD_DETECTORS_CERENKOV_HH
-#define LCDD_DETECTORS_CERENKOV_HH 1
-

 // Geant4
 #include "G4PhysicsOrderedFreeVector.hh"
 #include "G4Material.hh"

projects/lcdd/trunk/include/lcdd/detectors

CurrentTrackState.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/CurrentTrackState.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/CurrentTrackState.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,10 +1,3 @@

-/*
- * CurrentTrackState.hh
- *
- *  Created on: Jun 24, 2014
- *      Author: jeremym
- */
-

 #ifndef LCDD_DETECTORS_CURRENTTRACKSTATE_HH_
 #define LCDD_DETECTORS_CURRENTTRACKSTATE_HH_ 1

@@ -21,7 +14,6 @@

 public:
 
 	static void setCurrentTrackID(G4int trackID) {

-		//G4cout << "setCurrentTrackID - " << trackID << G4endl;

 		_currentTrackID = trackID;
 	}

@@ -43,4 +35,4 @@

 	static G4int _currentPrimaryID;
 };

-#endif /* CURRENTTRACKSTATE_HH_ */

+#endif

projects/lcdd/trunk/include/lcdd/detectors

HitComparator.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/HitComparator.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/HitComparator.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/HitComparator.hh,v 1.7 2013-11-14 00:47:19 jeremy Exp $
-#ifndef LCDD_DETECTORS_HITCOMPARATOR_HH
-#define LCDD_DETECTORS_HITCOMPARATOR_HH 1

+#ifndef LCDD_DETECTORS_HITCOMPARATOR_HH_
+#define LCDD_DETECTORS_HITCOMPARATOR_HH_ 1

 
 // LCDD
 #include "lcdd/hits/CalorimeterHit.hh"

projects/lcdd/trunk/include/lcdd/detectors

HitProcessor.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/HitProcessor.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/HitProcessor.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/HitProcessor.hh,v 1.4 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_HITPROCESSOR_HH_
+#define LCDD_DETECTORS_HITPROCESSOR_HH_ 1

-#ifndef LCDD_DETECTORS_HITPROCESSOR_HH
-#define LCDD_DETECTORS_HITPROCESSOR_HH 1
-

 // Geant4
 #include "G4Step.hh"

projects/lcdd/trunk/include/lcdd/detectors

HitProcessorFactory.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/HitProcessorFactory.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/HitProcessorFactory.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/HitProcessorFactory.hh,v 1.3 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_HITPROCESSORFACTORY_HH_
+#define LCDD_DETECTORS_HITPROCESSORFACTORY_HH_

-#ifndef LCDD_DETECTORS_HITPROCESSORFACTORY_HH
-#define LCDD_DETECTORS_HITPROCESSORFACTORY_HH
-

 // LCDD
 #include "lcdd/detectors/HitProcessor.hh"
 #include "lcdd/detectors/SensitiveDetector.hh"

projects/lcdd/trunk/include/lcdd/detectors

HitProcessorManager.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/HitProcessorManager.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/HitProcessorManager.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/HitProcessorManager.hh,v 1.3 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_HITPROCESSORMANAGER_HH_
+#define LCDD_DETECTORS_HITPROCESSORMANAGER_HH_ 1

-#ifndef LCDD_DETECTORS_HITPROCESSORMANAGER_HH
-#define LCDD_DETECTORS_HITPROCESSORMANAGER_HH 1
-

 // LCDD
 #include "lcdd/detectors/HitProcessorFactory.hh"

projects/lcdd/trunk/include/lcdd/detectors

LegacyCalorimeterHitProcessor.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/LegacyCalorimeterHitProcessor.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/LegacyCalorimeterHitProcessor.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/LegacyCalorimeterHitProcessor.hh,v 1.4 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_LEGACYCALORIMETERHITPROCESSOR_HH_
+#define LCDD_DETECTORS_LEGACYCALORIMETERHITPROCESSOR_HH_ 1

-#ifndef LCDD_DETECTORS_LEGACYCALORIMETERHITPROCESSOR_HH
-#define LCDD_DETECTORS_LEGACYCALORIMETERHITPROCESSOR_HH 1
-

 // LCDD
 #include "lcdd/detectors/CalorimeterHitProcessor.hh"
 #include "lcdd/detectors/CalorimeterSD.hh"

projects/lcdd/trunk/include/lcdd/detectors

OpticalCalorimeterHitProcessor.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/OpticalCalorimeterHitProcessor.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/OpticalCalorimeterHitProcessor.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,7 +1,7 @@

 // $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/OpticalCalorimeterHitProcessor.hh,v 1.3 2013-11-14 00:46:45 jeremy Exp $

-#ifndef LCDD_DETECTORS_OPTICALCALORIMETERHITPROCESSOR_HH
-#define LCDD_DETECTORS_OPTICALCALORIMETERHITPROCESSOR_HH 1

+#ifndef LCDD_DETECTORS_OPTICALCALORIMETERHITPROCESSOR_HH_
+#define LCDD_DETECTORS_OPTICALCALORIMETERHITPROCESSOR_HH_ 1

 
 // LCDD
 #include "lcdd/detectors/LegacyCalorimeterHitProcessor.hh"

projects/lcdd/trunk/include/lcdd/detectors

PositionComparator.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/PositionComparator.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/PositionComparator.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/PositionComparator.hh,v 1.7 2013-11-14 00:47:19 jeremy Exp $
-#ifndef LCDD_DETECTORS_POSITIONCOMPARATOR_HH
-#define LCDD_DETECTORS_POSITIONCOMPARATOR_HH 1

+#ifndef LCDD_DETECTORS_POSITIONCOMPARATOR_HH_
+#define LCDD_DETECTORS_POSITIONCOMPARATOR_HH_ 1

 
 // LCDD
 #include "HitComparator.hh"

projects/lcdd/trunk/include/lcdd/detectors

ReadoutUtil.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/ReadoutUtil.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/ReadoutUtil.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/ReadoutUtil.hh,v 1.5 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_READOUTUTIL_HH_
+#define LCDD_DETECTORS_READOUTUTIL_HH_ 1

-#ifndef LCDD_DETECTORS_READOUTUTIL_HH
-#define LCDD_DETECTORS_READOUTUTIL_HH 1
-

 // LCDD
 #include "lcdd/core/LCDDProcessor.hh"

projects/lcdd/trunk/include/lcdd/detectors

ScoringTrackerHitProcessor.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/ScoringTrackerHitProcessor.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/ScoringTrackerHitProcessor.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/ScoringTrackerHitProcessor.hh,v 1.3 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_SCORINGTRACKERHITPROCESSOR_HH_
+#define LCDD_DETECTORS_SCORINGTRACKERHITPROCESSOR_HH_ 1

-#ifndef LCDD_DETECTORS_SCORINGTRACKERHITPROCESSOR_HH
-#define LCDD_DETECTORS_SCORINGTRACKERHITPROCESSOR_HH 1
-

 // LCDD
 #include "lcdd/detectors/TrackerHitProcessor.hh"
 #include "lcdd/detectors/HitProcessorFactory.hh"

projects/lcdd/trunk/include/lcdd/detectors

SensitiveDetector.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/SensitiveDetector.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/SensitiveDetector.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/SensitiveDetector.hh,v 1.9 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_SENSITIVEDETECTOR_HH_
+#define LCDD_DETECTORS_SENSITIVEDETECTOR_HH_ 1

-#ifndef LCDD_DETECTORS_SENSITIVEDETECTOR_HH
-#define LCDD_DETECTORS_SENSITIVEDETECTOR_HH 1
-

 // Geant4
 #include "G4VSensitiveDetector.hh"
 #include "G4THitsCollection.hh"

projects/lcdd/trunk/include/lcdd/detectors

SensitiveDetectorFactory.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/SensitiveDetectorFactory.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/SensitiveDetectorFactory.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/SensitiveDetectorFactory.hh,v 1.7 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_SENSITIVEDETECTORFACTORY_HH_
+#define LCDD_DETECTORS_SENSITIVEDETECTORFACTORY_HH_ 1

-#ifndef LCDD_DETECTORS_SENSITIVEDETECTORFACTORY_HH
-#define LCDD_DETECTORS_SENSITIVEDETECTORFACTORY_HH 1
-

 // LCDD
 #include "lcdd/core/LCDDProcessor.hh"
 #include "lcdd/schema/SensitiveDetectorType.hh"

projects/lcdd/trunk/include/lcdd/detectors

SensitiveDetectorMessenger.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/SensitiveDetectorMessenger.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/SensitiveDetectorMessenger.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/SensitiveDetectorMessenger.hh,v 1.7 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_SENSITIVEDETECTORMESSENGER_HH_
+#define LCDD_DETECTORS_SENSITIVEDETECTORMESSENGER_HH_ 1

-#ifndef LCDD_DETECTORS_SENSITIVEDETECTORMESSENGER_HH
-#define LCDD_DETECTORS_SENSITIVEDETECTORMESSENGER_HH 1
-

 // Geant4
 #include "G4UImessenger.hh"

projects/lcdd/trunk/include/lcdd/detectors

StepCombiningTrackerHitProcessor.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/StepCombiningTrackerHitProcessor.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/StepCombiningTrackerHitProcessor.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/StepCombiningTrackerHitProcessor.hh,v 1.3 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_STEPCOMBININGTRACKERHITPROCESSOR_HH_
+#define LCDD_DETECTORS_STEPCOMBININGTRACKERHITPROCESSOR_HH_ 1

-#ifndef LCDD_DETECTORS_STEPCOMBININGTRACKERHITPROCESSOR_HH
-#define LCDD_DETECTORS_STEPCOMBININGTRACKERHITPROCESSOR_HH 1
-

 // LCDD
 #include "lcdd/detectors/TrackerHitProcessor.hh"
 #include "lcdd/detectors/HitProcessorFactory.hh"

projects/lcdd/trunk/include/lcdd/detectors

StepReadout.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/StepReadout.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/StepReadout.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/StepReadout.hh,v 1.5 2013-11-14 00:47:19 jeremy Exp $

+#ifndef LCDD_DETECTORS_STEPREADOUT_HH_
+#define LCDD_DETECTORS_STEPREADOUT_HH_ 1

-#ifndef LCDD_DETECTORS_STEPREADOUT_HH
-#define LCDD_DETECTORS_STEPREADOUT_HH 1
-

 // Geant4
 #include "G4ThreeVector.hh"
 #include "G4TouchableHandle.hh"

projects/lcdd/trunk/include/lcdd/detectors

TrackerHitProcessor.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/TrackerHitProcessor.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/TrackerHitProcessor.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/TrackerHitProcessor.hh,v 1.3 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_DETECTORS_TRACKERHITPROCESSOR_HH_
+#define LCDD_DETECTORS_TRACKERHITPROCESSOR_HH_ 1

-#ifndef LCDD_DETECTORS_TRACKERHITPROCESSOR_HH
-#define LCDD_DETECTORS_TRACKERHITPROCESSOR_HH 1
-

 #include "lcdd/detectors/TrackerSD.hh"
 
 /**

projects/lcdd/trunk/include/lcdd/detectors

TrackerSD.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/TrackerSD.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/TrackerSD.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/TrackerSD.hh,v 1.8 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_DETECTORS_TRACKERSD_HH_
+#define LCDD_DETECTORS_TRACKERSD_HH_ 1

-#ifndef LCDD_DETECTORS_TRACKERSD_HH
-#define LCDD_DETECTORS_TRACKERSD_HH 1
-

 // LCDD
 #include "lcdd/detectors/SensitiveDetector.hh"
 #include "lcdd/hits/TrackerHit.hh"

projects/lcdd/trunk/include/lcdd/detectors

UnsegmentedCalorimeterHitProcessor.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/detectors/UnsegmentedCalorimeterHitProcessor.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/detectors/UnsegmentedCalorimeterHitProcessor.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,13 +1,12 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/detectors/UnsegmentedCalorimeterHitProcessor.hh,v 1.3 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_DETECTORS_UNSEGMENTEDCALORIMETERHITPROCESSOR_HH_
+#define LCDD_DETECTORS_UNSEGMENTEDCALORIMETERHITPROCESSOR_HH_ 1

-#ifndef LCDD_DETECTORS_UNSEGMENTEDCALORIMETERHITPROCESSOR_HH
-#define LCDD_DETECTORS_UNSEGMENTEDCALORIMETERHITPROCESSOR_HH 1
-

 // LCDD
 #include "lcdd/detectors/CalorimeterHitProcessor.hh"
 #include "lcdd/detectors/HitProcessorFactory.hh"
 
 /**

+ * @class UnsegmentedCalorimeterHitProcessor

  * HitProcessor that produces CalorimeterHit objects with no virtual geometry segmentation.
  */
 class UnsegmentedCalorimeterHitProcessor: public CalorimeterHitProcessor {

projects/lcdd/trunk/include/lcdd/geant4

LCDDHeaderRecord.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/geant4/LCDDHeaderRecord.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/geant4/LCDDHeaderRecord.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/geant4/LCDDHeaderRecord.hh,v 1.6 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_GEANT4_LCDDHEADERRECORD_HH_
+#define LCDD_GEANT4_LCDDHEADERRECORD_HH_ 1

-#ifndef LCDD_GEANT4_LCDDHEADERRECORD_HH
-#define LCDD_GEANT4_LCDDHEADERRECORD_HH 1
-

 // STL
 #include <string>
 #include <iostream>

projects/lcdd/trunk/include/lcdd/geant4

PhysVolId.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/geant4/PhysVolId.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/geant4/PhysVolId.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/geant4/PhysVolId.hh,v 1.6 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_GEANT4_PHYSVOLID_HH_
+#define LCDD_GEANT4_PHYSVOLID_HH_ 1

-#ifndef LCDD_GEANT4_PHYSVOLID_HH
-#define LCDD_GEANT4_PHYSVOLID_HH 1
-

 // STL
 #include <vector>
 #include <string>

projects/lcdd/trunk/include/lcdd/geant4

PhysVolIdMap.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/geant4/PhysVolIdMap.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/geant4/PhysVolIdMap.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/geant4/PhysVolIdMap.hh,v 1.8 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_GEANT4_PHYSVOLTOIDMAP_HH_
+#define LCDD_GEANT4_PHYSVOLTOIDMAP_HH_ 1

-#ifndef LCDD_GEANT4_PHYSVOLTOIDMAP_HH
-#define LCDD_GEANT4_PHYSVOLTOIDMAP_HH 1
-

 // LCDD
 #include "PhysVolId.hh"

projects/lcdd/trunk/include/lcdd/geant4

PhysicsLimitSet.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/geant4/PhysicsLimitSet.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/geant4/PhysicsLimitSet.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/geant4/PhysicsLimitSet.hh,v 1.4 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_GEANT4_LIMITSET_HH_
+#define LCDD_GEANT4_LIMITSET_HH_ 1

-#ifndef LCDD_GEANT4_LIMITSET_HH
-#define LCDD_GEANT4_LIMITSET_HH 1
-

 // Geant4
 #include "G4UserLimits.hh"
 #include "globals.hh"

projects/lcdd/trunk/include/lcdd/geant4

UserRegionInformation.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/geant4/UserRegionInformation.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/geant4/UserRegionInformation.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-//$Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/geant4/UserRegionInformation.hh,v 1.4 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_GEANT4_USERREGIONINFORMATION_HH_
+#define LCDD_GEANT4_USERREGIONINFORMATION_HH_ 1

-#ifndef LCDD_GEANT4_USERREGIONINFORMATION_HH
-#define LCDD_GEANT4_USERREGIONINFORMATION_HH 1
-

 // Geant4
 #include "G4VUserRegionInformation.hh"
 #include "G4Track.hh"

projects/lcdd/trunk/include/lcdd/geant4

VUserTrackInformation.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/geant4/VUserTrackInformation.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/geant4/VUserTrackInformation.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,9 +1,3 @@

-/*
- * VUserTrackInformation.hh
- *
- *  Created on: Jun 24, 2014
- *      Author: jeremym
- */

 #ifndef LCDD_GEANT4_VUSERTRACKINFORMATION_HH_
 #define LCDD_GEANT4_VUSERTRACKINFORMATION_HH_

@@ -15,16 +9,8 @@

  * e.g. SLIC.
  */
 class VUserTrackInformation : public G4VUserTrackInformation {

-
-	/**
-	 * Update the track information from a G4Track.
-	 * @param The G4Track associated to the track information.
-	 */
-	//virtual void setTrack(const G4Track* track) = 0;
-

 public:

 	virtual void setHasTrackerHit() = 0;
 };

-#endif /* VUSERTRACKINFORMATION_HH_ */

+#endif

projects/lcdd/trunk/include/lcdd/hits

CalorimeterHit.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/hits/CalorimeterHit.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/hits/CalorimeterHit.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/hits/CalorimeterHit.hh,v 1.11 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_HITS_CALORIMETERHIT_HH_
+#define LCDD_HITS_CALORIMETERHIT_HH_ 1

-#ifndef LCDD_HITS_CALORIMETERHIT_HH
-#define LCDD_HITS_CALORIMETERHIT_HH 1
-

 // LCDD
 #include "lcdd/id/Id64bit.hh"
 #include "lcdd/hits/HitContribution.hh"

projects/lcdd/trunk/include/lcdd/hits

CalorimeterHitMap.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/hits/CalorimeterHitMap.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/hits/CalorimeterHitMap.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,7 +1,7 @@

 // $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/hits/CalorimeterHitMap.hh,v 1.3 2013-11-14 00:47:20 jeremy Exp $

-#ifndef lcdd_hits_CalorimeterHitMap_hh
-#define lcdd_hits_CalorimeterHitMap_hh 1

+#ifndef LCDD_HITS_CALORIMETER_HITMAP_HH_
+#define LCDD_HITS_CALORIMETER_HITMAP_HH_ 1

 
 // LCDD
 #include "lcdd/id/Id64bit.hh"

projects/lcdd/trunk/include/lcdd/hits

HitContribution.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/hits/HitContribution.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/hits/HitContribution.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/hits/HitContribution.hh,v 1.6 2013-11-14 00:47:20 jeremy Exp $
-#ifndef LCDD_HITS_HITCONTRIBUTION_HH
-#define LCDD_HITS_HITCONTRIBUTION_HH 1

+#ifndef LCDD_HITS_HITCONTRIBUTION_HH_
+#define LCDD_HITS_HITCONTRIBUTION_HH_ 1

 
 // Geant4
 #include "globals.hh"

projects/lcdd/trunk/include/lcdd/hits

TrackerHit.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/hits/TrackerHit.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/hits/TrackerHit.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/hits/TrackerHit.hh,v 1.8 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_HITS_TRACKERHIT_HH_
+#define LCDD_HITS_TRACKERHIT_HH_ 1

-#ifndef LCDD_HITS_TRACKERHIT_HH
-#define LCDD_HITS_TRACKERHIT_HH 1
-

 // LCDD
 #include "lcdd/id/Id64bit.hh"

projects/lcdd/trunk/include/lcdd/id

Id64bit.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/id/Id64bit.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/id/Id64bit.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/id/Id64bit.hh,v 1.8 2013-11-14 00:47:20 jeremy Exp $
-#ifndef LCDD_ID64BIT_HH
-#define LCDD_ID64BIT_HH 1

+#ifndef LCDD_ID_ID64BIT_HH_
+#define LCDD_ID_ID64BIT_HH_ 1

 
 // STL
 #include <stdint.h>

projects/lcdd/trunk/include/lcdd/id

IdComparator.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/id/IdComparator.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/id/IdComparator.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,7 +1,7 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/id/IdComparator.hh,v 1.8 2013-11-14 00:47:20 jeremy Exp $
-#ifndef LCDD_IDCOMPARATOR_HH
-#define LCDD_IDCOMPARATOR_HH 1

+#ifndef LCDD_ID_IDCOMPARATOR_HH_
+#define LCDD_ID_IDCOMPARATOR_HH_ 1

+// LCDD

 #include "lcdd/detectors/HitComparator.hh"
 
 /**

projects/lcdd/trunk/include/lcdd/id

IdFactory.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/id/IdFactory.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/id/IdFactory.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,19 +1,18 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/id/IdFactory.hh,v 1.7 2013-11-14 00:47:20 jeremy Exp $
-#ifndef LCDD_IDFACTORY_HH
-#define LCDD_IDFACTORY_HH 1

+#ifndef LCDD_ID_IDFACTORY_HH_
+#define LCDD_ID_IDFACTORY_HH_ 1

 
 // LCDD
 #include "IdVec.hh"
 #include "IdSpec.hh"

-// std

+// STL

 #include <iostream>
 #include <vector>
 
 // LCDD
 class Segmentation;

-// G4

+// Geant4

 class G4Step;
 class G4VPhysicalVolume;

@@ -98,19 +97,6 @@

      * @param[in] fieldName The name of the field.
      */
     static int findIdInPhysVols(const std::vector<G4VPhysicalVolume*>& pvs, const std::string& fieldName);

-
-    /**
-     * Add PhysVolId values from a step into the ID list.
-     * @param[in]  aStep The G4Step object.
-     * @param[out] v     The list of IDs to fill.
-     */
-    //static void addPhysVolIds(G4Step* aStep, IdVec& v);
-    /**
-     * Get the list of physical volumes from a step.
-     * @param[in] The G4Step object.
-     * @return The list of physical volumes.
-     */
-    //static std::vector<G4VPhysicalVolume*> getPhysVolList(G4Step* aStep);

 };
 
 #endif

projects/lcdd/trunk/include/lcdd/id

IdField.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/id/IdField.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/id/IdField.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/id/IdField.hh,v 1.5 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_ID_IDFIELD_HH_
+#define LCDD_ID_IDFIELD_HH_ 1

-#ifndef LCDD_IDFIELD_HH
-#define LCDD_IDFIELD_HH 1
-

 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/id

IdManager.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/id/IdManager.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/id/IdManager.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/id/IdManager.hh,v 1.7 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_ID_IDMANAGER_HH_
+#define LCDD_ID_IDMANAGER_HH_ 1

-#ifndef LCDD_IDMANAGER_HH
-#define LCDD_IDMANAGER_HH 1
-

 // LCDD
 #include "lcdd/id/IdSpec.hh"
 #include "lcdd/id/IdVec.hh"

projects/lcdd/trunk/include/lcdd/id

IdSpec.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/id/IdSpec.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/id/IdSpec.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/id/IdSpec.hh,v 1.4 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_ID_IDSPEC_HH_
+#define LCDD_ID_IDSPEC_HH_ 1

-#ifndef LCDD_IDSPEC_HH
-#define LCDD_IDSPEC_HH 1
-

 // LCDD
 #include "IdField.hh"

projects/lcdd/trunk/include/lcdd/id

IdVec.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/id/IdVec.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/id/IdVec.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/id/IdVec.hh,v 1.5 2013-11-14 00:47:20 jeremy Exp $
-#ifndef LCDD_IDVEC_HH
-#define LCDD_IDVEC_HH

+#ifndef LCDD_ID_IDVEC_HH_
+#define LCDD_ID_IDVEC_HH_ 1

 
 // LCDD
 #include "Id64bit.hh"

projects/lcdd/trunk/include/lcdd/processes

FieldMapTypeProcess.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/processes/FieldMapTypeProcess.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/processes/FieldMapTypeProcess.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/processes/FieldMapTypeProcess.hh,v 1.5 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_PROCESSES_FIELDMAPTYPEPROCESS_HH_
+#define LCDD_PROCESSES_FIELDMAPTYPEPROCESS_HH_ 1

-#ifndef LCDD_PROCESSES_FIELDMAPTYPEPROCESS_HH
-#define LCDD_PROCESSES_FIELDMAPTYPEPROCESS_HH 1
-

 // GDML
 #include "Saxana/ProcessingConfigurator.h"
 #include "Saxana/ProcessingContext.h"

projects/lcdd/trunk/include/lcdd/processes

FieldTypeProcess.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/processes/FieldTypeProcess.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/processes/FieldTypeProcess.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/processes/FieldTypeProcess.hh,v 1.5 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_PROCESSES_FIELDTYPEPROCESS_HH_
+#define LCDD_PROCESSES_FIELDTYPEPROCESS_HH_ 1

-#ifndef LCDD_PROCESSES_FIELDTYPEPROCESS_HH
-#define LCDD_PROCESSES_FIELDTYPEPROCESS_HH 1
-

 // GDML
 #include "Saxana/ProcessingConfigurator.h"
 #include "Saxana/ProcessingContext.h"

projects/lcdd/trunk/include/lcdd/processes

SensitiveDetectorTypeProcess.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/processes/SensitiveDetectorTypeProcess.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/processes/SensitiveDetectorTypeProcess.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/processes/SensitiveDetectorTypeProcess.hh,v 1.5 2013-11-14 00:47:20 jeremy Exp $

+#ifndef LCDD_PROCESSES_SENSITIVEDETECTORTYPEPROCESS_HH_
+#define LCDD_PROCESSES_SENSITIVEDETECTORTYPEPROCESS_HH_ 1

-#ifndef LCDD_PROCESSES_SENSITIVEDETECTORTYPEPROCESS_HH
-#define LCDD_PROCESSES_SENSITIVEDETECTORTYPEPROCESS_HH 1
-

 // LCDD
 #include "lcdd/schema/SensitiveDetectorType.hh"

projects/lcdd/trunk/include/lcdd/processes

calorimeterProcess.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/processes/calorimeterProcess.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/processes/calorimeterProcess.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/processes/calorimeterProcess.hh,v 1.5 2013-11-14 00:47:20 jeremy Exp $
-#ifndef LCDD_PROCESSES_CALORIMETERPROCESS_HH
-#define LCDD_PROCESSES_CALORIMETERPROCESS_HH 1

+#ifndef LCDD_PROCESSES_CALORIMETERPROCESS_HH_
+#define LCDD_PROCESSES_CALORIMETERPROCESS_HH_ 1

 
 // GDML
 #include "Saxana/ProcessingConfigurator.h"

projects/lcdd/trunk/include/lcdd/processes

hit_processorProcess.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/processes/hit_processorProcess.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/processes/hit_processorProcess.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/processes/hit_processorProcess.hh,v 1.3 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_PROCESSES_HIT_PROCESSORPROCESS_HH_
+#define LCDD_PROCESSES_HIT_PROCESSORPROCESS_HH_ 1

-#ifndef LCDD_PROCESSES_HITPROCESSORPROCESS_HH
-#define LCDD_PROCESSES_HITPROCESSORPROCESS_HH 1
-

 // GDML
 #include "Saxana/SAXStateProcess.h"
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/processes

hits_collectionProcess.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/processes/hits_collectionProcess.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/processes/hits_collectionProcess.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/processes/hits_collectionProcess.hh,v 1.3 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_PROCESSES_HITS_COLLECTIONPROCESS_HH_
+#define LCDD_PROCESSES_HITS_COLLECTIONPROCESS_HH_ 1

-#ifndef LCDD_PROCESSES_HITS_COLLECTIONPROCESS_HH
-#define LCDD_PROCESSES_HITS_COLLECTIONPROCESS_HH 1
-

 // GDML
 #include "Saxana/SAXStateProcess.h"
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

AuthorType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/AuthorType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/AuthorType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/AuthorType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_AUTHORTYPE_HH_
+#define LCDD_SCHEMA_AUTHORTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_AUTHORTYPE_HH
-#define LCDD_SCHEMA_AUTHORTYPE_HH 1
-

 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

BoxDipoleType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/BoxDipoleType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/BoxDipoleType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/BoxDipoleType.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_BOXDIPOLETYPE_HH_
+#define LCDD_SCHEMA_BOXDIPOLETYPE_HH_ 1

-#ifndef LCDD_SCHEMA_BOXDIPOLETYPE_HH
-#define LCDD_SCHEMA_BOXDIPOLETYPE_HH 1
-

 // LCDD
 #include "FieldType.hh"

projects/lcdd/trunk/include/lcdd/schema

CalorimeterType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/CalorimeterType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/CalorimeterType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/CalorimeterType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_CALORIMETERTYPE_HH_
+#define LCDD_SCHEMA_CALORIMETERTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_CALORIMETERTYPE_HH
-#define LCDD_SCHEMA_CALORIMETERTYPE_HH 1
-

 // GDML
 #include "Schema/ContentGroup.h"

projects/lcdd/trunk/include/lcdd/schema

CellReadout2DSegmentationType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/CellReadout2DSegmentationType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/CellReadout2DSegmentationType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/CellReadout2DSegmentationType.hh,v 1.8 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_CELLREADOUT2DSEGMENTATIONTYPE_HH_
+#define LCDD_CELLREADOUT2DSEGMENTATIONTYPE_HH_ 1

-#ifndef LCDD_CELLREADOUT2DSEGMENTATIONTYPE_HH
-#define LCDD_CELLREADOUT2DSEGMENTATIONTYPE_HH 1
-

 // LCDD
 #include "SegmentationType.hh"

projects/lcdd/trunk/include/lcdd/schema

ColorType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/ColorType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/ColorType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/ColorType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_COLORTYPE_HH_
+#define LCDD_SCHEMA_COLORTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_COLORTYPE_HH
-#define LCDD_SCHEMA_COLORTYPE_HH 1
-

 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

CommentType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/CommentType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/CommentType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/CommentType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_COMMENTTYPE_HH_
+#define LCDD_SCHEMA_COMMENTTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_COMMENTTYPE_HH
-#define LCDD_SCHEMA_COMMENTTYPE_HH 1
-

 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

DetectorType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/DetectorType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/DetectorType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/DetectorType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_DETECTORTYPE_HH_
+#define LCDD_SCHEMA_DETECTORTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_DETECTORTYPE_HH
-#define LCDD_SCHEMA_DETECTORTYPE_HH 1
-

 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

DipoleCoeffType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/DipoleCoeffType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/DipoleCoeffType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/DipoleCoeffType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_DIPOLECOEFFTYPE_HH
-#define LCDD_SCHEMA_DIPOLECOEFFTYPE_HH

+#ifndef LCDD_SCHEMA_DIPOLECOEFFTYPE_HH_
+#define LCDD_SCHEMA_DIPOLECOEFFTYPE_HH_ 1

 
 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

DipoleType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/DipoleType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/DipoleType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/DipoleType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_DIPOLETYPE_HH_
+#define LCDD_SCHEMA_DIPOLETYPE_HH_ 1

-#ifndef LCDD_SCHEMA_DIPOLETYPE_HH
-#define LCDD_SCHEMA_DIPOLETYPE_HH 1
-

 // LCDD
 #include "FieldType.hh"

projects/lcdd/trunk/include/lcdd/schema

FieldMap3DType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/FieldMap3DType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/FieldMap3DType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/FieldMap3DType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_FIELDMAP3DTYPE_HH
-#define LCDD_SCHEMA_FIELDMAP3DTYPE_HH 1

+#ifndef LCDD_SCHEMA_FIELDMAP3DTYPE_HH_
+#define LCDD_SCHEMA_FIELDMAP3DTYPE_HH_ 1

 
 // LCDD
 #include "FieldMapType.hh"

projects/lcdd/trunk/include/lcdd/schema

FieldMapType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/FieldMapType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/FieldMapType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/FieldMapType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_FIELDMAPTYPE_HH
-#define LCDD_SCHEMA_FIELDMAPTYPE_HH 1

+#ifndef LCDD_SCHEMA_FIELDMAPTYPE_HH_
+#define LCDD_SCHEMA_FIELDMAPTYPE_HH_ 1

 
 // LCDD
 #include "FieldType.hh"

projects/lcdd/trunk/include/lcdd/schema

FieldType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/FieldType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/FieldType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/FieldType.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_FIELDTYPE_HH
-#define LCDD_SCHEMA_FIELDTYPE_HH 1

+#ifndef LCDD_SCHEMA_FIELDTYPE_HH_
+#define LCDD_SCHEMA_FIELDTYPE_HH_ 1

 
 // GDML
 #include "Schema/ReferenceType.h"

projects/lcdd/trunk/include/lcdd/schema

GeneratorType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/GeneratorType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/GeneratorType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/GeneratorType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_GENERATORTYPE_HH_
+#define LCDD_SCHEMA_GENERATORTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_GENERATORTYPE_HH
-#define LCDD_SCHEMA_GENERATORTYPE_HH 1
-

 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

GlobalFieldType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/GlobalFieldType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/GlobalFieldType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/GlobalFieldType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_GLOBALFIELDTYPE_HH_
+#define LCDD_SCHEMA_GLOBALFIELDTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_GLOBALFIELDTYPE_HH
-#define LCDD_SCHEMA_GLOBALFIELDTYPE_HH 1
-

 // GDML
 #include "Schema/ContentGroup.h"

projects/lcdd/trunk/include/lcdd/schema

GlobalGridXYSegmentationType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/GlobalGridXYSegmentationType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/GlobalGridXYSegmentationType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,10 +1,8 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/GlobalGridXYSegmentationType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_GLOBALGRIDXYSEGMENTATIONTYPE_HH_
+#define LCDD_SCHEMA_GLOBALGRIDXYSEGMENTATIONTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_GLOBALGRIDXYSEGMENTATIONTYPE_HH
-#define LCDD_SCHEMA_GLOBALGRIDXYSEGMENTATIONTYPE_HH 1
-

 // LCDD

-#include "SegmentationType.hh"

+#include "lcdd/schema/SegmentationType.hh"

 
 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

HeaderType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/HeaderType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/HeaderType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/HeaderType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_HEADERTYPE_HH_
+#define LCDD_SCHEMA_HEADERTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_HEADERTYPE_HH
-#define LCDD_SCHEMA_HEADERTYPE_HH 1
-

 // GDML
 #include "Schema/ContentGroup.h"

projects/lcdd/trunk/include/lcdd/schema

HitProcessorType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/HitProcessorType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/HitProcessorType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/HitProcessorType.hh,v 1.4 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_HITPROCESSORTYPE_HH_
+#define LCDD_SCHEMA_HITPROCESSORTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_HITPROCESSORTYPE_HH
-#define LCDD_SCHEMA_HITPROCESSORTYPE_HH 1
-

 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

HitsCollectionType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/HitsCollectionType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/HitsCollectionType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/HitsCollectionType.hh,v 1.4 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_HITSCOLLECTIONTYPE_HH_
+#define LCDD_SCHEMA_HITSCOLLECTIONTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_HITSCOLLECTIONTYPE_HH
-#define LCDD_SCHEMA_HITSCOLLECTIONTYPE_HH 1
-

 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

IdFieldType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/IdFieldType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/IdFieldType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/IdFieldType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_IDFIELDTYPE_HH_
+#define LCDD_SCHEMA_IDFIELDTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_IDFIELDTYPE_HH
-#define LCDD_SCHEMA_IDFIELDTYPE_HH 1
-

 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

IdSpecType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/IdSpecType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/IdSpecType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/IdSpecType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_IDSPECTYPE_HH_
+#define LCDD_SCHEMA_IDSPECTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_IDSPECTYPE_HH
-#define LCDD_SCHEMA_IDSPECTYPE_HH 1
-

 // GDML
 #include "Processes/ReferenceTypeProcess.h"
 #include "Schema/ContentGroup.h"

projects/lcdd/trunk/include/lcdd/schema

LimitParamType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/LimitParamType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/LimitParamType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/LimitParamType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_LIMITPARAMTYPE_HH
-#define LCDD_SCHEMA_LIMITPARAMTYPE_HH 1

+#ifndef LCDD_SCHEMA_LIMITPARAMTYPE_HH_
+#define LCDD_SCHEMA_LIMITPARAMTYPE_HH_ 1

 
 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

LimitSetType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/LimitSetType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/LimitSetType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/LimitSetType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_LIMITSETTYPE_HH
-#define LCDD_SCHEMA_LIMITSETTYPE_HH 1

+#ifndef LCDD_SCHEMA_LIMITSETTYPE_HH_
+#define LCDD_SCHEMA_LIMITSETTYPE_HH_ 1

 
 // GDML
 #include "Schema/ContentGroup.h"

projects/lcdd/trunk/include/lcdd/schema

LimitType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/LimitType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/LimitType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/LimitType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_LIMITTYPE_HH
-#define LCDD_SCHEMA_LIMITTYPE_HH

+#ifndef LCDD_SCHEMA_LIMITTYPE_HH_
+#define LCDD_SCHEMA_LIMITTYPE_HH_ 1

 
 // GDML
 #include "Schema/ReferenceType.h"

projects/lcdd/trunk/include/lcdd/schema

NonprojectiveCylinderSegmentationType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/NonprojectiveCylinderSegmentationType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/NonprojectiveCylinderSegmentationType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/NonprojectiveCylinderSegmentationType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_NONPROJECTIVECYLINDERSEGMENTATIONTYPE_HH_
+#define LCDD_SCHEMA_NONPROJECTIVECYLINDERSEGMENTATIONTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_NONPROJECTIVECYLINDERSEGMENTATIONTYPE_HH
-#define LCDD_SCHEMA_NONPROJECTIVECYLINDERSEGMENTATIONTYPE_HH 1
-

 // LCDD
 #include "SegmentationType.hh"

projects/lcdd/trunk/include/lcdd/schema

NonprojectiveSegmentationType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/NonprojectiveSegmentationType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/NonprojectiveSegmentationType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/NonprojectiveSegmentationType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_NONPROJECTIVESEGMENTATIONTYPE_HH_
+#define LCDD_SCHEMA_NONPROJECTIVESEGMENTATIONTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_NONPROJECTIVESEGMENTATIONTYPE_HH
-#define LCDD_SCHEMA_NONPROJECTIVESEGMENTATIONTYPE_HH 1
-

 // LCDD
 #include "SegmentationType.hh"

projects/lcdd/trunk/include/lcdd/schema

PhysVolIdType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/PhysVolIdType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/PhysVolIdType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/PhysVolIdType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_PHYSVOLIDTYPE_HH_
+#define LCDD_SCHEMA_PHYSVOLIDTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_PHYSVOLIDTYPE_HH
-#define LCDD_SCHEMA_PHYSVOLIDTYPE_HH 1
-

 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

ProjectiveCylinderSegmentationType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/ProjectiveCylinderSegmentationType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/ProjectiveCylinderSegmentationType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/ProjectiveCylinderSegmentationType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_PROJECTIVECYLINDERSEGMENTATIONTYPE_HH_
+#define LCDD_SCHEMA_PROJECTIVECYLINDERSEGMENTATIONTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_PROJECTIVECYLINDERSEGMENTATIONTYPE_HH
-#define LCDD_SCHEMA_PROJECTIVECYLINDERSEGMENTATIONTYPE_HH 1
-

 // LCDD
 #include "SegmentationType.hh"

projects/lcdd/trunk/include/lcdd/schema

ProjectiveZPlaneSegmentationType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/ProjectiveZPlaneSegmentationType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/ProjectiveZPlaneSegmentationType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/ProjectiveZPlaneSegmentationType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_PROJECTIVEZPLANESEGMENTATIONTYPE_HH_
+#define LCDD_SCHEMA_PROJECTIVEZPLANESEGMENTATIONTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_PROJECTIVEZPLANESEGMENTATIONTYPE_HH
-#define LCDD_SCHEMA_PROJECTIVEZPLANESEGMENTATIONTYPE_HH 1
-

 // LCDD
 #include "SegmentationType.hh"

projects/lcdd/trunk/include/lcdd/schema

RZBType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/RZBType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/RZBType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/RZBType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_RZBTYPE_HH
-#define LCDD_SCHEMA_RZBTYPE_HH 1

+#ifndef LCDD_SCHEMA_RZBTYPE_HH_
+#define LCDD_SCHEMA_RZBTYPE_HH_ 1

 
 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

RZFieldMapType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/RZFieldMapType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/RZFieldMapType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/RZFieldMapType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_RZFIELDMAPTYPE_HH
-#define LCDD_SCHEMA_RZFIELDMAPTYPE_HH 1

+#ifndef LCDD_SCHEMA_RZFIELDMAPTYPE_HH_
+#define LCDD_SCHEMA_RZFIELDMAPTYPE_HH_ 1

 
 // LCDD
 #include "FieldMapType.hh"

projects/lcdd/trunk/include/lcdd/schema

RegionType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/RegionType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/RegionType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/RegionType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_REGIONTYPE_HH_
+#define LCDD_SCHEMA_REGIONTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_REGIONTYPE_HH
-#define LCDD_SCHEMA_REGIONTYPE_HH 1
-

 // GDML
 #include "Saxana/SAXObject.h"
 #include "Schema/ReferenceType.h"

projects/lcdd/trunk/include/lcdd/schema

SegmentationType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/SegmentationType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/SegmentationType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/SegmentationType.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_SEGMENTATIONTYPE_HH_
+#define LCDD_SCHEMA_SEGMENTATIONTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_SEGMENTATIONTYPE_HH
-#define LCDD_SCHEMA_SEGMENTATIONTYPE_HH 1
-

 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/schema

SensitiveDetectorType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/SensitiveDetectorType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/SensitiveDetectorType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/SensitiveDetectorType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_SENSITIVEDETECTORTYPE_HH_
+#define LCDD_SCHEMA_SENSITIVEDETECTORTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_SENSITIVEDETECTORTYPE_HH
-#define LCDD_SCHEMA_SENSITIVEDETECTORTYPE_HH 1
-

 // GDML
 #include "Schema/ContentGroup.h"
 #include "Schema/ReferenceType.h"

projects/lcdd/trunk/include/lcdd/schema

SolenoidType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/SolenoidType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/SolenoidType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/SolenoidType.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_SOLENOIDTYPE_HH_
+#define LCDD_SCHEMA_SOLENOIDTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_SOLENOIDTYPE_HH
-#define LCDD_SCHEMA_SOLENOIDTYPE_HH 1
-

 // LCDD
 #include "FieldType.hh"

projects/lcdd/trunk/include/lcdd/schema

TrackerType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/TrackerType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/TrackerType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/TrackerType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_TRACKERTYPE_HH_
+#define LCDD_SCHEMA_TRACKERTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_TRACKERTYPE_HH
-#define LCDD_SCHEMA_TRACKERTYPE_HH 1
-

 // LCDD
 #include "SensitiveDetectorType.hh"

projects/lcdd/trunk/include/lcdd/schema

VisType.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/VisType.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/VisType.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/VisType.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_VISTYPE_HH_
+#define LCDD_SCHEMA_VISTYPE_HH_ 1

-#ifndef LCDD_SCHEMA_VISTYPE_HH
-#define LCDD_SCHEMA_VISTYPE_HH 1
-

 // GDML
 #include "Schema/ContentGroup.h"
 #include "Schema/ReferenceType.h"

projects/lcdd/trunk/include/lcdd/schema

author.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/author.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/author.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/author.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_AUTHOR_HH_
+#define LCDD_SCHEMA_AUTHOR_HH_ 1

-#ifndef LCDD_SCHEMA_AUTHOR_HH
-#define LCDD_SCHEMA_AUTHOR_HH 1
-

 #include "Saxana/SAXObject.h"
 
 #include "AuthorType.hh"

projects/lcdd/trunk/include/lcdd/schema

box_dipole.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/box_dipole.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/box_dipole.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/box_dipole.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_BOX_DIPOLE_HH_
+#define LCDD_SCHEMA_BOX_DIPOLE_HH_ 1

-#ifndef LCDD_SCHEMA_BOX_DIPOLE_HH
-#define LCDD_SCHEMA_BOX_DIPOLE_HH 1
-

 // LCDD
 #include "BoxDipoleType.hh"

projects/lcdd/trunk/include/lcdd/schema

calorimeter.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/calorimeter.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/calorimeter.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/calorimeter.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_CALORIMETER_HH
-#define LCDD_SCHEMA_CALORIMETER_HH 1

+#ifndef LCDD_SCHEMA_CALORIMETER_HH_
+#define LCDD_SCHEMA_CALORIMETER_HH_ 1

 
 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

cell_readout_2d.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/cell_readout_2d.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/cell_readout_2d.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/cell_readout_2d.hh,v 1.7 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_CELL_READOUT_2D_HH_
+#define LCDD_SCHEMA_CELL_READOUT_2D_HH_ 1

-#ifndef LCDD_SCHEMA_CELL_READOUT_2D_HH
-#define LCDD_SCHEMA_CELL_READOUT_2D_HH 1
-

 // LCDD
 #include "CellReadout2DSegmentationType.hh"

projects/lcdd/trunk/include/lcdd/schema

color.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/color.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/color.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/color.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_COLOR_HH_
+#define LCDD_SCHEMA_COLOR_HH_ 1

-#ifndef LCDD_SCHEMA_COLOR_HH
-#define LCDD_SCHEMA_COLOR_HH 1
-

 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

comment.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/comment.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/comment.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/comment.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_COMMENT_HH_
+#define LCDD_SCHEMA_COMMENT_HH_ 1

-#ifndef LCDD_SCHEMA_COMMENT_HH
-#define LCDD_SCHEMA_COMMENT_HH 1
-

 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

detector.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/detector.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/detector.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/detector.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_DETECTOR_HH_
+#define LCDD_SCHEMA_DETECTOR_HH_ 1

-#ifndef LCDD_SCHEMA_DETECTOR_HH
-#define LCDD_SCHEMA_DETECTOR_HH 1
-

 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

dipole.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/dipole.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/dipole.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/dipole.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_DIPOLE_HH
-#define LCDD_SCHEMA_DIPOLE_HH

+#ifndef LCDD_SCHEMA_DIPOLE_HH_
+#define LCDD_SCHEMA_DIPOLE_HH_

 
 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

dipole_coeff.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/dipole_coeff.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/dipole_coeff.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/dipole_coeff.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_DIPOLE_COEFF_HH
-#define LCDD_SCHEMA_DIPOLE_COEFF_HH 1

+#ifndef LCDD_SCHEMA_DIPOLE_COEFF_HH_
+#define LCDD_SCHEMA_DIPOLE_COEFF_HH_ 1

 
 // LCDD
 #include "DipoleCoeffType.hh"

projects/lcdd/trunk/include/lcdd/schema

field.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/field.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/field.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/field.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_FIELD_HH_
+#define LCDD_SCHEMA_FIELD_HH_ 1

-#ifndef LCDD_SCHEMA_FIELD_HH
-#define LCDD_SCHEMA_FIELD_HH 1
-

 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

field_map_3d.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/field_map_3d.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/field_map_3d.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/field_map_3d.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_FIELD_MAP_3D_HH
-#define LCDD_SCHEMA_FIELD_MAP_3D_HH 1

+#ifndef LCDD_SCHEMA_FIELD_MAP_3D_HH_
+#define LCDD_SCHEMA_FIELD_MAP_3D_HH_ 1

 
 // LCDD
 #include "FieldMap3DType.hh"

projects/lcdd/trunk/include/lcdd/schema

generator.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/generator.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/generator.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/generator.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_GENERATOR_HH_
+#define LCDD_SCHEMA_GENERATOR_HH_ 1

-#ifndef LCDD_SCHEMA_GENERATOR_HH
-#define LCDD_SCHEMA_GENERATOR_HH 1
-

 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

global_field.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/global_field.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/global_field.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/global_field.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_GLOBAL_FIELD_HH_
+#define LCDD_SCHEMA_GLOBAL_FIELD_HH_ 1

-#ifndef LCDD_SCHEMA_GLOBAL_FIELD_HH
-#define LCDD_SCHEMA_GLOBAL_FIELD_HH 1
-

 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

global_grid_xy.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/global_grid_xy.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/global_grid_xy.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/global_grid_xy.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_GLOBAL_GRID_XY_HH
-#define LCDD_SCHEMA_GLOBAL_GRID_XY_HH 1

+#ifndef LCDD_SCHEMA_GLOBAL_GRID_XY_HH_
+#define LCDD_SCHEMA_GLOBAL_GRID_XY_HH_ 1

 
 // LCDD
 #include "GlobalGridXYSegmentationType.hh"

projects/lcdd/trunk/include/lcdd/schema

grid_xyz.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/grid_xyz.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/grid_xyz.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/grid_xyz.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_GRID_XYZ_HH_
+#define LCDD_SCHEMA_GRID_XYZ_HH_ 1

-#ifndef LCDD_SCHEMA_GRID_XYZ_HH
-#define LCDD_SCHEMA_GRID_XYZ_HH 1
-

 // LCDD
 #include "NonprojectiveSegmentationType.hh"

projects/lcdd/trunk/include/lcdd/schema

header.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/header.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/header.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/header.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_HEADER_HH_
+#define LCDD_SCHEMA_HEADER_HH_ 1

-#ifndef LCDD_SCHEMA_HEADER_HH
-#define LCDD_SCHEMA_HEADER_HH 1
-

 // LCDD
 #include "HeaderType.hh"

projects/lcdd/trunk/include/lcdd/schema

hit_processor.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/hit_processor.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/hit_processor.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/hit_processor.hh,v 1.4 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_HIT_PROCESSOR_HH_
+#define LCDD_SCHEMA_HIT_PROCESSOR_HH_ 1

-#ifndef LCDD_SCHEMA_HITPROCESSOR_HH
-#define LCDD_SCHEMA_HITPROCESSOR_HH 1
-

 // LCDD
 #include "lcdd/schema/HitProcessorType.hh"

projects/lcdd/trunk/include/lcdd/schema

hits_collection.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/hits_collection.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/hits_collection.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/hits_collection.hh,v 1.4 2013-11-14 00:47:21 jeremy Exp $

+#ifndef LCDD_SCHEMA_HITS_COLLECTION_HH_
+#define LCDD_SCHEMA_HITS_COLLECTION_HH_ 1

-#ifndef LCDD_SCHEMA_HITS_COLLECTION_HH
-#define LCDD_SCHEMA_HITS_COLLECTION_HH 1
-

 // LCDD
 #include "lcdd/schema/HitsCollectionType.hh"

projects/lcdd/trunk/include/lcdd/schema

idfieldElem.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/idfieldElem.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/idfieldElem.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/idfieldElem.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_IDFIELDELEM_HH
-#define LCDD_SCHEMA_IDFIELDELEM_HH 1

+#ifndef LCDD_SCHEMA_IDFIELDELEM_HH_
+#define LCDD_SCHEMA_IDFIELDELEM_HH_ 1

 
 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

idspecElem.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/idspecElem.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/idspecElem.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/idspecElem.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_IDSPECELEM_HH
-#define LCDD_SCHEMA_IDSPECELEM_HH

+#ifndef LCDD_SCHEMA_IDSPECELEM_HH_
+#define LCDD_SCHEMA_IDSPECELEM_HH_ 1

 
 // LCDD
 #include "IdSpecType.hh"

projects/lcdd/trunk/include/lcdd/schema

limit.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/limit.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/limit.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/limit.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_LIMIT_HH
-#define LCDD_SCHEMA_LIMIT_HH 1

+#ifndef LCDD_SCHEMA_LIMIT_HH_
+#define LCDD_SCHEMA_LIMIT_HH_ 1

 
 // LCDD
 #include "LimitParamType.hh"

projects/lcdd/trunk/include/lcdd/schema

limitset.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/limitset.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/limitset.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/limitset.hh,v 1.6 2013-11-14 00:47:21 jeremy Exp $
-#ifndef LCDD_SCHEMA_LIMITSET_HH
-#define LCDD_SCHEMA_LIMITSET_HH 1

+#ifndef LCDD_SCHEMA_LIMITSET_HH_
+#define LCDD_SCHEMA_LIMITSET_HH_ 1

 
 // LCDD
 #include "LimitSetType.hh"

projects/lcdd/trunk/include/lcdd/schema

nonprojective_cylinder.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/nonprojective_cylinder.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/nonprojective_cylinder.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/nonprojective_cylinder.hh,v 1.6 2013-11-14 00:47:22 jeremy Exp $

+#ifndef LCDD_SCHEMA_NONPROJECTIVE_CYLINDER_HH_
+#define LCDD_SCHEMA_NONPROJECTIVE_CYLINDER_HH_ 1

-#ifndef LCDD_SCHEMA_NONPROJECTIVE_CYLINDER_HH
-#define LCDD_SCHEMA_NONPROJECTIVE_CYLINDER_HH 1
-

 // LCDD
 #include "NonprojectiveCylinderSegmentationType.hh"

projects/lcdd/trunk/include/lcdd/schema

physvolidElem.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/physvolidElem.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/physvolidElem.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/physvolidElem.hh,v 1.6 2013-11-14 00:47:22 jeremy Exp $
-#ifndef LCDD_SCHEMA_PHYSVOLID_HH
-#define LCDD_SCHEMA_PHYSVOLID_HH 1

+#ifndef LCDD_SCHEMA_PHYSVOLID_HH_
+#define LCDD_SCHEMA_PHYSVOLID_HH_ 1

 
 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

projective_cylinder.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/projective_cylinder.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/projective_cylinder.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/projective_cylinder.hh,v 1.6 2013-11-14 00:47:22 jeremy Exp $

+#ifndef LCDD_SCHEMA_PROJECTIVE_CYLINDER_HH_
+#define LCDD_SCHEMA_PROJECTIVE_CYLINDER_HH_ 1

-#ifndef LCDD_SCHEMA_PROJECTIVE_CYLINDER_HH
-#define LCDD_SCHEMA_PROJECTIVE_CYLINDER_HH 1
-

 // LCDD
 #include "ProjectiveCylinderSegmentationType.hh"

projects/lcdd/trunk/include/lcdd/schema

projective_zplane.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/projective_zplane.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/projective_zplane.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/projective_zplane.hh,v 1.6 2013-11-14 00:47:22 jeremy Exp $

+#ifndef LCDD_SCHEMA_PROJECTIVE_ZPLANE_HH_
+#define LCDD_SCHEMA_PROJECTIVE_ZPLANE_HH_ 1

-#ifndef LCDD_SCHEMA_PROJECTIVE_ZPLANE_HH
-#define LCDD_SCHEMA_PROJECTIVE_ZPLANE_HH 1
-

 // LCDD
 #include "ProjectiveZPlaneSegmentationType.hh"

projects/lcdd/trunk/include/lcdd/schema

region.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/region.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/region.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/region.hh,v 1.6 2013-11-14 00:47:22 jeremy Exp $

+#ifndef LCDD_SCHEMA_REGION_HH_
+#define LCDD_SCHEMA_REGION_HH_ 1

-#ifndef LCDD_SCHEMA_REGION_HH
-#define LCDD_SCHEMA_REGION_HH 1
-

 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/schema

rz_field_map.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/rz_field_map.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/rz_field_map.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/rz_field_map.hh,v 1.6 2013-11-14 00:47:22 jeremy Exp $

+#ifndef LCDD_SCHEMA_RZ_FIELD_MAP_HH_
+#define LCDD_SCHEMA_RZ_FIELD_MAP_HH_ 1

-#ifndef LCDD_SCHEMA_RZ_FIELD_MAP_HH
-#define LCDD_SCHEMA_RZ_FIELD_MAP_HH 1
-

 // LCDD
 #include "RZFieldMapType.hh"

projects/lcdd/trunk/include/lcdd/schema

rzb.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/rzb.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/rzb.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/rzb.hh,v 1.6 2013-11-14 00:47:22 jeremy Exp $
-#ifndef LCDD_SCHEMA_RZB_HH
-#define LCDD_SCHEMA_RZB_HH 1

+#ifndef LCDD_SCHEMA_RZB_HH_
+#define LCDD_SCHEMA_RZB_HH_ 1

 
 // LCDD
 #include "RZBType.hh"

projects/lcdd/trunk/include/lcdd/schema

sensitive_detector.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/sensitive_detector.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/sensitive_detector.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/sensitive_detector.hh,v 1.6 2013-11-14 00:47:22 jeremy Exp $

+#ifndef LCDD_SCHEMA_SENSITIVE_DETECTOR_HH_
+#define LCDD_SCHEMA_SENSITIVE_DETECTOR_HH_ 1

-#ifndef LCDD_SCHEMA_SENSITIVE_DETECTOR_HH
-#define LCDD_SCHEMA_SENSITIVE_DETECTOR_HH 1
-

 // LCDD
 #include "SensitiveDetectorType.hh"

projects/lcdd/trunk/include/lcdd/schema

solenoid.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/solenoid.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/solenoid.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Id: solenoid.hh,v 1.6 2013-11-14 00:47:22 jeremy Exp $

+#ifndef LCDD_SCHEMA_SOLENOID_HH_
+#define LCDD_SCHEMA_SOLENOID_HH_ 1

-#ifndef LCDD_SCHEMA_SOLENOID_HH
-#define LCDD_SCHEMA_SOLENOID_HH
-

 // LCDD
 #include "SolenoidType.hh"

projects/lcdd/trunk/include/lcdd/schema

tracker.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/tracker.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/tracker.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/tracker.hh,v 1.6 2013-11-14 00:47:22 jeremy Exp $

+#ifndef LCDD_SCHEMA_TRACKER_HH_
+#define LCDD_SCHEMA_TRACKER_HH_ 1

-#ifndef LCDD_SCHEMA_TRACKER_HH
-#define LCDD_SCHEMA_TRACKER_HH 1
-

 // LCDD
 #include "TrackerType.hh"

projects/lcdd/trunk/include/lcdd/schema

vis.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/schema/vis.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/schema/vis.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/schema/vis.hh,v 1.6 2013-11-14 00:47:22 jeremy Exp $

+#ifndef LCDD_SCHEMA_VIS_HH_
+#define LCDD_SCHEMA_VIS_HH_ 1

-#ifndef LCDD_SCHEMA_VIS_HH
-#define LCDD_SCHEMA_VIS_HH 1
-

 // GDML
 #include "Saxana/SAXObject.h"

projects/lcdd/trunk/include/lcdd/segmentation

CellReadout.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/segmentation/CellReadout.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/segmentation/CellReadout.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/segmentation/CellReadout.hh,v 1.2 2013-11-14 00:47:23 jeremy Exp $

+#ifndef LCDD_SEGMENTATION_CELLREADOUT_HH_
+#define LCDD_SEGMENTATION_CELLREADOUT_HH_ 1

-#ifndef LCDD_SEGMENTATION_CELLREADOUT_HH
-#define LCDD_SEGMENTATION_CELLREADOUT_HH 1
-

 // STL
 #include <vector>
 #include <map>

projects/lcdd/trunk/include/lcdd/segmentation

CellReadout2D.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/segmentation/CellReadout2D.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/segmentation/CellReadout2D.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/segmentation/CellReadout2D.hh,v 1.2 2013-11-14 00:47:23 jeremy Exp $

+#ifndef LCDD_SEGMENTATION_CELLREADOUT2D_HH_
+#define LCDD_SEGMENTATION_CELLREADOUT2D_HH_ 1

-#ifndef LCDD_SEGMENTATION_CELLREADOUT2D_HH
-#define LCDD_SEGMENTATION_CELLREADOUT2D_HH 1
-

 // LCDD
 #include "lcdd/segmentation/CellReadout.hh"

projects/lcdd/trunk/include/lcdd/segmentation

CellReadout2DSegmentation.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/segmentation/CellReadout2DSegmentation.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/segmentation/CellReadout2DSegmentation.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,5 +1,5 @@

-#ifndef LCDD_SEGMENTATION_CELLREADOUT2DSEGMENTATION_HH
-#define LCDD_SEGMENTATION_CELLREADOUT2DSEGMENTATION_HH 1

+#ifndef LCDD_SEGMENTATION_CELLREADOUT2DSEGMENTATION_HH_
+#define LCDD_SEGMENTATION_CELLREADOUT2DSEGMENTATION_HH_ 1

 
 // LCDD
 #include "lcdd/segmentation/Segmentation.hh"

projects/lcdd/trunk/include/lcdd/segmentation

GlobalGridXYSegmentation.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/segmentation/GlobalGridXYSegmentation.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/segmentation/GlobalGridXYSegmentation.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/segmentation/GlobalGridXYSegmentation.hh,v 1.2 2013-11-14 00:47:23 jeremy Exp $

+#ifndef LCDD_SEGMENTATION_GLOBALGRIDXYSEGMENTATION_HH_
+#define LCDD_SEGMENTATION_GLOBALGRIDXYSEGMENTATION_HH_ 1

-#ifndef LCDD_SEGMENTATION_GLOBALGRIDXYSEGMENTATION_HH
-#define LCDD_SEGMENTATION_GLOBALGRIDXYSEGMENTATION_HH 1
-

 // LCDD
 #include "lcdd/segmentation/Segmentation.hh"

projects/lcdd/trunk/include/lcdd/segmentation

GridXYZSegmentation.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/segmentation/GridXYZSegmentation.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/segmentation/GridXYZSegmentation.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/segmentation/GridXYZSegmentation.hh,v 1.2 2013-11-14 00:47:23 jeremy Exp $
-#ifndef LCDD_SEGMENTATION_G4GRIDXYZSEGMENTATION_HH
-#define LCDD_SEGMENTATION_G4GRIDXYZSEGMENTATION_HH 1

+#ifndef LCDD_SEGMENTATION_G4GRIDXYZSEGMENTATION_HH_
+#define LCDD_SEGMENTATION_G4GRIDXYZSEGMENTATION_HH_ 1

 
 // LCDD
 #include "lcdd/segmentation/Segmentation.hh"

projects/lcdd/trunk/include/lcdd/segmentation

NonprojectiveCylinderSegmentation.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/segmentation/NonprojectiveCylinderSegmentation.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/segmentation/NonprojectiveCylinderSegmentation.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/segmentation/NonprojectiveCylinderSegmentation.hh,v 1.2 2013-11-14 00:47:23 jeremy Exp $
-#ifndef LCDD_SEGMENTATION_G4NONPROJECTIVECYLINDERSEGMENTATION
-#define LCDD_SEGMENTATION_G4NONPROJECTIVECYLINDERSEGMENTATION 1

+#ifndef LCDD_SEGMENTATION_G4NONPROJECTIVECYLINDERSEGMENTATION_
+#define LCDD_SEGMENTATION_G4NONPROJECTIVECYLINDERSEGMENTATION_ 1

 
 // LCDD
 #include "lcdd/segmentation/Segmentation.hh"

projects/lcdd/trunk/include/lcdd/segmentation

ProjectiveCylinderSegmentation.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/segmentation/ProjectiveCylinderSegmentation.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/segmentation/ProjectiveCylinderSegmentation.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/segmentation/ProjectiveCylinderSegmentation.hh,v 1.2 2013-11-14 00:47:23 jeremy Exp $
-#ifndef LCDD_SEGMENTATION_PROJECTIVECYLINDERSEGMENTATION_HH
-#define LCDD_SEGMENTATION_PROJECTIVECYLINDERSEGMENTATION_HH 1

+#ifndef LCDD_SEGMENTATION_PROJECTIVECYLINDERSEGMENTATION_HH_
+#define LCDD_SEGMENTATION_PROJECTIVECYLINDERSEGMENTATION_HH_ 1

 
 // LCDD
 #include "lcdd/segmentation/ProjectiveSegmentation.hh"

projects/lcdd/trunk/include/lcdd/segmentation

ProjectiveSegmentation.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/segmentation/ProjectiveSegmentation.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/segmentation/ProjectiveSegmentation.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/segmentation/ProjectiveSegmentation.hh,v 1.2 2013-11-14 00:47:23 jeremy Exp $
-#ifndef LCDD_SEGMENTATION_PROJECTIVESEGMENTATION_HH
-#define LCDD_SEGMENTATION_PROJECTIVESEGMENTATION_HH 1

+#ifndef LCDD_SEGMENTATION_PROJECTIVESEGMENTATION_HH_
+#define LCDD_SEGMENTATION_PROJECTIVESEGMENTATION_HH_ 1

 
 #include "lcdd/segmentation/Segmentation.hh"

projects/lcdd/trunk/include/lcdd/segmentation

ProjectiveZPlaneSegmentation.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/segmentation/ProjectiveZPlaneSegmentation.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/segmentation/ProjectiveZPlaneSegmentation.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/segmentation/ProjectiveZPlaneSegmentation.hh,v 1.2 2013-11-14 00:47:23 jeremy Exp $
-#ifndef LCDD_SEGMENTATION_PROJECTIVEZPLANESEGMENTATION_HH
-#define LCDD_SEGMENTATION_PROJECTIVEZPLANESEGMENTATION_HH 1

+#ifndef LCDD_SEGMENTATION_PROJECTIVEZPLANESEGMENTATION_HH_
+#define LCDD_SEGMENTATION_PROJECTIVEZPLANESEGMENTATION_HH_ 1

 
 // LCDD
 #include "lcdd/segmentation/ProjectiveSegmentation.hh"

projects/lcdd/trunk/include/lcdd/segmentation

Segmentation.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/segmentation/Segmentation.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/segmentation/Segmentation.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/segmentation/Segmentation.hh,v 1.2 2013-11-14 00:47:23 jeremy Exp $

+#ifndef LCDD_SEGMENTATION_SEGMENTATION_HH_
+#define LCDD_SEGMENTATION_SEGMENTATION_HH_ 1

-#ifndef LCDD_SEGMENTATION_SEGMENTATION_HH
-#define LCDD_SEGMENTATION_SEGMENTATION_HH 1
-

 // Geant4
 #include "G4ThreeVector.hh"
 #include "G4Step.hh"

projects/lcdd/trunk/include/lcdd/segmentation

SegmentationFactory.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/segmentation/SegmentationFactory.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/segmentation/SegmentationFactory.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/segmentation/SegmentationFactory.hh,v 1.2 2013-11-14 00:47:23 jeremy Exp $

+#ifndef LCDD_SEGMENTATION_SEGMENTATIONFACTORY_HH_
+#define LCDD_SEGMENTATION_SEGMENTATIONFACTORY_HH_ 1

-#ifndef LCDD_SEGMENTATION_SEGMENTATIONFACTORY_HH
-#define LCDD_SEGMENTATION_SEGMENTATIONFACTORY_HH 1
-

 class Segmentation;
 class SAXObject;

projects/lcdd/trunk/include/lcdd/subscribers

volumeExtendedSubscriber.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/subscribers/volumeExtendedSubscriber.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/subscribers/volumeExtendedSubscriber.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/subscribers/volumeExtendedSubscriber.hh,v 1.4 2013-11-14 00:47:23 jeremy Exp $

+#ifndef LCDD_SUBSCRIBERS_VOLUMEEXTENDEDSUBSCRIBER_HH_
+#define LCDD_SUBSCRIBERS_VOLUMEEXTENDEDSUBSCRIBER_HH_ 1

-#ifndef LCDD_SUBSCRIBERS_VOLUMEEXTENDEDSUBSCRIBER_HH
-#define LCDD_SUBSCRIBERS_VOLUMEEXTENDEDSUBSCRIBER_HH 1
-

 // GDML
 #include "Saxana/SAXSubscriber.h"
 #include "Saxana/SAXComponentFactory.h"

projects/lcdd/trunk/include/lcdd/util

GDMLWriter.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/util/GDMLWriter.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/util/GDMLWriter.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,5 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/util/GDMLWriter.hh,v 1.6 2013-11-14 00:47:23 jeremy Exp $
-#ifndef LCDD_UTIL_GDMLWRITER_HH
-#define LCDD_UTIL_GDMLWRITER_HH 1

+#ifndef LCDD_UTIL_GDMLWRITER_HH_
+#define LCDD_UTIL_GDMLWRITER_HH_ 1

 
 // STL
 #include <string>

projects/lcdd/trunk/include/lcdd/util

GDMLWriterMessenger.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/util/GDMLWriterMessenger.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/util/GDMLWriterMessenger.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/util/GDMLWriterMessenger.hh,v 1.5 2013-11-14 00:47:23 jeremy Exp $

+#ifndef LCDD_UTIL_GDMLWRITERMESSENGER_HH_
+#define LCDD_UTIL_GDMLWRITERMESSENGER_HH_ 1

-#ifndef LCDD_UTIL_GDMLWRITERMESSENGER_HH
-#define LCDD_UTIL_GDMLWRITERMESSENGER_HH 1
-

 // Geant4
 #include "G4UImessenger.hh"

projects/lcdd/trunk/include/lcdd/util

NistElementsDump.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/util/NistElementsDump.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/util/NistElementsDump.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Id: NistElementsDump.hh,v 1.7 2013-11-14 00:47:23 jeremy Exp $

+#ifndef LCDD_UTIL_NISTELEMENTSDUMP_HH_
+#define LCDD_UTIL_NISTELEMENTSDUMP_HH_ 1

-#ifndef LCDD_UTIL_NISTELEMENTSDUMP_HH
-#define LCDD_UTIL_NISTELEMENTSDUMP_HH 1
-

 // STL
 #include <iostream>
 #include <string>

projects/lcdd/trunk/include/lcdd/util

StoreInspector.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/util/StoreInspector.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/util/StoreInspector.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/util/StoreInspector.hh,v 1.9 2013-11-14 00:47:23 jeremy Exp $

+#ifndef LCDD_UTIL_STOREINSPECTOR_HH_
+#define LCDD_UTIL_STOREINSPECTOR_HH_ 1

-#ifndef LCDD_UTIL_STOREINSPECTOR_HH
-#define LCDD_UTIL_STOREINSPECTOR_HH 1
-

 // LCDD
 #include "lcdd/core/LCDDProcessor.hh"
 #include "lcdd/id/IdManager.hh"

projects/lcdd/trunk/include/lcdd/util

StringUtil.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/util/StringUtil.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/util/StringUtil.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,8 +1,6 @@

-// $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/util/StringUtil.hh,v 1.6 2013-11-14 00:47:23 jeremy Exp $

+#ifndef LCDD_UTIL_STRINGUTIL_HH_
+#define LCDD_UTIL_STRINGUTIL_HH_ 1

-#ifndef LCDD_UTIL_STRINGUTIL_HH
-#define LCDD_UTIL_STRINGUTIL_HH 1
-

 // STL
 #include <string>
 #include <sstream>

projects/lcdd/trunk/include/lcdd/util

TimerUtil.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/util/TimerUtil.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/util/TimerUtil.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,9 +1,9 @@

-#ifndef lcdd_util_TimerUtil_hh_
-#define lcdd_util_TimerUtil_hh_ 1

+#ifndef LCDD_UTIL_TIMERUTIL_HH_
+#define LCDD_UTIL_TIMERUTIL_HH_ 1

 
 #include <sys/time.h>

-// clock_gettime is not defined on MacOS

+// Define clock_gettime for OSX.

 #ifdef __MACH__
 #include <mach/mach_time.h>
 #define CLOCK_REALTIME 0

@@ -21,8 +21,6 @@

 }
 #endif

-
-

 #include <string>
 #include <map>
 #include <iostream>

projects/lcdd/trunk/include/lcdd/util

Verbose.hh 3207 -> 3208

--- projects/lcdd/trunk/include/lcdd/util/Verbose.hh	2014-07-30 21:52:22 UTC (rev 3207)
+++ projects/lcdd/trunk/include/lcdd/util/Verbose.hh	2014-07-30 22:05:45 UTC (rev 3208)
@@ -1,6 +1,6 @@

 // $Header: /nfs/slac/g/lcd/cvs/lcdroot/lcdd/include/lcdd/util/Verbose.hh,v 1.5 2013-11-14 00:47:23 jeremy Exp $

-#ifndef LCDD_UTIL_VERBOSE_HH
-#define LCDD_UTIL_VERBOSE_HH 1

+#ifndef LCDD_UTIL_VERBOSE_HH_
+#define LCDD_UTIL_VERBOSE_HH_ 1

 
 /**
  * @brief Mixin class for setting and retrieving verbosity level.

SVNspam 0.1

Use REPLY-ALL to reply to list

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