 |
 |
code formatting
diff -u -r1.6 -r1.7 --- BoxDipole.hh 10 Jul 2013 18:06:16 -0000 1.6 +++ BoxDipole.hh 14 Nov 2013 00:47:19 -0000 1.7 @@ -8,16 +8,15 @@
* @brief This is a G4MagneticField implementation that assigns fixed B-field components to a box-like * region with a possible offset in world coordinates. */
-class BoxDipole: public G4MagneticField
-{
+class BoxDipole: public G4MagneticField {
public:
- /** - * Class constructor. - * @param[in] x, y, z The global position of the box's center. - * @param[in] dx, dy, dz The half lengths of the box. - * @param[in] by, by, bz The B-field coordinates for the region. - */
+ /** + * Class constructor. + * @param[in] x, y, z The global position of the box's center. + * @param[in] dx, dy, dz The half lengths of the box. + * @param[in] by, by, bz The B-field coordinates for the region. + */
BoxDipole(double x, double y, double z, double dx, double dy, double dz, double bx, double by, double bz);
/**
diff -u -r1.7 -r1.8 --- Cartesian3DMagneticFieldMap.hh 10 Jul 2013 18:06:16 -0000 1.7 +++ Cartesian3DMagneticFieldMap.hh 14 Nov 2013 00:47:19 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/bfield/Cartesian3DMagneticFieldMap.hh,v 1.7 2013/07/10 18:06:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -51,8 +51,7 @@
* * @author Norman Graf */
-class Cartesian3DMagneticFieldMap: public G4MagneticField
-{
+class Cartesian3DMagneticFieldMap: public G4MagneticField {
private:
// Storage space for the table
@@ -80,7 +79,7 @@
/**
* Class constructor.
- * @param[in] filename The name of the file defining the B-field grid.
+ * @param[in] filename The name of the file defining the B-field grid.
* @param[in] xOffset, yOffset, zOffset The offset of the grid's coordinate system.
*/
Cartesian3DMagneticFieldMap(const char* filename, double xOffset, double yOffset, double zOffset);
diff -u -r1.6 -r1.7 --- Dipole.hh 10 Jul 2013 18:06:16 -0000 1.6 +++ Dipole.hh 14 Nov 2013 00:47:19 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/bfield/Dipole.hh,v 1.6 2013/07/10 18:06:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,8 +13,7 @@
* @brief The Geant4 implementation of a parameterized dipole B-field with one or more numerical cofficients. * @todo This class's algorithm for computing B-field components from coefficients needs to be documented. */
-class Dipole: public G4MagneticField
-{
+class Dipole: public G4MagneticField {
public:
/**
diff -u -r1.6 -r1.7 --- FieldManager.hh 10 Jul 2013 18:06:16 -0000 1.6 +++ FieldManager.hh 14 Nov 2013 00:47:19 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/bfield/FieldManager.hh,v 1.6 2013/07/10 18:06:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -14,14 +14,13 @@
/** * @brief The manager for B-field implementation classes defined by LCDD. */
-class FieldManager
-{
+class FieldManager {
public:
- /** - * Class destructor. - */
+ /** + * Class destructor. + */
virtual ~FieldManager();
/**
diff -u -r1.7 -r1.8 --- MagneticFieldOverlay.hh 10 Jul 2013 18:06:16 -0000 1.7 +++ MagneticFieldOverlay.hh 14 Nov 2013 00:47:19 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/bfield/MagneticFieldOverlay.hh,v 1.7 2013/07/10 18:06:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,8 +11,7 @@
/** * @brief Overlays B-field values from multiple G4MagneticField objects. */
-class MagneticFieldOverlay: public G4MagneticField
-{
+class MagneticFieldOverlay: public G4MagneticField {
public:
/**
diff -u -r1.7 -r1.8 --- RZBData.hh 10 Jul 2013 18:16:52 -0000 1.7 +++ RZBData.hh 14 Nov 2013 00:47:19 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/bfield/RZBData.hh,v 1.7 2013/07/10 18:16:52 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -7,8 +7,7 @@
* @brief A single data row for the RZFieldMap. * @note Defines radius, z dimension, radial B-field component, and z B-field component. */
-class RZBData
-{
+class RZBData {
public:
/**
diff -u -r1.4 -r1.5 --- RZFieldMap.hh 10 Jul 2013 18:06:16 -0000 1.4 +++ RZFieldMap.hh 14 Nov 2013 00:47:19 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/bfield/RZFieldMap.hh,v 1.4 2013/07/10 18:06:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -16,19 +16,18 @@
/** * @brief Magnetic field in RZ defined by rows of RZBData objects. */
-class RZFieldMap: public G4MagneticField
-{
+class RZFieldMap: public G4MagneticField {
public:
- /** - * Class constructor. - * @param[in] numBinsR The number of bins in R. - * @param[in] numBinsZ The number of bins in Z. - * @param[in] gridSizeR The size of a cell in R. - * @param[in] gridSizeZ The size of a cell in Z. - * @param[in] fieldData A list of RZBData forming the B-field grid. - */
+ /** + * Class constructor. + * @param[in] numBinsR The number of bins in R. + * @param[in] numBinsZ The number of bins in Z. + * @param[in] gridSizeR The size of a cell in R. + * @param[in] gridSizeZ The size of a cell in Z. + * @param[in] fieldData A list of RZBData forming the B-field grid. + */
RZFieldMap(int numBinsR, int numBinsZ, double gridSizeR, double gridSizeZ, std::vector<RZBData> fieldData);
/**
@@ -42,7 +41,7 @@
* Implementation of G4MagneticField::Initialize.
* @param[in] Point A point in global coordinates.
* @param[out] Bfield The B-field values at the point.
- */
+ */
void GetFieldValue(const double Point[3], double *Bfield) const; private:
diff -u -r1.5 -r1.6 --- Solenoid.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ Solenoid.hh 14 Nov 2013 00:47:19 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/bfield/Solenoid.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,15 +13,14 @@
* @brief Implementation of a simple solenoidal field with fixed B-field values. * @todo Apply maximum Z value to cut-off field. */
-class Solenoid: public G4MagneticField
-{
+class Solenoid: public G4MagneticField {
public:
- /** - * Class constructor. - * @todo Add fully qualified constructor. - */
+ /** + * Class constructor. + * @todo Add fully qualified constructor. + */
Solenoid();
/**
diff -u -r1.5 -r1.6 --- GeometryManager.hh 10 Jul 2013 18:06:16 -0000 1.5 +++ GeometryManager.hh 14 Nov 2013 00:47:19 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/GeometryManager.hh,v 1.5 2013/07/10 18:06:16 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/core/GeometryManager.hh,v 1.6 2013/11/14 00:47:19 jeremy Exp $
#ifndef LCDD_GEOMETRYMANAGER_HH #define LCDD_GEOMETRYMANAGER_HH 1
@@ -11,13 +11,12 @@
/** * @brief Singleton geometry manager class with miscellaneous utility and management functions. */
-class GeometryManager
-{
+class GeometryManager {
public:
- /** - * Class destructor. - */
+ /** + * Class destructor. + */
virtual ~GeometryManager();
/**
@@ -71,14 +70,14 @@
* daughters.
* @note Overlaps are printed to cout by Geant4.
*/
- void checkOverlaps(G4LogicalVolume*, bool recurse=true) const;
+ void checkOverlaps(G4LogicalVolume*, bool recurse = true) const;
/**
* Check for overlaps of a named logical volume by looking it
* up in the volume store, with possible recursion to daughters.
* @note Overlaps are print to cout by Geant4.
*/
- void checkOverlaps(const G4String&, bool recurse=true) const;
+ void checkOverlaps(const G4String&, bool recurse = true) const;
private:
diff -u -r1.5 -r1.6 --- LCDDDetectorConstruction.hh 10 Jul 2013 18:06:16 -0000 1.5 +++ LCDDDetectorConstruction.hh 14 Nov 2013 00:47:19 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDDetectorConstruction.hh,v 1.5 2013/07/10 18:06:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -16,14 +16,13 @@
* @brief Implementation of G4VUserDetectorConstruction for LCDD geometries. * @note This class has minimal functionality; it mostly hands control to other LCDD classes. */
-class LCDDDetectorConstruction: public G4VUserDetectorConstruction
-{
+class LCDDDetectorConstruction: public G4VUserDetectorConstruction {
public:
- /** - * Class constructor. - */
+ /** + * Class constructor. + */
LCDDDetectorConstruction();
/**
diff -u -r1.6 -r1.7 --- LCDDMessenger.hh 10 Jul 2013 18:06:16 -0000 1.6 +++ LCDDMessenger.hh 14 Nov 2013 00:47:19 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDMessenger.hh,v 1.6 2013/07/10 18:06:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -14,14 +14,13 @@
* @brief G4UImessenger implementation for various LCDD commands. * @todo This class should create the "stores" directory also. */
-class LCDDMessenger: public G4UImessenger
-{
+class LCDDMessenger: public G4UImessenger {
public:
- /** - * Class constructor. - */
+ /** + * Class constructor. + */
LCDDMessenger();
/**
diff -u -r1.7 -r1.8 --- LCDDObjectStoreInspector.hh 10 Jul 2013 20:49:05 -0000 1.7 +++ LCDDObjectStoreInspector.hh 14 Nov 2013 00:47:19 -0000 1.8 @@ -1,4 +1,4 @@
-// $Id: LCDDObjectStoreInspector.hh,v 1.7 2013/07/10 20:49:05 jeremy Exp $
+// $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
@@ -13,17 +13,15 @@
* @bug For some reason moving the code to a source file results in duplicate symbols, so * it is left here for now. */
-class LCDDObjectStoreInspector
-{
+class LCDDObjectStoreInspector {
public:
- /**
- * Class constructor.
- * @brief Constructor that defines instances of StoreInspector for specific types.
- */
- LCDDObjectStoreInspector()
- {
+ /**
+ * Class constructor.
+ * @brief Constructor that defines instances of StoreInspector for specific types.
+ */
+ LCDDObjectStoreInspector() {
_materialInspector = new G4MaterialStoreInspector("G4Material", G4Material::GetMaterialTable());
_solidInspector = new G4SolidStoreInspector("G4VSolid", G4SolidStore::GetInstance());
_limitsetInspector = new G4LimitSetInspector("G4LimitSet", LCDDProcessor::instance()->getLimitSetStore());
@@ -39,8 +37,7 @@
/**
* Class destructor.
*/
- virtual ~LCDDObjectStoreInspector()
- {
+ virtual ~LCDDObjectStoreInspector() {
delete _materialInspector;
delete _solidInspector;
delete _limitsetInspector;
diff -u -r1.8 -r1.9 --- LCDDParser.hh 10 Jul 2013 22:39:26 -0000 1.8 +++ LCDDParser.hh 14 Nov 2013 00:47:19 -0000 1.9 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDParser.hh,v 1.8 2013/07/10 22:39:26 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,15 +12,14 @@
/** * @brief The parser for reading LCDD XML files into Geant4. */
-class LCDDParser
-{
+class LCDDParser {
private:
- /** - * Class constructor, which is private because this class - * is accessed as a singleton. - */
+ /** + * Class constructor, which is private because this class + * is accessed as a singleton. + */
LCDDParser(); public:
diff -u -r1.6 -r1.7 --- LCDDProcessor.hh 10 Jul 2013 18:06:16 -0000 1.6 +++ LCDDProcessor.hh 14 Nov 2013 00:47:19 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDProcessor.hh,v 1.6 2013/07/10 18:06:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -22,14 +22,13 @@
* @brief Registers LCDD objects as they are created, generally from XML subscribers. * @note This is the LCDD equivalent of the GDMLProcessor class. */
-class LCDDProcessor
-{
+class LCDDProcessor {
private:
- /** - * Class constructor, which is private because class is accessed via singleton. - */
+ /** + * Class constructor, which is private because class is accessed via singleton. + */
LCDDProcessor(); public:
diff -u -r1.2 -r1.3 --- BasicTrackerHitProcessor.hh 22 Aug 2013 22:32:16 -0000 1.2 +++ BasicTrackerHitProcessor.hh 14 Nov 2013 00:47:19 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/BasicTrackerHitProcessor.hh,v 1.2 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -10,8 +10,7 @@
/** * @brief Implements default TrackerSD hit processing behavior. */
-class BasicTrackerHitProcessor : public TrackerHitProcessor
-{
+class BasicTrackerHitProcessor: public TrackerHitProcessor {
public:
@@ -36,22 +35,18 @@
/** * The factory for creating new BasicTrackerHitProcessor objects. */
-class BasicTrackerHitProcessorFactory : public HitProcessorFactory
-{
+class BasicTrackerHitProcessorFactory: public HitProcessorFactory {
public:
- HitProcessor* createHitProcessor(SensitiveDetector* sd)
- {
+ HitProcessor* createHitProcessor(SensitiveDetector* sd) {
return new BasicTrackerHitProcessor(dynamic_cast<TrackerSD*>(sd));
}
- const std::string& handlesType()
- {
+ const std::string& handlesType() {
static std::string typeName = "BasicTrackerHitProcessor";
return typeName;
}
};
-
#endif
diff -u -r1.11 -r1.12 --- CalorimeterHitProcessor.hh 22 Aug 2013 22:32:16 -0000 1.11 +++ CalorimeterHitProcessor.hh 14 Nov 2013 00:47:19 -0000 1.12 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/CalorimeterHitProcessor.hh,v 1.11 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,8 +13,7 @@
/** * @brief Interface for processing step data to produce CalorimeterHits. */
-class CalorimeterHitProcessor : public HitProcessor
-{
+class CalorimeterHitProcessor: public HitProcessor {
public:
diff -u -r1.11 -r1.12 --- CalorimeterSD.hh 17 Sep 2013 00:28:25 -0000 1.11 +++ CalorimeterSD.hh 14 Nov 2013 00:47:19 -0000 1.12 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/CalorimeterSD.hh,v 1.11 2013/09/17 00:28:25 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -14,14 +14,13 @@
* @brief The implementation of a calorimeter that accumulates energy depositions by event. * @todo Rewrite print functions using new data structures. Old hit vector was removed. */
-class CalorimeterSD: public SensitiveDetector
-{
+class CalorimeterSD: public SensitiveDetector {
public:
- /** - * Type definition for a list of LCDD CalorimeterHit objects. - */
+ /** + * Type definition for a list of LCDD CalorimeterHit objects. + */
typedef std::vector<CalorimeterHit*> CalorimeterHitList; public:
@@ -52,7 +51,6 @@
* @param[in] compare The hit comparator to be used by this detector.
*/
//CalorimeterSD(G4String sdName, Segmentation* sdSeg);
-
/**
* Class destructor.
*/
diff -u -r1.5 -r1.6 --- Cerenkov.hh 10 Jul 2013 16:49:45 -0000 1.5 +++ Cerenkov.hh 14 Nov 2013 00:47:19 -0000 1.6 @@ -1,20 +1,5 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/Cerenkov.hh,v 1.5 2013/07/10 16:49:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/Cerenkov.hh,v 1.6 2013/11/14 00:47:19 jeremy Exp $
-/* ------------------------------------------------------------------------ - |\___/| - ) ( - =\ /= - )===( - / \ CaTS: Calorimeter and Tracker Simulation - | | Author: Hans Wenzel (Fermilab) - / \ - \ / - \__ _/ - ( ( - ) ) - (_( - -------------------------------------------------------------------------*/ -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#ifndef LCDD_DETECTORS_CERENKOV_HH #define LCDD_DETECTORS_CERENKOV_HH 1
@@ -26,18 +11,17 @@
// STL #include <vector>
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
/**
- * @brief A physics utility class for use by OpticalCalorimeterSD.
+ * @class Cerenkov + * @brief A physics utility class modeling optical photon production. + * @author Hans Wenzel
*/
-class Cerenkov
-{
+class Cerenkov {
public:
- /** - * Class constructor. - */
+ /** + * Class constructor. + */
Cerenkov();
/**
@@ -64,7 +48,5 @@
std::vector<G4MaterialPropertyVector*> _refractionIndeces; };
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
#endif
diff -u -r1.6 -r1.7 --- HitComparator.hh 10 Jul 2013 18:06:17 -0000 1.6 +++ HitComparator.hh 14 Nov 2013 00:47:19 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/HitComparator.hh,v 1.6 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -6,18 +6,17 @@
#include "lcdd/hits/CalorimeterHit.hh" /**
+ * @class HitComparator
* @brief Interface for comparing two LCDD CalorimeterHit objects. */
-class HitComparator
-{
+class HitComparator {
public:
- /**
- * Class destructor.
- */
- virtual ~HitComparator()
- {
+ /**
+ * Class destructor.
+ */
+ virtual ~HitComparator() {
} public:
diff -u -r1.3 -r1.4 --- HitProcessor.hh 22 Aug 2013 22:32:16 -0000 1.3 +++ HitProcessor.hh 14 Nov 2013 00:47:19 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/HitProcessor.hh,v 1.3 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,8 +9,7 @@
/** * @brief Pure virtual class defining an interface for processing hits from within sensitive detectors. */
-class HitProcessor
-{
+class HitProcessor {
protected:
diff -u -r1.2 -r1.3 --- HitProcessorFactory.hh 22 Aug 2013 22:32:16 -0000 1.2 +++ HitProcessorFactory.hh 14 Nov 2013 00:47:19 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/HitProcessorFactory.hh,v 1.2 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -7,8 +7,7 @@
#include "lcdd/detectors/HitProcessor.hh" #include "lcdd/detectors/SensitiveDetector.hh"
-class HitProcessorFactory
-{
+class HitProcessorFactory {
public:
/**
diff -u -r1.2 -r1.3 --- HitProcessorManager.hh 22 Aug 2013 22:32:16 -0000 1.2 +++ HitProcessorManager.hh 14 Nov 2013 00:47:19 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/HitProcessorManager.hh,v 1.2 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -6,8 +6,7 @@
// LCDD #include "lcdd/detectors/HitProcessorFactory.hh"
-class HitProcessorManager
-{
+class HitProcessorManager {
private:
diff -u -r1.3 -r1.4 --- LegacyCalorimeterHitProcessor.hh 22 Aug 2013 22:32:16 -0000 1.3 +++ LegacyCalorimeterHitProcessor.hh 14 Nov 2013 00:47:19 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/LegacyCalorimeterHitProcessor.hh,v 1.3 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,8 +12,7 @@
* @brief Implementation of hit processing behavior for CalorimeterSD objects with Segmentation. * @todo Change name to SegmentedCalorimeterHitProcessor. */
-class LegacyCalorimeterHitProcessor : public CalorimeterHitProcessor
-{
+class LegacyCalorimeterHitProcessor: public CalorimeterHitProcessor {
public:
@@ -37,18 +36,15 @@
/** * The factory for creating new LegacyCalorimeterHitProcessor objects. */
-class LegacyCalorimeterHitProcessorFactory : public HitProcessorFactory
-{
+class LegacyCalorimeterHitProcessorFactory: public HitProcessorFactory {
public:
- HitProcessor* createHitProcessor(SensitiveDetector* sd)
- {
+ HitProcessor* createHitProcessor(SensitiveDetector* sd) {
return new LegacyCalorimeterHitProcessor(dynamic_cast<CalorimeterSD*>(sd));
}
- const std::string& handlesType()
- {
+ const std::string& handlesType() {
static std::string typeName = "LegacyCalorimeterHitProcessor";
return typeName;
}
diff -u -r1.6 -r1.7 --- PositionComparator.hh 10 Jul 2013 18:06:17 -0000 1.6 +++ PositionComparator.hh 14 Nov 2013 00:47:19 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/PositionComparator.hh,v 1.6 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -8,8 +8,7 @@
/** * @brief HitComparator that compares CalorimeterHit objects for equality using their positions. */
-class PositionComparator: public HitComparator
-{
+class PositionComparator: public HitComparator {
public:
@@ -18,9 +17,9 @@
*/
PositionComparator();
- /** - * Class destructor. - */
+ /** + * Class destructor. + */
virtual ~PositionComparator(); public:
diff -u -r1.4 -r1.5 --- ReadoutUtil.hh 10 Jul 2013 18:06:17 -0000 1.4 +++ ReadoutUtil.hh 14 Nov 2013 00:47:19 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/ReadoutUtil.hh,v 1.4 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -20,23 +20,20 @@
/** * @brief Static utility functions for use by detector and readout classes. */
-class ReadoutUtil
-{
+class ReadoutUtil {
private:
- /**
- * Class constructor, which is private because class should not be instantiated.
- */
- ReadoutUtil()
- {
+ /**
+ * Class constructor, which is private because class should not be instantiated.
+ */
+ ReadoutUtil() {
}
/**
* Class destructor, which is private because class is never instantiated.
*/
- virtual ~ReadoutUtil()
- {
+ virtual ~ReadoutUtil() {
} public:
@@ -178,7 +175,7 @@
/**
* @todo Remove this method.
- * @deprecated
+ * @deprecated
*/
static G4ThreeVector transformGlobalToLocal(const G4StepPoint* aPreStepPoint, const G4ThreeVector& globalPos);
diff -u -r1.2 -r1.3 --- ScoringTrackerHitProcessor.hh 22 Aug 2013 22:32:16 -0000 1.2 +++ ScoringTrackerHitProcessor.hh 14 Nov 2013 00:47:19 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/ScoringTrackerHitProcessor.hh,v 1.2 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -10,8 +10,7 @@
/** * HitProcessor to implement scoring behavior, that only records a hit per track. */
-class ScoringTrackerHitProcessor : public TrackerHitProcessor
-{
+class ScoringTrackerHitProcessor: public TrackerHitProcessor {
public:
@@ -40,18 +39,15 @@
/** * The factory for creating new BasicTrackerHitProcessor objects. */
-class ScoringTrackerHitProcessorFactory : public HitProcessorFactory
-{
+class ScoringTrackerHitProcessorFactory: public HitProcessorFactory {
public:
- HitProcessor* createHitProcessor(SensitiveDetector* sd)
- {
+ HitProcessor* createHitProcessor(SensitiveDetector* sd) {
return new ScoringTrackerHitProcessor(dynamic_cast<TrackerSD*>(sd));
}
- const std::string& handlesType()
- {
+ const std::string& handlesType() {
static std::string typeName = "ScoringTrackerHitProcessor";
return typeName;
}
diff -u -r1.8 -r1.9 --- SensitiveDetector.hh 14 Sep 2013 02:06:34 -0000 1.8 +++ SensitiveDetector.hh 14 Nov 2013 00:47:19 -0000 1.9 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/SensitiveDetector.hh,v 1.8 2013/09/14 02:06:34 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -21,32 +21,31 @@
* @note Primary attributes include verbosity, energy cut, * IdSpec,and hits collections. */
-class SensitiveDetector: public G4VSensitiveDetector, protected StepReadout
-{
+class SensitiveDetector: public G4VSensitiveDetector, protected StepReadout {
public:
- /**
- * EType indicates the basic type of detector, e.g. tracker or calorimeter.
- */
- enum EType {
- eNone = 0, eTracker = 1, eCalorimeter = 2
- };
-
- static const std::string& trackerStr;
- static const std::string& calorimeterStr;
- static const std::string& noneStr;
+ /**
+ * EType indicates the basic type of detector, e.g. tracker or calorimeter.
+ */
+ enum EType {
+ eNone = 0, eTracker = 1, eCalorimeter = 2
+ };
+
+ static const std::string& trackerStr;
+ static const std::string& calorimeterStr;
+ static const std::string& noneStr;
- typedef std::vector<HitProcessor*> HitProcessors;
+ typedef std::vector<HitProcessor*> HitProcessors;
public:
- /** - * Class constructor. - * @param[in] sdName The name of the detector. - * @param[in] hcName The name of the hit collection. - * @param[in] sdType The type of the detector. - */ - SensitiveDetector(G4String sdName, G4String hcName, EType sdType);
+ /** + * Class constructor. + * @param[in] sdName The name of the detector. + * @param[in] hcName The name of the hit collection. + * @param[in] sdType The type of the detector. + */ + SensitiveDetector(G4String sdName, G4String hcName, EType sdType);
/**
* Class constructor.
@@ -54,163 +53,163 @@
* @param[in] hcNames The names of the hit collections.
* @param[in] sdType The type of the detector.
*/
- SensitiveDetector(G4String sdName, const std::vector<G4String>& hcNames, EType sdType);
+ SensitiveDetector(G4String sdName, const std::vector<G4String>& hcNames, EType sdType);
+
+ /**
+ * Class destructor.
+ */
+ virtual ~SensitiveDetector();
+
+ /**
+ * Geant4 initialization function called at beginning of event.
+ * @param[in] hce The hit collections of this event.
+ */
+ virtual void Initialize(G4HCofThisEvent* hce);
+
+ /**
+ * Geant4 EndOfEvent hook.
+ * @param[in] hce The hit collections of this event.
+ */
+ virtual void EndOfEvent(G4HCofThisEvent* hce);
+
+ /**
+ * Get the type of this detector encoded as an enum.
+ * @return The type of this detector as an enum.
+ */
+ SensitiveDetector::EType getType() const;
+
+ /**
+ * Get the type of this detector encoded as a string.
+ */
+ const std::string& getTypeString() const;
+
+ /**
+ * Get the hit collection ID associated with this detector.
+ * @return The hit collection ID.
+ */
+ G4int getHCID() const;
+
+ /**
+ * Get the hit collection ID from the index.
+ * @param[in] nHC The hit collection index.
+ * @return The hit collection ID.
+ */
+ G4int getHCID(G4int nHC) const;
+
+ /**
+ * Check whether the G4LogicalVolume can be readout by this detector.
+ * Base function just checks that the volume is not null.
+ * @param[in] lv The G4LogicalVolume object.
+ * @return True if volume is valid; false if not.
+ */
+ virtual bool isValidVolume(G4LogicalVolume* lv);
+
+ /**
+ * Get the hit collection name associated with this detector.
+ * @return The name of the hit collection.
+ */
+ const std::string& getHCName() const;
+
+ /**
+ * Get the hit collection by index.
+ * @return The hit collection by index.
+ */
+ const std::string& getHCName(G4int nHC) const;
+
+ /**
+ * Set the verbosity level of this detector.
+ * @param[in] v The verbosity level.
+ */
+ void setVerbose(unsigned int v);
+
+ /**
+ * Get the verbosity level of this detector.
+ * @return The verbosity level of this detector.
+ */
+ unsigned int getVerbose() const;
+
+ /**
+ * Get the hit energy cut of this detector (GeV).
+ * @return The energy cut.
+ */
+ G4double getEnergyCut();
+
+ /**
+ * Set the hit energy cut of this detector.
+ * @param[in] ecut The energy cut.
+ */
+ void setEcut(G4double ecut);
+
+ /**
+ * Set the identifier specification for this detector.
+ * @param[in] idspec The identifier specification.
+ */
+ void setIdSpec(IdSpec* idspec);
+
+ /**
+ * Get the identifier specification for this detector.
+ * @return The identifier specification.
+ */
+ IdSpec* getIdSpec() const;
+
+ /**
+ * Check whether this detector has an associated identifier specification.
+ * @return True if detector has identifier specification; false if not.
+ */
+ bool hasIdSpec() const;
+
+ /**
+ * Set the endcap flag.
+ * @param[in] ec Set the endcap flag.
+ */
+ void setEndcapFlag(bool ec = true);
- /** - * Class destructor. - */ - virtual ~SensitiveDetector(); - - /** - * Geant4 initialization function called at beginning of event. - * @param[in] hce The hit collections of this event. - */ - virtual void Initialize(G4HCofThisEvent* hce); - - /** - * Geant4 EndOfEvent hook. - * @param[in] hce The hit collections of this event. - */ - virtual void EndOfEvent(G4HCofThisEvent* hce); - - /** - * Get the type of this detector encoded as an enum. - * @return The type of this detector as an enum. - */ - SensitiveDetector::EType getType() const; - - /** - * Get the type of this detector encoded as a string. - */ - const std::string& getTypeString() const; - - /** - * Get the hit collection ID associated with this detector. - * @return The hit collection ID. - */ - G4int getHCID() const; - - /** - * Get the hit collection ID from the index. - * @param[in] nHC The hit collection index. - * @return The hit collection ID. - */ - G4int getHCID(G4int nHC) const; - - /** - * Check whether the G4LogicalVolume can be readout by this detector. - * Base function just checks that the volume is not null. - * @param[in] lv The G4LogicalVolume object. - * @return True if volume is valid; false if not. - */ - virtual bool isValidVolume(G4LogicalVolume* lv); - - /** - * Get the hit collection name associated with this detector. - * @return The name of the hit collection. - */ - const std::string& getHCName() const; - - /** - * Get the hit collection by index. - * @return The hit collection by index. - */ - const std::string& getHCName(G4int nHC) const; - - /** - * Set the verbosity level of this detector. - * @param[in] v The verbosity level. - */ - void setVerbose(unsigned int v); - - /** - * Get the verbosity level of this detector. - * @return The verbosity level of this detector. - */ - unsigned int getVerbose() const; - - /** - * Get the hit energy cut of this detector (GeV). - * @return The energy cut. - */ - G4double getEnergyCut(); - - /** - * Set the hit energy cut of this detector. - * @param[in] ecut The energy cut. - */ - void setEcut(G4double ecut); - - /** - * Set the identifier specification for this detector. - * @param[in] idspec The identifier specification. - */ - void setIdSpec(IdSpec* idspec); - - /** - * Get the identifier specification for this detector. - * @return The identifier specification. - */ - IdSpec* getIdSpec() const; - - /** - * Check whether this detector has an associated identifier specification. - * @return True if detector has identifier specification; false if not. - */ - bool hasIdSpec() const; - - /** - * Set the endcap flag. - * @param[in] ec Set the endcap flag. - */ - void setEndcapFlag(bool ec = true); - - /** - * Get the endcap flag. - * @return The flag indicating endcap or not. - */ - bool getEndcapFlag(); - - /** - * Print basic information about this detector. - * @param[in] os The output stream. - * @return The same output stream. - */ - virtual std::ostream& printBasicInfo(std::ostream& os); - - /** - * Print the number of hits to the output stream. - * @param[in] os The output stream. - * @return The same output stream. - */ - virtual std::ostream& printNumberOfHits(std::ostream& os); - - /** - * Print the number of hits to the output stream. - * @param[in] os The output stream. - * @return The same output stream. - */ - virtual std::ostream& printEdep(std::ostream& os); - - /** - * Print the names of volumes associated to this detector. - * @param[in] os The output stream. - * @return The same output stream. - */ - virtual std::ostream& printVolumes(std::ostream& os); - - /** - * Print the list of hits. Subclasses must implement this. - * @param[in] os The output stream. - * @return The same output stream. - */ - virtual std::ostream& printHits(std::ostream& os); - - /** - * Get the number of hits collections associated to this detector. - * @return The number of hit collections. - */ - int getNumberOfHitsCollections() const;
+ /** + * Get the endcap flag. + * @return The flag indicating endcap or not. + */ + bool getEndcapFlag(); + + /** + * Print basic information about this detector. + * @param[in] os The output stream. + * @return The same output stream. + */ + virtual std::ostream& printBasicInfo(std::ostream& os); + + /** + * Print the number of hits to the output stream. + * @param[in] os The output stream. + * @return The same output stream. + */ + virtual std::ostream& printNumberOfHits(std::ostream& os); + + /** + * Print the number of hits to the output stream. + * @param[in] os The output stream. + * @return The same output stream. + */ + virtual std::ostream& printEdep(std::ostream& os); + + /** + * Print the names of volumes associated to this detector. + * @param[in] os The output stream. + * @return The same output stream. + */ + virtual std::ostream& printVolumes(std::ostream& os); + + /** + * Print the list of hits. Subclasses must implement this. + * @param[in] os The output stream. + * @return The same output stream. + */ + virtual std::ostream& printHits(std::ostream& os); + + /** + * Get the number of hits collections associated to this detector. + * @return The number of hit collections. + */ + int getNumberOfHitsCollections() const;
/**
* Get the total energy deposition from the hits of this detector.
diff -u -r1.6 -r1.7 --- SensitiveDetectorFactory.hh 10 Sep 2013 21:57:32 -0000 1.6 +++ SensitiveDetectorFactory.hh 14 Nov 2013 00:47:19 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/SensitiveDetectorFactory.hh,v 1.6 2013/09/10 21:57:32 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -26,23 +26,20 @@
/** * @brief Creates SensitiveDetector objects from detector tag names and parameters. */
-class SensitiveDetectorFactory
-{
+class SensitiveDetectorFactory {
private:
- /**
- * Class constructor which is private.
- */
- SensitiveDetectorFactory()
- {
+ /**
+ * Class constructor which is private.
+ */
+ SensitiveDetectorFactory() {
}
/**
* Class destructor.
*/
- virtual ~SensitiveDetectorFactory()
- {
+ virtual ~SensitiveDetectorFactory() {
} public:
diff -u -r1.6 -r1.7 --- SensitiveDetectorMessenger.hh 10 Jul 2013 18:06:17 -0000 1.6 +++ SensitiveDetectorMessenger.hh 14 Nov 2013 00:47:19 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/SensitiveDetectorMessenger.hh,v 1.6 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -19,15 +19,14 @@
/** * @brief Geant4 messenger providing macro command interface to SensitiveDetector objects. */
-class SensitiveDetectorMessenger: public G4UImessenger
-{
+class SensitiveDetectorMessenger: public G4UImessenger {
public:
- /** - * Class constructor. - * @param[in] detector The SensitiveDetector to connect to the messenger. - */
+ /** + * Class constructor. + * @param[in] detector The SensitiveDetector to connect to the messenger. + */
SensitiveDetectorMessenger(SensitiveDetector* detector);
/**
diff -u -r1.2 -r1.3 --- StepCombiningTrackerHitProcessor.hh 22 Aug 2013 22:32:16 -0000 1.2 +++ StepCombiningTrackerHitProcessor.hh 14 Nov 2013 00:47:19 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/StepCombiningTrackerHitProcessor.hh,v 1.2 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -14,8 +14,7 @@
* TrackerHitProcessor that combines information from multiple steps * into a single TrackerHit. */
-class StepCombiningTrackerHitProcessor : public TrackerHitProcessor
-{
+class StepCombiningTrackerHitProcessor: public TrackerHitProcessor {
public:
/**
@@ -78,18 +77,15 @@
/** * The factory for creating new BasicTrackerHitProcessor objects. */
-class StepCombiningTrackerHitProcessorFactory : public HitProcessorFactory
-{
+class StepCombiningTrackerHitProcessorFactory: public HitProcessorFactory {
public:
- HitProcessor* createHitProcessor(SensitiveDetector* sd)
- {
+ HitProcessor* createHitProcessor(SensitiveDetector* sd) {
return new StepCombiningTrackerHitProcessor(dynamic_cast<TrackerSD*>(sd));
}
- const std::string& handlesType()
- {
+ const std::string& handlesType() {
static std::string typeName = "StepCombiningTrackerHitProcessor";
return typeName;
}
diff -u -r1.4 -r1.5 --- StepReadout.hh 10 Jul 2013 18:06:17 -0000 1.4 +++ StepReadout.hh 14 Nov 2013 00:47:19 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/StepReadout.hh,v 1.4 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -29,14 +29,13 @@
* @brief Static utility functions to access derived information of a G4Step object. * @note The only cached data member of this class is the step pointer. */
-class StepReadout
-{
+class StepReadout {
public:
- /** - * Class constructor. - */
+ /** + * Class constructor. + */
StepReadout();
/**
diff -u -r1.2 -r1.3 --- TrackerHitProcessor.hh 22 Aug 2013 22:32:16 -0000 1.2 +++ TrackerHitProcessor.hh 14 Nov 2013 00:47:20 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/TrackerHitProcessor.hh,v 1.2 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -8,8 +8,7 @@
/** * @brief The interface for hit processing in trackers. */
-class TrackerHitProcessor : public HitProcessor
-{
+class TrackerHitProcessor: public HitProcessor {
public:
/**
diff -u -r1.7 -r1.8 --- TrackerSD.hh 17 Sep 2013 00:25:40 -0000 1.7 +++ TrackerSD.hh 14 Nov 2013 00:47:20 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/TrackerSD.hh,v 1.7 2013/09/17 00:25:40 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -10,8 +10,7 @@
/** * @brief The basic binding for a tracker type subdetector that records individual step information. */
-class TrackerSD: public SensitiveDetector
-{
+class TrackerSD: public SensitiveDetector {
public:
//typedef std::vector<TrackerHit*> TrackerHitList;
@@ -67,7 +66,6 @@
* @return The list of tracker hits.
*/
//G4TrackerHitList getTrackerHitList();
-
/**
* Add a TrackerHit.
* @param[in] hit The Tracker hit to add.
diff -u -r1.2 -r1.3 --- UnsegmentedCalorimeterHitProcessor.hh 22 Aug 2013 22:32:16 -0000 1.2 +++ UnsegmentedCalorimeterHitProcessor.hh 14 Nov 2013 00:47:20 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/UnsegmentedCalorimeterHitProcessor.hh,v 1.2 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -10,8 +10,7 @@
/** * HitProcessor that produces CalorimeterHit objects with no virtual geometry segmentation. */
-class UnsegmentedCalorimeterHitProcessor : public CalorimeterHitProcessor
-{
+class UnsegmentedCalorimeterHitProcessor: public CalorimeterHitProcessor {
public:
@@ -36,18 +35,15 @@
/** * The factory for creating new UnsegmentedCalorimeterHitProcessor objects. */
-class UnsegmentedCalorimeterHitProcessorFactory : public HitProcessorFactory
-{
+class UnsegmentedCalorimeterHitProcessorFactory: public HitProcessorFactory {
public:
- HitProcessor* createHitProcessor(SensitiveDetector* sd)
- {
+ HitProcessor* createHitProcessor(SensitiveDetector* sd) {
return new UnsegmentedCalorimeterHitProcessor(dynamic_cast<CalorimeterSD*>(sd));
}
- const std::string& handlesType()
- {
+ const std::string& handlesType() {
static std::string typeName = "UnsegmentedCalorimeterHitProcessor";
return typeName;
}
diff -u -r1.5 -r1.6 --- LCDDHeaderRecord.hh 10 Jul 2013 18:16:35 -0000 1.5 +++ LCDDHeaderRecord.hh 14 Nov 2013 00:47:20 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/geant4/LCDDHeaderRecord.hh,v 1.5 2013/07/10 18:16:35 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,27 +11,26 @@
* @brief This is the header record for an LCDD geometry. * @todo Move code to source file. */
-class LCDDHeaderRecord
-{
+class LCDDHeaderRecord {
public:
- /** - * Class constructor. - */ - LCDDHeaderRecord(); - - /** - * Class destructor. - */ - virtual ~LCDDHeaderRecord();
+ /** + * Class constructor. + */ + LCDDHeaderRecord(); + + /** + * Class destructor. + */ + virtual ~LCDDHeaderRecord();
public:
- /** - * Set the name of the detector. - * @param[in] dn The name of the detector. - */
+ /** + * Set the name of the detector. + * @param[in] dn The name of the detector. + */
void setDetectorName(const std::string& dn);
/**
diff -u -r1.5 -r1.6 --- PhysVolId.hh 10 Jul 2013 18:35:40 -0000 1.5 +++ PhysVolId.hh 14 Nov 2013 00:47:20 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/geant4/PhysVolId.hh,v 1.5 2013/07/10 18:35:40 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -10,8 +10,7 @@
/** * @brief Physical volume IDs that are attached to G4VPhysicalVolume objects. */
-class PhysVolId
-{
+class PhysVolId {
public:
typedef int ValueType;
diff -u -r1.7 -r1.8 --- PhysVolIdMap.hh 10 Jul 2013 22:39:26 -0000 1.7 +++ PhysVolIdMap.hh 14 Nov 2013 00:47:20 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/geant4/PhysVolIdMap.hh,v 1.7 2013/07/10 22:39:26 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -21,8 +21,7 @@
/** * @brief Maps G4VPhysicalVolume pointers to a vector of associated ints for identification. */
-class PhysVolIdMap: private PhysVolIdMapType
-{
+class PhysVolIdMap: private PhysVolIdMapType {
public:
diff -u -r1.3 -r1.4 --- PhysicsLimitSet.hh 10 Jul 2013 18:16:52 -0000 1.3 +++ PhysicsLimitSet.hh 14 Nov 2013 00:47:20 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/geant4/PhysicsLimitSet.hh,v 1.3 2013/07/10 18:16:52 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -14,8 +14,7 @@
/** * @brief Looks up physics limits by particle type from the G4Track. */
-class PhysicsLimitSet: public G4UserLimits
-{
+class PhysicsLimitSet: public G4UserLimits {
public:
@@ -62,8 +61,7 @@
* Get the limit set map.
* @return The limit set map.
*/
- const LimitSetMap& getLimitSetMap() const
- {
+ const LimitSetMap& getLimitSetMap() const {
return _limitsMap;
}
@@ -112,7 +110,6 @@
*
*/
//void setName(const G4String& n);
-
/**
* Get the name of the PhysicsLimitSet.
* @return The name of this PhysicsLimitSet.
diff -u -r1.3 -r1.4 --- UserRegionInformation.hh 10 Jul 2013 18:06:17 -0000 1.3 +++ UserRegionInformation.hh 14 Nov 2013 00:47:20 -0000 1.4 @@ -1,4 +1,4 @@
-//$Header: /cvs/lcd/lcdd/include/lcdd/geant4/UserRegionInformation.hh,v 1.3 2013/07/10 18:06:17 jeremy Exp $
+//$Header: /cvs/lcd/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
@@ -15,8 +15,7 @@
/** * @brief Implements the G4VUserRegionInformation interface. */
-class UserRegionInformation: public G4VUserRegionInformation
-{
+class UserRegionInformation: public G4VUserRegionInformation {
public:
@@ -24,15 +23,13 @@
* Class constructor.
*/
UserRegionInformation() :
- _storeSecondaries(false), _killTracks(false)
- {
+ _storeSecondaries(false), _killTracks(false) {
}
/**
* Class destructor.
*/
- virtual ~UserRegionInformation()
- {
+ virtual ~UserRegionInformation() {
} public:
@@ -41,8 +38,7 @@
* Set whether secondary tracks will be stored in this region.
* @param[in] b The store secondaries setting.
*/
- void setStoreSecondaries(bool b)
- {
+ void setStoreSecondaries(bool b) {
_storeSecondaries = b;
}
@@ -50,8 +46,7 @@
* Get store secondaries setting which determines if secondary tracks are stored in this region.
* @return The store secondaries setting.
*/
- bool getStoreSecondaries() const
- {
+ bool getStoreSecondaries() const {
return _storeSecondaries;
}
@@ -59,8 +54,7 @@
* Set parameter to kill tracks after their first step into the region.
* @param[in] killTracks The kill tracks setting.
*/
- void setKillTracks(bool killTracks)
- {
+ void setKillTracks(bool killTracks) {
_killTracks = killTracks;
}
@@ -68,8 +62,7 @@
* Get the kill tracks setting.
* @return The kill tracks setting.
*/
- bool getKillTracks() const
- {
+ bool getKillTracks() const {
return _killTracks;
}
@@ -77,8 +70,7 @@
* Set the energy threshold.
* @param[in] t The energy threshold.
*/
- void setThreshold(double t)
- {
+ void setThreshold(double t) {
_threshold = t;
}
@@ -86,8 +78,7 @@
* Get the energy threshold.
* @return The energy threshold.
*/
- double getThreshold() const
- {
+ double getThreshold() const {
return _threshold;
}
@@ -95,8 +86,7 @@
* Print out the region information.
* @todo Implement this method.
*/
- void Print() const
- {
+ void Print() const {
} public:
@@ -106,8 +96,7 @@
* @param[in] aTrack A G4Track object.
* @return The region information.
*/
- static inline UserRegionInformation* getRegionInformation(const G4Track* aTrack)
- {
+ static inline UserRegionInformation* getRegionInformation(const G4Track* aTrack) {
return static_cast<UserRegionInformation*>(aTrack->GetLogicalVolumeAtVertex()->GetRegion()->GetUserInformation());
}
@@ -116,8 +105,7 @@
* @param[in] aStepPoint A G4StepPoint object.
* @return The region information.
*/
- static UserRegionInformation* getRegionInformation(const G4StepPoint* aStepPoint)
- {
+ static UserRegionInformation* getRegionInformation(const G4StepPoint* aStepPoint) {
return static_cast<UserRegionInformation*>(aStepPoint->GetPhysicalVolume()->GetLogicalVolume()->GetRegion()->GetUserInformation());
}
diff -u -r1.10 -r1.11 --- CalorimeterHit.hh 14 Sep 2013 02:06:35 -0000 1.10 +++ CalorimeterHit.hh 14 Nov 2013 00:47:20 -0000 1.11 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/CalorimeterHit.hh,v 1.10 2013/09/14 02:06:35 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -21,8 +21,7 @@
* @brief This class is an implementation of G4VHit for calorimeter hits. * @todo The endcap flag should be on the collection only, not individual hits. */
-class CalorimeterHit: public G4VHit
-{
+class CalorimeterHit: public G4VHit {
public:
@@ -182,8 +181,7 @@
/** * Implementation of custom new operator. */
-inline void* CalorimeterHit::operator new(size_t)
-{
+inline void* CalorimeterHit::operator new(size_t) {
void* aHit;
aHit = (void*) CalorimeterHitAllocator.MallocSingle();
return aHit;
@@ -192,8 +190,7 @@
/** * Implementation of custom delete operator. */
-inline void CalorimeterHit::operator delete(void *aHit)
-{
+inline void CalorimeterHit::operator delete(void *aHit) {
CalorimeterHitAllocator.FreeSingle((CalorimeterHit*) aHit); }
diff -u -r1.2 -r1.3 --- CalorimeterHitMap.hh 17 Sep 2013 00:28:48 -0000 1.2 +++ CalorimeterHitMap.hh 14 Nov 2013 00:47:20 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/CalorimeterHitMap.hh,v 1.2 2013/09/17 00:28:48 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -15,47 +15,46 @@
* This class maps CalorimeterHit objects to their 64-bit identifiers * for fast lookup with O(1) performance. */
-class CalorimeterHitMap
-{
+class CalorimeterHitMap {
- /** - * Type definition for map. - */ - typedef std::map<Id64bit::ValueType, CalorimeterHit*> MapType;
+ /** + * Type definition for map. + */ + typedef std::map<Id64bit::ValueType, CalorimeterHit*> MapType;
public:
- /** - * Class constructor. - */ - CalorimeterHitMap(); - - /** - * Class destructor. - */ - virtual ~CalorimeterHitMap(); - - /** - * Add a hit. - * @param hit The hit to add. - */ - void add(CalorimeterHit* hit); - - /** - * Get a hit by its 64-bit identifier. - * @param id The identifier of the hit. - * @return The matching hit or 0 if does not exist. - */ - CalorimeterHit* get(const Id64bit& id); - - /** - * Clear all entries from this hit map. - */ - void clear();
+ /** + * Class constructor. + */ + CalorimeterHitMap(); + + /** + * Class destructor. + */ + virtual ~CalorimeterHitMap(); + + /** + * Add a hit. + * @param hit The hit to add. + */ + void add(CalorimeterHit* hit); + + /** + * Get a hit by its 64-bit identifier. + * @param id The identifier of the hit. + * @return The matching hit or 0 if does not exist. + */ + CalorimeterHit* get(const Id64bit& id); + + /** + * Clear all entries from this hit map. + */ + void clear();
private:
- MapType _map;
+ MapType _map;
}; #endif
diff -u -r1.5 -r1.6 --- HitContribution.hh 10 Jul 2013 20:49:06 -0000 1.5 +++ HitContribution.hh 14 Nov 2013 00:47:20 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/HitContribution.hh,v 1.5 2013/07/10 20:49:06 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -20,8 +20,7 @@
* @brief Contribution of an MCParticle to a hit. * @note Used by CalorimeterHit class. */
-class HitContribution
-{
+class HitContribution {
public:
friend class CalorimeterHit;
diff -u -r1.8 -r1.9 --- TrackInformation.hh 10 Jul 2013 20:49:06 -0000 1.8 +++ TrackInformation.hh 14 Nov 2013 00:47:20 -0000 1.9 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackInformation.hh,v 1.8 2013/07/10 20:49:06 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackInformation.hh,v 1.9 2013/11/14 00:47:20 jeremy Exp $
#ifndef LCDD_HITS_TRACKINFORMATION_HH #define LCDD_HITS_TRACKINFORMATION_HH 1
@@ -11,19 +11,15 @@
* @brief Implements the G4VUserTrackInformation interface. * @todo Move code to source file. */
-class TrackInformation: public G4VUserTrackInformation
-{
+class TrackInformation: public G4VUserTrackInformation {
public:
/**
* Tracking status flag.
*/
- enum ETrackingStatus
- {
- eNone,
- eInTrackingRegion,
- eInNontrackingRegion
+ enum ETrackingStatus {
+ eNone, eInTrackingRegion, eInNontrackingRegion
}; public:
@@ -152,7 +148,6 @@
*/
bool getBackscatter() const;
-
/**
* Set the below threshold setting.
* @param[in] val The below threshold setting.
@@ -219,8 +214,7 @@
/** * Implementation of custom new operator. */
-inline void* TrackInformation::operator new(size_t)
-{
+inline void* TrackInformation::operator new(size_t) {
void* aTrackInfo;
aTrackInfo = (void*) TrackInformationAllocator.MallocSingle();
return aTrackInfo;
@@ -229,8 +223,7 @@
/** * Implementation of custom delete operator. */
-inline void TrackInformation::operator delete(void *aTrackInfo)
-{
+inline void TrackInformation::operator delete(void *aTrackInfo) {
TrackInformationAllocator.FreeSingle((TrackInformation*) aTrackInfo); }
diff -u -r1.7 -r1.8 --- TrackerHit.hh 2 Oct 2013 02:05:22 -0000 1.7 +++ TrackerHit.hh 14 Nov 2013 00:47:20 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackerHit.hh,v 1.7 2013/10/02 02:05:22 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -17,8 +17,7 @@
* @brief * A tracker hit class that implements the G4VHit interface. */
-class TrackerHit: public G4VHit
-{
+class TrackerHit: public G4VHit {
public:
/**
@@ -180,8 +179,7 @@
/** * Implementation of custom new operator. */
-inline void* TrackerHit::operator new(size_t)
-{
+inline void* TrackerHit::operator new(size_t) {
void* aHit;
aHit = (void*) G4TrackerHitAllocator.MallocSingle();
return aHit;
@@ -190,8 +188,7 @@
/** * Implementation of custom delete operator. */
-inline void TrackerHit::operator delete(void *aHit)
-{
+inline void TrackerHit::operator delete(void *aHit) {
G4TrackerHitAllocator.FreeSingle((TrackerHit*) aHit); }
diff -u -r1.7 -r1.8 --- Id64bit.hh 14 Sep 2013 02:06:35 -0000 1.7 +++ Id64bit.hh 14 Nov 2013 00:47:20 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/Id64bit.hh,v 1.7 2013/09/14 02:06:35 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -8,14 +8,13 @@
/** * @brief A 64-bit ID composed of two 32-bit halves. */
-class Id64bit
-{
+class Id64bit {
public:
- /** - * The type definition for a 32 bit half of the ID. - */
+ /** + * The type definition for a 32 bit half of the ID. + */
typedef int ElementType;
/**
diff -u -r1.7 -r1.8 --- IdComparator.hh 10 Jul 2013 20:49:06 -0000 1.7 +++ IdComparator.hh 14 Nov 2013 00:47:20 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdComparator.hh,v 1.7 2013/07/10 20:49:06 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -7,8 +7,7 @@
/** * @brief Compares the IDs of CalorimeterHit objects for equality. */
-class IdComparator: public HitComparator
-{
+class IdComparator: public HitComparator {
public:
diff -u -r1.6 -r1.7 --- IdFactory.hh 14 Sep 2013 02:06:35 -0000 1.6 +++ IdFactory.hh 14 Nov 2013 00:47:20 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdFactory.hh,v 1.6 2013/09/14 02:06:35 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -24,8 +24,7 @@
* @brief Produces IDs from step information. * @note It can also convert from an unpacked IdVec to a 64 bit packed ID. */
-class IdFactory
-{
+class IdFactory {
public:
typedef unsigned int Bits;
@@ -37,15 +36,13 @@
/**
* Class constructor. Should not be instantiated.
*/
- IdFactory()
- {
+ IdFactory() {
}
/**
* Class destructor.
*/
- virtual ~IdFactory()
- {
+ virtual ~IdFactory() {
} public:
@@ -108,14 +105,12 @@
* @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
diff -u -r1.4 -r1.5 --- IdField.hh 10 Jul 2013 20:49:06 -0000 1.4 +++ IdField.hh 14 Nov 2013 00:47:20 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdField.hh,v 1.4 2013/07/10 20:49:06 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdField.hh,v 1.5 2013/11/14 00:47:20 jeremy Exp $
#ifndef LCDD_IDFIELD_HH #define LCDD_IDFIELD_HH 1
@@ -10,8 +10,7 @@
* @brief An individual field in an identifier specification, including * start position, length, label and signed flag. */
-class IdField
-{
+class IdField {
public:
typedef unsigned short int SizeType;
diff -u -r1.6 -r1.7 --- IdManager.hh 10 Jul 2013 22:39:26 -0000 1.6 +++ IdManager.hh 14 Nov 2013 00:47:20 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdManager.hh,v 1.6 2013/07/10 22:39:26 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdManager.hh,v 1.7 2013/11/14 00:47:20 jeremy Exp $
#ifndef LCDD_IDMANAGER_HH #define LCDD_IDMANAGER_HH 1
@@ -23,8 +23,7 @@
* @brief Singleton manager class for geometric ID objects. * @note It mainly provides utility functions based on G4VPhysicalVolume pointers. */
-class IdManager
-{
+class IdManager {
public:
typedef std::map<std::string, IdSpec*> IdSpecs;
diff -u -r1.3 -r1.4 --- IdSpec.hh 10 Jul 2013 18:06:17 -0000 1.3 +++ IdSpec.hh 14 Nov 2013 00:47:20 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdSpec.hh,v 1.3 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdSpec.hh,v 1.4 2013/11/14 00:47:20 jeremy Exp $
#ifndef LCDD_IDSPEC_HH #define LCDD_IDSPEC_HH 1
@@ -16,8 +16,7 @@
* @brief A list of IdField objects that together constitute an identifier specification. * @todo Move code to source file. */
-class IdSpec
-{
+class IdSpec {
public:
diff -u -r1.4 -r1.5 --- IdVec.hh 10 Jul 2013 18:06:17 -0000 1.4 +++ IdVec.hh 14 Nov 2013 00:47:20 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdVec.hh,v 1.4 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -17,8 +17,7 @@
* * DetectorDescription/Identifier/Identifier-00-06-10/Identifier/ExpandedIdentifier.h */
-class IdVec
-{
+class IdVec {
public:
typedef int ElementType;
diff -u -r1.4 -r1.5 --- FieldMapTypeProcess.hh 10 Jul 2013 18:06:18 -0000 1.4 +++ FieldMapTypeProcess.hh 14 Nov 2013 00:47:20 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/processes/FieldMapTypeProcess.hh,v 1.4 2013/07/10 18:06:18 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -24,38 +24,33 @@
* @brief Generic SAX process for field maps. * @note This class adds generic content using StackPopNotify. */
-class FieldMapTypeProcess: public FieldTypeProcess
-{
+class FieldMapTypeProcess: public FieldTypeProcess {
public:
/**
* Class constructor.
*/
FieldMapTypeProcess(const ProcessingContext* context = 0) :
- FieldTypeProcess(context)
- {
+ FieldTypeProcess(context) {
}
/**
* Class destructor.
*/
- virtual ~FieldMapTypeProcess()
- {
+ virtual ~FieldMapTypeProcess() {
}
/**
*
*/
- virtual const SAXComponentObject* Build() const
- {
+ virtual const SAXComponentObject* Build() const {
return this;
}
/*
* NO-OP. Just call up the inheritance chain to FieldTypeProcess.
*/
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs) {
// std::cout << "FieldMapTypeProcess::StartElement - " << name << std::endl;
FieldTypeProcess::StartElement(name, attrs);
}
@@ -63,22 +58,19 @@
/**
*
*/
- virtual void EndElement(const std::string&)
- {
+ virtual void EndElement(const std::string&) {
}
/**
*
*/
- virtual void Characters(const std::string&)
- {
+ virtual void Characters(const std::string&) {
}
/**
*
*/
- virtual void StackPopNotify(const std::string& name)
- {
+ virtual void StackPopNotify(const std::string& name) {
// std::cout << "FieldMapTypeProcess::StackPopNotify" << std::endl;
SAXObject** so = Context()->GetTopObject();
FieldMapType* fmap = dynamic_cast<FieldMapType*>(_obj);
diff -u -r1.4 -r1.5 --- FieldTypeProcess.hh 10 Jul 2013 18:06:18 -0000 1.4 +++ FieldTypeProcess.hh 14 Nov 2013 00:47:20 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/processes/FieldTypeProcess.hh,v 1.4 2013/07/10 18:06:18 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -22,38 +22,33 @@
* @brief Generic SAX process for fields. * @note This class sets name and units for a field. */
-class FieldTypeProcess: public SAXStateProcess
-{
+class FieldTypeProcess: public SAXStateProcess {
public:
/**
*
*/
FieldTypeProcess(const ProcessingContext* context = 0) :
- SAXStateProcess(context), _obj(0)
- {
+ SAXStateProcess(context), _obj(0) {
}
/**
*
*/
- virtual ~FieldTypeProcess()
- {
+ virtual ~FieldTypeProcess() {
}
/**
*
*/
- virtual const SAXComponentObject* Build() const
- {
+ virtual const SAXComponentObject* Build() const {
return this;
}
/**
*
*/
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs) {
//std::cout << "FieldTypeProcess::StartElement: " << name << std::endl;
FieldType* fld = dynamic_cast<FieldType*>(_obj);
@@ -73,22 +68,19 @@
/**
*
*/
- virtual void EndElement(const std::string&)
- {
+ virtual void EndElement(const std::string&) {
}
/**
*
*/
- virtual void Characters(const std::string&)
- {
+ virtual void Characters(const std::string&) {
}
/**
*
*/
- virtual void StackPopNotify(const std::string&)
- {
+ virtual void StackPopNotify(const std::string&) {
//std::cout << "FieldTypeProcess::StackPopNotify" << std::endl;
}
diff -u -r1.4 -r1.5 --- SensitiveDetectorTypeProcess.hh 22 Aug 2013 22:32:16 -0000 1.4 +++ SensitiveDetectorTypeProcess.hh 14 Nov 2013 00:47:20 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/processes/SensitiveDetectorTypeProcess.hh,v 1.4 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -25,26 +25,21 @@
@class SensitiveDetectorTypeProcess @brief SAX process for elements based on abstract SensitiveDetectorType. */
-class SensitiveDetectorTypeProcess: public SAXStateProcess
-{
+class SensitiveDetectorTypeProcess: public SAXStateProcess {
public:
SensitiveDetectorTypeProcess(const ProcessingContext* context = 0) :
- SAXStateProcess(context), _obj(0)
- {
+ SAXStateProcess(context), _obj(0) {
}
- virtual ~SensitiveDetectorTypeProcess()
- {
+ virtual ~SensitiveDetectorTypeProcess() {
}
- virtual const SAXComponentObject* Build() const
- {
+ virtual const SAXComponentObject* Build() const {
return this;
}
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs) {
SensitiveDetectorType* sdt = dynamic_cast<SensitiveDetectorType*>(_obj);
if (sdt) {
@@ -62,16 +57,13 @@
}
}
- virtual void EndElement(const std::string&)
- {
+ virtual void EndElement(const std::string&) {
}
- virtual void Characters(const std::string&)
- {
+ virtual void Characters(const std::string&) {
}
- virtual void StackPopNotify(const std::string& name)
- {
+ virtual void StackPopNotify(const std::string& name) {
//std::cout << "SensitiveDetectorTypeProcess::StackPopNotify - " << name << std::endl;
SAXObject** so = Context()->GetTopObject();
diff -u -r1.4 -r1.5 --- calorimeterProcess.hh 10 Jul 2013 18:06:18 -0000 1.4 +++ calorimeterProcess.hh 14 Nov 2013 00:47:20 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/processes/calorimeterProcess.hh,v 1.4 2013/07/10 18:06:18 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -22,8 +22,7 @@
* @brief The SAX process for calorimeter elements. * @note Calls SAX processor for SensitiveDetectorTypeProcess parent class. */
-class calorimeterProcess: public SensitiveDetectorTypeProcess
-{
+class calorimeterProcess: public SensitiveDetectorTypeProcess {
public:
/**
diff -u -r1.2 -r1.3 --- hit_processorProcess.hh 22 Aug 2013 22:32:16 -0000 1.2 +++ hit_processorProcess.hh 14 Nov 2013 00:47:21 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/processes/hit_processorProcess.hh,v 1.2 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/processes/hit_processorProcess.hh,v 1.3 2013/11/14 00:47:21 jeremy Exp $
#ifndef LCDD_PROCESSES_HITPROCESSORPROCESS_HH #define LCDD_PROCESSES_HITPROCESSORPROCESS_HH 1
@@ -7,8 +7,7 @@
#include "Saxana/SAXStateProcess.h" #include "Saxana/SAXObject.h"
-class hit_processorProcess : public SAXStateProcess
-{
+class hit_processorProcess: public SAXStateProcess {
public:
diff -u -r1.2 -r1.3 --- hits_collectionProcess.hh 22 Aug 2013 22:32:16 -0000 1.2 +++ hits_collectionProcess.hh 14 Nov 2013 00:47:21 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/processes/hits_collectionProcess.hh,v 1.2 2013/08/22 22:32:16 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -7,8 +7,7 @@
#include "Saxana/SAXStateProcess.h" #include "Saxana/SAXObject.h"
-class hits_collectionProcess : public SAXStateProcess
-{
+class hits_collectionProcess: public SAXStateProcess {
public:
diff -u -r1.6 -r1.7 --- AuthorType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ AuthorType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/AuthorType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,30 +9,26 @@
/** * @brief AuthorType from schema. */
-class AuthorType
-{
+class AuthorType {
public:
- /**
- * Class constructor.
- */
- AuthorType()
- {
+ /**
+ * Class constructor.
+ */
+ AuthorType() {
}
/**
* Class destructor.
*/
- virtual ~AuthorType()
- {
+ virtual ~AuthorType() {
}
/**
* Set the name of the author.
* @param n The name string.
*/
- void set_name(const std::string& n)
- {
+ void set_name(const std::string& n) {
_name = n;
}
@@ -40,8 +36,7 @@
* Set the email of the author.
* @param o The email string.
*/
- void set_email(const std::string& o)
- {
+ void set_email(const std::string& o) {
_email = o;
}
@@ -49,8 +44,7 @@
* Get the name of the author.
* @return The name of the author.
*/
- const std::string& get_name() const
- {
+ const std::string& get_name() const {
return _name;
}
@@ -58,8 +52,7 @@
* Get the email of the author.
* @return The email of the author.
*/
- const std::string& get_email() const
- {
+ const std::string& get_email() const {
return _email;
}
diff -u -r1.5 -r1.6 --- BoxDipoleType.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ BoxDipoleType.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/BoxDipoleType.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,23 +9,20 @@
/** * @brief The BoxDipoleType from the schema. */
-class BoxDipoleType: public FieldType
-{
+class BoxDipoleType: public FieldType {
public:
- /**
- * Class constructor.
- */
- BoxDipoleType()
- {
+ /**
+ * Class constructor.
+ */
+ BoxDipoleType() {
}
/**
* Class destructor.
*/
- virtual ~BoxDipoleType()
- {
+ virtual ~BoxDipoleType() {
} public:
@@ -34,8 +31,7 @@
* Set the x position.
* @param s The x position.
*/
- void set_x(const std::string& s)
- {
+ void set_x(const std::string& s) {
_x = s;
}
@@ -43,8 +39,7 @@
* Set the y position.
* @param s The y position.
*/
- void set_y(const std::string& s)
- {
+ void set_y(const std::string& s) {
_y = s;
}
@@ -52,8 +47,7 @@
* Set the z position.
* @param s The z position.
*/
- void set_z(const std::string& s)
- {
+ void set_z(const std::string& s) {
_z = s;
}
@@ -61,8 +55,7 @@
* Set the x half dimension of the box.
* @param s The box's x half dimension.
*/
- void set_dx(const std::string& s)
- {
+ void set_dx(const std::string& s) {
_dx = s;
}
@@ -70,8 +63,7 @@
* Set the y half dimension of the box.
* @param s The box's y half dimension.
*/
- void set_dy(const std::string& s)
- {
+ void set_dy(const std::string& s) {
_dy = s;
}
@@ -79,8 +71,7 @@
* Set the z half dimension of the box.
* @param s The box's z half dimension.
*/
- void set_dz(const std::string& s)
- {
+ void set_dz(const std::string& s) {
_dz = s;
}
@@ -88,8 +79,7 @@
* Set the fixed Bx component for the region.
* @param s The Bx component.
*/
- void set_bx(const std::string& s)
- {
+ void set_bx(const std::string& s) {
_bx = s;
}
@@ -97,8 +87,7 @@
* Set the fixed By component for the region.
* @param s The By component.
*/
- void set_by(const std::string& s)
- {
+ void set_by(const std::string& s) {
_by = s;
}
@@ -106,8 +95,7 @@
* Set the fixed Bz component for the region.
* @param s The Bz component.
*/
- void set_bz(const std::string& s)
- {
+ void set_bz(const std::string& s) {
_bz = s;
}
@@ -115,8 +103,7 @@
* Get the x position.
* @return The x position.
*/
- const std::string& get_x() const
- {
+ const std::string& get_x() const {
return _x;
}
@@ -124,8 +111,7 @@
* Get the y position.
* @return The y position.
*/
- const std::string& get_y() const
- {
+ const std::string& get_y() const {
return _y;
}
@@ -133,8 +119,7 @@
* Get the z position.
* @return The z position.
*/
- const std::string& get_z() const
- {
+ const std::string& get_z() const {
return _z;
}
@@ -142,8 +127,7 @@
* Get the box half dimension in x.
* @return The box half dimension in x.
*/
- const std::string& get_dx() const
- {
+ const std::string& get_dx() const {
return _dx;
}
@@ -151,8 +135,7 @@
* Get the box half dimension in y.
* @return The box half dimension in y.
*/
- const std::string& get_dy() const
- {
+ const std::string& get_dy() const {
return _dy;
}
@@ -160,8 +143,7 @@
* Get the box half dimension in z.
* @return The box half dimension in z.
*/
- const std::string& get_dz() const
- {
+ const std::string& get_dz() const {
return _dz;
}
@@ -169,8 +151,7 @@
* Get the fixed Bx component.
* @return The Bx component.
*/
- const std::string& get_bx() const
- {
+ const std::string& get_bx() const {
return _bx;
}
@@ -178,8 +159,7 @@
* Get the fixed By component.
* @return The By component.
*/
- const std::string& get_by() const
- {
+ const std::string& get_by() const {
return _by;
}
@@ -187,8 +167,7 @@
* Get the fixed Bz component.
* @return The Bz component.
*/
- const std::string& get_bz() const
- {
+ const std::string& get_bz() const {
return _bz;
}
diff -u -r1.6 -r1.7 --- CalorimeterType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ CalorimeterType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/CalorimeterType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -15,23 +15,20 @@
/** * @brief The CalorimeterType from the schema. */
-class CalorimeterType: public SensitiveDetectorType
-{
+class CalorimeterType: public SensitiveDetectorType {
public:
- /**
- * Class constructor.
- */
- CalorimeterType()
- {
+ /**
+ * Class constructor.
+ */
+ CalorimeterType() {
}
/**
* Class destructor.
*/
- virtual ~CalorimeterType()
- {
+ virtual ~CalorimeterType() {
} public:
@@ -40,8 +37,7 @@
* Get the child content of the element.
* @return The child content.
*/
- const ContentSequence* get_content() const
- {
+ const ContentSequence* get_content() const {
return &_sequence;
}
@@ -50,8 +46,7 @@
* @param tag The child tag to add.
* @param so The SAXObject of the child.
*/
- void add_content(const std::string& tag, SAXObject* so)
- {
+ void add_content(const std::string& tag, SAXObject* so) {
ContentGroup::ContentItem ci = { tag, so };
_sequence.add_content(ci);
}
@@ -60,8 +55,7 @@
* Set the comparison algorithm type.
* @param compare The comparison algorithm type.
*/
- void set_compare(const std::string& compare)
- {
+ void set_compare(const std::string& compare) {
_compare = compare;
}
@@ -69,8 +63,7 @@
* Get the comparison algorithm type.
* @return The comparison algorithm type.
*/
- const std::string& get_compare() const
- {
+ const std::string& get_compare() const {
return _compare;
}
diff -u -r1.7 -r1.8 --- CellReadout2DSegmentationType.hh 12 Sep 2013 19:45:10 -0000 1.7 +++ CellReadout2DSegmentationType.hh 14 Nov 2013 00:47:21 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/CellReadout2DSegmentationType.hh,v 1.7 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,23 +12,20 @@
/** * @brief The CellReadout2DSegmentationType from the schema. */
-class CellReadout2DSegmentationType: public SegmentationType
-{
+class CellReadout2DSegmentationType: public SegmentationType {
public:
- /**
- * Class constructor.
- */
- CellReadout2DSegmentationType()
- {
+ /**
+ * Class constructor.
+ */
+ CellReadout2DSegmentationType() {
}
/**
* Class destructor.
*/
- virtual ~CellReadout2DSegmentationType()
- {
+ virtual ~CellReadout2DSegmentationType() {
} public:
@@ -37,8 +34,7 @@
* Set the x cell size.
* @param[i] cellSizeX The x cell size.
*/
- void setCellSizeX(const std::string& cellSizeX)
- {
+ void setCellSizeX(const std::string& cellSizeX) {
_cellSizeX = cellSizeX;
}
@@ -46,8 +42,7 @@
* Set the y cell size.
* @param[i] cellSizeX The y cell size.
*/
- void setCellSizeY(const std::string& cellSizeY)
- {
+ void setCellSizeY(const std::string& cellSizeY) {
_cellSizeY = cellSizeY;
}
@@ -55,8 +50,7 @@
* Set the length unit for the cell sizes.
* @param lengthUnit[i] The length unit of the cells.
*/
- void setLengthUnit(const std::string& lengthUnit)
- {
+ void setLengthUnit(const std::string& lengthUnit) {
_lengthUnit = lengthUnit;
}
@@ -64,8 +58,7 @@
* Get the cell size x.
* @return The x cell size.
*/
- const std::string& getCellSizeX()
- {
+ const std::string& getCellSizeX() {
return _cellSizeX;
}
@@ -73,8 +66,7 @@
* Get the cell size y.
* @return The y cell size.
*/
- const std::string& getCellSizeY()
- {
+ const std::string& getCellSizeY() {
return _cellSizeY;
}
@@ -82,8 +74,7 @@
* Get the cell size z.
* @return The z cell size.
*/
- const std::string& getLengthUnit()
- {
+ const std::string& getLengthUnit() {
return _lengthUnit;
}
diff -u -r1.6 -r1.7 --- ColorType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ ColorType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/ColorType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,31 +9,27 @@
/** * @brief The ColorType from the schema. */
-class ColorType
-{
+class ColorType {
public:
- /**
- * Class constructor.
- */
- ColorType()
- {
+ /**
+ * Class constructor.
+ */
+ ColorType() {
}
/**
* Class destructor.
*/
- virtual ~ColorType()
- {
+ virtual ~ColorType() {
}
/**
* Set the red color value.
* @param[i] r The red color value.
*/
- void set_R(const std::string& r)
- {
+ void set_R(const std::string& r) {
_R = r;
}
@@ -41,8 +37,7 @@
* Set the green color value.
* @param[i] g The green color value.
*/
- void set_G(const std::string& g)
- {
+ void set_G(const std::string& g) {
_G = g;
}
@@ -50,8 +45,7 @@
* Set the blue color value.
* @param[i] b The blue color value.
*/
- void set_B(const std::string& b)
- {
+ void set_B(const std::string& b) {
_B = b;
}
@@ -59,8 +53,7 @@
* Set the alpha value.
* @param[i] a The alpha value.
*/
- void set_alpha(const std::string& a)
- {
+ void set_alpha(const std::string& a) {
_alpha = a;
}
@@ -68,8 +61,7 @@
* Get the red value.
* @return The red value.
*/
- const std::string& get_R()
- {
+ const std::string& get_R() {
return _R;
}
@@ -77,8 +69,7 @@
* Get the green value.
* @return The green value.
*/
- const std::string& get_G()
- {
+ const std::string& get_G() {
return _G;
}
@@ -86,8 +77,7 @@
* Get the blue value.
* @return The blue value.
*/
- const std::string& get_B()
- {
+ const std::string& get_B() {
return _B;
}
@@ -95,8 +85,7 @@
* Get the alpha value.
* @return The alpha value.
*/
- const std::string& get_alpha()
- {
+ const std::string& get_alpha() {
return _alpha;
}
diff -u -r1.6 -r1.7 --- CommentType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ CommentType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/CommentType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,30 +9,26 @@
/** * @brief The CommentType from the schema. */
-class CommentType
-{
+class CommentType {
public:
- /**
- * Class destructor.
- */
- CommentType()
- {
+ /**
+ * Class destructor.
+ */
+ CommentType() {
}
/**
* Class destructor.
*/
- virtual ~CommentType()
- {
+ virtual ~CommentType() {
}
/**
* Set the comment contents.
* @param c The comment.
*/
- void set_comment(const std::string& c)
- {
+ void set_comment(const std::string& c) {
_comment = c;
}
@@ -40,8 +36,7 @@
* Get the comment.
* @return The comment.
*/
- const std::string& get_comment() const
- {
+ const std::string& get_comment() const {
return _comment;
}
diff -u -r1.6 -r1.7 --- DetectorType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ DetectorType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/DetectorType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,22 +9,19 @@
/** * @brief The DetectorType from the schema. */
-class DetectorType
-{
+class DetectorType {
public:
- /**
- * Class constructor.
- */
- DetectorType()
- {
+ /**
+ * Class constructor.
+ */
+ DetectorType() {
}
/**
* Class destructor.
*/
- virtual ~DetectorType()
- {
+ virtual ~DetectorType() {
} public:
@@ -33,8 +30,7 @@
* Set the name.
* @param[i] The name.
*/
- void set_name(const std::string& n)
- {
+ void set_name(const std::string& n) {
_name = n;
}
@@ -42,8 +38,7 @@
* Set the version.
* @param v The version.
*/
- void set_version(const std::string& v)
- {
+ void set_version(const std::string& v) {
_version = v;
}
@@ -51,8 +46,7 @@
* Set the URL.
* @param u The URL.
*/
- void set_url(const std::string& u)
- {
+ void set_url(const std::string& u) {
_url = u;
}
@@ -60,8 +54,7 @@
* Get the name.
* @return The name.
*/
- const std::string& get_name() const
- {
+ const std::string& get_name() const {
return _name;
}
@@ -69,8 +62,7 @@
* Get the version.
* @return The version.
*/
- const std::string& get_version() const
- {
+ const std::string& get_version() const {
return _version;
}
@@ -78,8 +70,7 @@
* Get the URL.
* @return The URL.
*/
- const std::string& get_url() const
- {
+ const std::string& get_url() const {
return _url;
}
diff -u -r1.6 -r1.7 --- DipoleCoeffType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ DipoleCoeffType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/DipoleCoeffType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -8,22 +8,19 @@
/** * @brief The DipoleCoeffType from the schema. */
-class DipoleCoeffType
-{
+class DipoleCoeffType {
public:
- /**
- * Class constructor.
- */
- DipoleCoeffType()
- {
+ /**
+ * Class constructor.
+ */
+ DipoleCoeffType() {
}
/**
* Class destructor.
*/
- virtual ~DipoleCoeffType()
- {
+ virtual ~DipoleCoeffType() {
} public:
@@ -32,8 +29,7 @@
* Set the dipole coefficient value.
* @param s The dipole coefficient value.
*/
- void set_value(const std::string& s)
- {
+ void set_value(const std::string& s) {
_value = s;
}
@@ -41,8 +37,7 @@
* Get the dipole coefficient value.
* @return The dipole coefficient value.
*/
- const std::string& get_value()
- {
+ const std::string& get_value() {
return _value;
}
diff -u -r1.6 -r1.7 --- DipoleType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ DipoleType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/DipoleType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -15,22 +15,19 @@
/** * @brief The DipoleType from the schema. */
-class DipoleType: public FieldType
-{
+class DipoleType: public FieldType {
public:
- /**
- * Class constructor.
- */
- DipoleType()
- {
+ /**
+ * Class constructor.
+ */
+ DipoleType() {
}
/**
* Class destructor.
*/
- virtual ~DipoleType()
- {
+ virtual ~DipoleType() {
} public:
@@ -39,8 +36,7 @@
* Set the maximum Z value.
* @param s The max Z value.
*/
- void set_zmax(const std::string& s)
- {
+ void set_zmax(const std::string& s) {
_zmax = s;
}
@@ -48,8 +44,7 @@
* Set the minimum Z value.
* @param s
*/
- void set_zmin(const std::string& s)
- {
+ void set_zmin(const std::string& s) {
_zmin = s;
}
@@ -57,8 +52,7 @@
* Set the maximum R value.
* @param s
*/
- void set_rmax(const std::string& s)
- {
+ void set_rmax(const std::string& s) {
_rmax = s;
}
@@ -66,8 +60,7 @@
* Get the minimum Z value.
* @return The minimum Z value.
*/
- const std::string& get_zmin() const
- {
+ const std::string& get_zmin() const {
return _zmin;
}
@@ -75,8 +68,7 @@
* Get the maximum Z value.
* @return
*/
- const std::string& get_zmax() const
- {
+ const std::string& get_zmax() const {
return _zmax;
}
@@ -84,8 +76,7 @@
* Get the maximum R value.
* @return The maximum R value.
*/
- const std::string& get_rmax() const
- {
+ const std::string& get_rmax() const {
return _rmax;
}
@@ -94,8 +85,7 @@
* @param tag The tag of the child.
* @param so The SAXObject of the child.
*/
- void add_content(const std::string& tag, SAXObject* so)
- {
+ void add_content(const std::string& tag, SAXObject* so) {
ContentGroup::ContentItem ci = { tag, so };
_sequence.add_content(ci);
}
@@ -104,8 +94,7 @@
* Get the content sequence of this element.
* @return The content sequence of the element.
*/
- const ContentSequence* get_content() const
- {
+ const ContentSequence* get_content() const {
return &_sequence;
}
diff -u -r1.6 -r1.7 --- FieldMap3DType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ FieldMap3DType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/FieldMap3DType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,31 +11,27 @@
/** * @brief The FieldMapType from the schema. */
-class FieldMap3DType: public FieldMapType
-{
+class FieldMap3DType: public FieldMapType {
public:
- /**
- * Class constructor.
- */
- FieldMap3DType()
- {
+ /**
+ * Class constructor.
+ */
+ FieldMap3DType() {
}
/**
* Class destructor.
*/
- virtual ~FieldMap3DType()
- {
+ virtual ~FieldMap3DType() {
}
/**
* Set the filename containing the field map data.
* @param filename The path of the file containing the field map data.
*/
- void set_filename(const std::string& filename)
- {
+ void set_filename(const std::string& filename) {
_filename = filename;
}
@@ -43,8 +39,7 @@
* Get the filename of the field map data.
* @return The filename with the field map data.
*/
- const std::string& get_filename() const
- {
+ const std::string& get_filename() const {
return _filename;
}
@@ -52,8 +47,7 @@
* Set the x offset of the map.
* @param xoffset The x offset.
*/
- void set_xoffset(const std::string& xoffset)
- {
+ void set_xoffset(const std::string& xoffset) {
_xoffset = xoffset;
}
@@ -61,8 +55,7 @@
* Set the y offset of the map.
* @param yoffset The y offset.
*/
- void set_yoffset(const std::string& yoffset)
- {
+ void set_yoffset(const std::string& yoffset) {
_xoffset = yoffset;
}
@@ -70,8 +63,7 @@
* Set the z offset of the map.
* @param zoffset The z offset.
*/
- void set_zoffset(const std::string& zoffset)
- {
+ void set_zoffset(const std::string& zoffset) {
_xoffset = zoffset;
}
@@ -79,8 +71,7 @@
* Get the x offset of the map.
* @return The x offset.
*/
- const std::string& get_xoffset() const
- {
+ const std::string& get_xoffset() const {
return _xoffset;
}
@@ -88,8 +79,7 @@
* Get the y offset of the map.
* @return The y offset.
*/
- const std::string& get_yoffset() const
- {
+ const std::string& get_yoffset() const {
return _yoffset;
}
@@ -97,8 +87,7 @@
* Get the z offset of the map.
* @return The z offset.
*/
- const std::string& get_zoffset() const
- {
+ const std::string& get_zoffset() const {
return _zoffset;
}
diff -u -r1.6 -r1.7 --- FieldMapType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ FieldMapType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/FieldMapType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,22 +12,19 @@
/** * @brief The FieldMapType from the schema. */
-class FieldMapType: public FieldType
-{
+class FieldMapType: public FieldType {
public:
- /**
- * Class constructor.
- */
- FieldMapType()
- {
+ /**
+ * Class constructor.
+ */
+ FieldMapType() {
}
/**
* Class destructor.
*/
- virtual ~FieldMapType()
- {
+ virtual ~FieldMapType() {
} public:
@@ -36,8 +33,7 @@
* Get the element content.
* @return The element's content.
*/
- const ContentSequence* get_content() const
- {
+ const ContentSequence* get_content() const {
return &_sequence;
}
@@ -46,8 +42,7 @@
* @param tag The tag of the child.
* @param so The SAXObject of the child.
*/
- void add_content(const std::string& tag, SAXObject* so)
- {
+ void add_content(const std::string& tag, SAXObject* so) {
ContentGroup::ContentItem ci = { tag, so };
_sequence.add_content(ci);
}
diff -u -r1.5 -r1.6 --- FieldType.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ FieldType.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/FieldType.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,39 +12,34 @@
/** * @brief The FieldType from the schema. */
-class FieldType
-{
+class FieldType {
public:
/**
* @class FieldType::fieldref
* @brief A reference to a field element.
*/
- class fieldref: public SAXObject, public ReferenceType
- {
+ class fieldref: public SAXObject, public ReferenceType {
public:
- /**
- * Class constructor.
- */
- fieldref()
- {
+ /**
+ * Class constructor.
+ */
+ fieldref() {
}
/**
* Class destructor.
*/
- virtual ~fieldref()
- {
+ virtual ~fieldref() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
@@ -54,23 +49,20 @@
/**
* Class constructor.
*/
- FieldType()
- {
+ FieldType() {
}
/**
* Class destructor.
*/
- virtual ~FieldType()
- {
+ virtual ~FieldType() {
}
/**
* Set the name of the field.
* @param n The name of the field.
*/
- void set_name(const std::string& n)
- {
+ void set_name(const std::string& n) {
_name = n;
}
@@ -78,8 +70,7 @@
* Get the name of the field.
* @return The name of the field.
*/
- const std::string& get_name() const
- {
+ const std::string& get_name() const {
return _name;
}
@@ -87,8 +78,7 @@
* Set the field unit.
* @param s The field unit.
*/
- void set_funit(const std::string& s)
- {
+ void set_funit(const std::string& s) {
_funit = s;
}
@@ -96,8 +86,7 @@
* Set the length unit.
* @param s The length unit.
*/
- void set_lunit(const std::string& s)
- {
+ void set_lunit(const std::string& s) {
_lunit = s;
}
@@ -105,8 +94,7 @@
* Get the field unit.
* @return The field unit.
*/
- const std::string& get_funit() const
- {
+ const std::string& get_funit() const {
return _funit;
}
@@ -114,8 +102,7 @@
* Get the length unit.
* @return The length unit.
*/
- const std::string& get_lunit() const
- {
+ const std::string& get_lunit() const {
return _lunit;
}
diff -u -r1.6 -r1.7 --- GeneratorType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ GeneratorType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/GeneratorType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,30 +9,26 @@
/** * @brief The GeneratorType from the schema. */
-class GeneratorType
-{
+class GeneratorType {
public:
- /**
- * Class constructor.
- */
- GeneratorType()
- {
+ /**
+ * Class constructor.
+ */
+ GeneratorType() {
}
/**
* Class destructor.
*/
- virtual ~GeneratorType()
- {
+ virtual ~GeneratorType() {
}
/**
* Set the name of the generator.
* @param n The name of the generator.
*/
- void set_name(const std::string& n)
- {
+ void set_name(const std::string& n) {
_name = n;
}
@@ -40,8 +36,7 @@
* Set the version of the generator.
* @param v The version of the generator.
*/
- void set_version(const std::string& v)
- {
+ void set_version(const std::string& v) {
_version = v;
}
@@ -49,8 +44,7 @@
* Set the file from which the LCDD was generated.
* @param u The file that generated the LCDD.
*/
- void set_file(const std::string& u)
- {
+ void set_file(const std::string& u) {
_file = u;
}
@@ -58,8 +52,7 @@
* Set the checksum of the LCDD file.
* @param c The checksum of the LCDD file.
*/
- void set_checksum(const std::string& c)
- {
+ void set_checksum(const std::string& c) {
_checksum = c;
}
@@ -67,8 +60,7 @@
* Get the name of the generator.
* @return The name of the generator.
*/
- const std::string& get_name() const
- {
+ const std::string& get_name() const {
return _name;
}
@@ -76,8 +68,7 @@
* Get the version of the generator.
* @return The version of the generator.
*/
- const std::string& get_version() const
- {
+ const std::string& get_version() const {
return _version;
}
@@ -85,8 +76,7 @@
* Get the file from which the LCDD was generated.
* @return The file that generated the LCDD.
*/
- const std::string& get_file() const
- {
+ const std::string& get_file() const {
return _file;
}
@@ -94,8 +84,7 @@
* Get the checksum of the LCDD file.
* @return The checksum of the file.
*/
- const std::string& get_checksum() const
- {
+ const std::string& get_checksum() const {
return _checksum;
}
diff -u -r1.6 -r1.7 --- GlobalFieldType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ GlobalFieldType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/GlobalFieldType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,30 +9,26 @@
/** * @brief The GlobalFieldType from the schema. */
-class GlobalFieldType
-{
+class GlobalFieldType {
public:
- /**
- * Class constructor.
- */
- GlobalFieldType()
- {
+ /**
+ * Class constructor.
+ */
+ GlobalFieldType() {
}
/**
* Class destructor.
*/
- virtual ~GlobalFieldType()
- {
+ virtual ~GlobalFieldType() {
}
/**
* Get the content of the field.
* @return The content of the XML element.
*/
- const ContentSequence* get_content() const
- {
+ const ContentSequence* get_content() const {
return &_sequence;
}
@@ -41,8 +37,7 @@
* @param tag The tag of the child.
* @param so The SAXObject of the child.
*/
- void add_content(const std::string& tag, SAXObject* so)
- {
+ void add_content(const std::string& tag, SAXObject* so) {
ContentGroup::ContentItem ci = { tag, so };
_sequence.add_content(ci);
}
diff -u -r1.6 -r1.7 --- GlobalGridXYSegmentationType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ GlobalGridXYSegmentationType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/GlobalGridXYSegmentationType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -15,22 +15,19 @@
/** * @brief The GlobalGridXYSegmentation from the schema. */
-class GlobalGridXYSegmentationType: public SegmentationType
-{
+class GlobalGridXYSegmentationType: public SegmentationType {
public:
- /**
- * Class constructor.
- */
- GlobalGridXYSegmentationType()
- {
+ /**
+ * Class constructor.
+ */
+ GlobalGridXYSegmentationType() {
}
/**
* Class destructor.
*/
- virtual ~GlobalGridXYSegmentationType()
- {
+ virtual ~GlobalGridXYSegmentationType() {
} public:
@@ -39,8 +36,7 @@
* Set the x grid size.
* @param gsx The x grid size.
*/
- void set_grid_size_x(const std::string& gsx)
- {
+ void set_grid_size_x(const std::string& gsx) {
_gridSizeX = gsx;
}
@@ -48,8 +44,7 @@
* Set the y grid size.
* @param gsy The y grid size.
*/
- void set_grid_size_y(const std::string& gsy)
- {
+ void set_grid_size_y(const std::string& gsy) {
_gridSizeY = gsy;
}
@@ -57,8 +52,7 @@
* Set the length unit.
* @param lunit The length unit.
*/
- void set_lunit(const std::string& lunit)
- {
+ void set_lunit(const std::string& lunit) {
_lunit = lunit;
}
@@ -66,8 +60,7 @@
* Get the x grid size.
* @return The x grid size.
*/
- const std::string& get_grid_size_x()
- {
+ const std::string& get_grid_size_x() {
return _gridSizeX;
}
@@ -75,8 +68,7 @@
* Get the y grid size.
* @return The y grid size.
*/
- const std::string& get_grid_size_y()
- {
+ const std::string& get_grid_size_y() {
return _gridSizeY;
}
@@ -84,8 +76,7 @@
* Get the length unit.
* @return The length unit.
*/
- const std::string& get_lunit()
- {
+ const std::string& get_lunit() {
return _lunit;
}
diff -u -r1.6 -r1.7 --- HeaderType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ HeaderType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/HeaderType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,22 +12,19 @@
/** * @brief The HeaderType from the schema. */
-class HeaderType
-{
+class HeaderType {
public:
- /**
- * Class constructor.
- */
- HeaderType()
- {
+ /**
+ * Class constructor.
+ */
+ HeaderType() {
}
/**
* Class destructor.
*/
- virtual ~HeaderType()
- {
+ virtual ~HeaderType() {
}
/**
@@ -35,8 +32,7 @@
* @param tag The child tag.
* @param so The SAXObject of the child.
*/
- void add_content(const std::string& tag, SAXObject* so)
- {
+ void add_content(const std::string& tag, SAXObject* so) {
ContentGroup::ContentItem ci = { tag, so };
_sequence.add_content(ci);
}
@@ -45,8 +41,7 @@
* Get the child content.
* @return The element's child content.
*/
- const ContentSequence* get_content() const
- {
+ const ContentSequence* get_content() const {
return &_sequence;
}
diff -u -r1.3 -r1.4 --- HitProcessorType.hh 12 Sep 2013 19:45:10 -0000 1.3 +++ HitProcessorType.hh 14 Nov 2013 00:47:21 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/HitProcessorType.hh,v 1.3 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,14 +13,13 @@
* @brief * The HitProcessor from the XML schema. */
-class HitProcessorType
-{
+class HitProcessorType {
public:
- /** - * Class constructor. - */
+ /** + * Class constructor. + */
HitProcessorType();
/**
diff -u -r1.3 -r1.4 --- HitsCollectionType.hh 12 Sep 2013 19:45:10 -0000 1.3 +++ HitsCollectionType.hh 14 Nov 2013 00:47:21 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/HitsCollectionType.hh,v 1.3 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,14 +13,13 @@
* @brief * The HitsCollectionType from the XML schema. */
-class HitsCollectionType
-{
+class HitsCollectionType {
public:
- /** - * Class constructor. - */
+ /** + * Class constructor. + */
HitsCollectionType();
/**
diff -u -r1.6 -r1.7 --- IdFieldType.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ IdFieldType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/IdFieldType.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,22 +9,19 @@
/** * @brief The IdFieldType from the schema. */
-class IdFieldType
-{
+class IdFieldType {
public:
- /**
- * Class constructor.
- */
- IdFieldType()
- {
+ /**
+ * Class constructor.
+ */
+ IdFieldType() {
}
/**
* Class destructor.
*/
- virtual ~IdFieldType()
- {
+ virtual ~IdFieldType() {
} public:
@@ -33,8 +30,7 @@
* Set the label of the field.
* @param l The label of the field.
*/
- void set_label(const std::string& l)
- {
+ void set_label(const std::string& l) {
_label = l;
}
@@ -42,8 +38,7 @@
* Set the starting position of the field.
* @param s The starting position of the field.
*/
- void set_start(const std::string& s)
- {
+ void set_start(const std::string& s) {
_start = s;
}
@@ -51,8 +46,7 @@
* Set the bit length of the field.
* @param l The bit length of the field.
*/
- void set_length(const std::string& l)
- {
+ void set_length(const std::string& l) {
_length = l;
}
@@ -60,8 +54,7 @@
* Set whether the field is signed or not.
* @param s Set value for field sign.
*/
- void set_signed(const std::string& s)
- {
+ void set_signed(const std::string& s) {
_signed = s;
}
@@ -69,8 +62,7 @@
* Get the label of the field.
* @return The label of the field.
*/
- const std::string& get_label()
- {
+ const std::string& get_label() {
return _label;
}
@@ -78,8 +70,7 @@
* Get the starting bit position of the field.
* @return The starting bit position.
*/
- const std::string& get_start()
- {
+ const std::string& get_start() {
return _start;
}
@@ -87,8 +78,7 @@
* Get the length of the field.
* @return The length of the field.
*/
- const std::string& get_length()
- {
+ const std::string& get_length() {
return _length;
}
@@ -96,8 +86,7 @@
* Get whether the field is signed or not.
* @return The signage of the field.
*/
- const std::string& get_signed()
- {
+ const std::string& get_signed() {
return _signed;
}
diff -u -r1.6 -r1.7 --- IdSpecType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ IdSpecType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/IdSpecType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,8 +13,7 @@
/** * @brief The IdSpecType from the schema. */
-class IdSpecType
-{
+class IdSpecType {
public:
/**
@@ -22,30 +21,26 @@
* @brief A reference to an idspec element.
*
*/
- class idspecref: public SAXObject, public ReferenceType
- {
+ class idspecref: public SAXObject, public ReferenceType {
public:
- /**
- * Class constructor.
- */
- idspecref()
- {
+ /**
+ * Class constructor.
+ */
+ idspecref() {
}
/**
* Class destructor.
*/
- virtual ~idspecref()
- {
+ virtual ~idspecref() {
}
/**
* Get the type of this object which is XML element.
* @return The type of this object.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
@@ -55,23 +50,20 @@
/**
* Class constructor.
*/
- IdSpecType()
- {
+ IdSpecType() {
}
/**
* Class destructor.
*/
- virtual ~IdSpecType()
- {
+ virtual ~IdSpecType() {
}
/**
* Set the name of the IdSpec.
* @param The name of the IdSpec.
*/
- void set_name(const std::string& n)
- {
+ void set_name(const std::string& n) {
_name = n;
}
@@ -79,8 +71,7 @@
* Set the length.
* @param The length.
*/
- void set_length(const std::string& l)
- {
+ void set_length(const std::string& l) {
_length = l;
}
@@ -88,8 +79,7 @@
* Get the name.
* @return The name.
*/
- const std::string& get_name() const
- {
+ const std::string& get_name() const {
return _name;
}
@@ -97,8 +87,7 @@
* Get the length.
* @return The length.
*/
- const std::string& get_length() const
- {
+ const std::string& get_length() const {
return _length;
}
@@ -106,8 +95,7 @@
* Get the child content.
* @return The child content.
*/
- const ContentSequence* get_content() const
- {
+ const ContentSequence* get_content() const {
return &_sequence;
}
@@ -116,8 +104,7 @@
* @param tag The child XML tag.
* @param so The SAXObject of the child.
*/
- void add_content(const std::string& tag, SAXObject* so)
- {
+ void add_content(const std::string& tag, SAXObject* so) {
ContentGroup::ContentItem ci = { tag, so };
_sequence.add_content(ci);
}
diff -u -r1.6 -r1.7 --- LimitParamType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ LimitParamType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/LimitParamType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,30 +9,26 @@
/** * @brief The LimitParamType from the schema. */
-class LimitParamType
-{
+class LimitParamType {
public:
- /**
- * Class constructor.
- */
- LimitParamType()
- {
+ /**
+ * Class constructor.
+ */
+ LimitParamType() {
}
/**
* Class destructor.
*/
- virtual ~LimitParamType()
- {
+ virtual ~LimitParamType() {
}
/**
* Set the applicable particles using a comma delimited list.
* @param p A comma delimited list of particle names.
*/
- void set_particles(const std::string& p)
- {
+ void set_particles(const std::string& p) {
_particles = p;
}
@@ -40,8 +36,7 @@
* Get the list of applicable particles.
* @return The list of applicable particles.
*/
- const std::string& get_particles() const
- {
+ const std::string& get_particles() const {
return _particles;
}
@@ -49,8 +44,7 @@
* Set the name of the limit parameter.
* @param n The name of the limit parameter.
*/
- void set_name(const std::string& n)
- {
+ void set_name(const std::string& n) {
_name = n;
}
@@ -58,8 +52,7 @@
* Get the name of the limit parameter.
* @return The name of the limit parameter.
*/
- const std::string& get_name() const
- {
+ const std::string& get_name() const {
return _name;
}
@@ -67,8 +60,7 @@
* Set the value of the limit.
* @param v The value of the limit.
*/
- void set_value(const std::string& v)
- {
+ void set_value(const std::string& v) {
_value = v;
}
@@ -76,8 +68,7 @@
* Get the value of the limit.
* @return The value of the limit.
*/
- const std::string& get_value() const
- {
+ const std::string& get_value() const {
return _value;
}
@@ -85,8 +76,7 @@
* Set the unit of the parameter.
* @param u The unit of the parameter.
*/
- void set_unit(const std::string& u)
- {
+ void set_unit(const std::string& u) {
_unit = u;
}
@@ -94,8 +84,7 @@
* Get the unit of the parameter.
* @return The unit of the parameter.
*/
- const std::string& get_unit() const
- {
+ const std::string& get_unit() const {
return _unit;
}
diff -u -r1.6 -r1.7 --- LimitSetType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ LimitSetType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/LimitSetType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,39 +12,33 @@
/** * @brief The LimitSetType type from the schema. */
-class LimitSetType
-{
+class LimitSetType {
public:
/**
* @brief Reference to a limitset element.
*/
- class limitsetref: public SAXObject, public ReferenceType
- {
+ class limitsetref: public SAXObject, public ReferenceType {
public:
- /**
- * Class constructor.
- */
- limitsetref()
- {
+ /**
+ * Class constructor.
+ */
+ limitsetref() {
}
/**
* Class destructor.
*/
- virtual ~limitsetref()
- {
+ virtual ~limitsetref() {
}
-
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
@@ -54,23 +48,20 @@
/**
* Class constructor.
*/
- LimitSetType()
- {
+ LimitSetType() {
}
/**
* Class destructor.
*/
- virtual ~LimitSetType()
- {
+ virtual ~LimitSetType() {
}
/**
* Set the name of the limit set.
* @param n The name of the limit set.
*/
- void set_name(const std::string& n)
- {
+ void set_name(const std::string& n) {
_name = n;
}
@@ -78,8 +69,7 @@
* Get the name of the limit set.
* @return The name of the limit set.
*/
- const std::string& get_name() const
- {
+ const std::string& get_name() const {
return _name;
}
@@ -88,8 +78,7 @@
* @param tag The child XML tag.
* @param so The SAXObject of the child.
*/
- void add_content(const std::string& tag, SAXObject* so)
- {
+ void add_content(const std::string& tag, SAXObject* so) {
ContentGroup::ContentItem ci = { tag, so };
_sequence.add_content(ci);
}
@@ -98,8 +87,7 @@
* Get the child content.
* @return The child content.
*/
- const ContentSequence* get_content() const
- {
+ const ContentSequence* get_content() const {
return &_sequence;
}
diff -u -r1.6 -r1.7 --- LimitType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ LimitType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/LimitType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,37 +11,32 @@
/** * @brief The LimitType from the schema. */
-class LimitType
-{
+class LimitType {
public:
/**
* @brief A reference to a limit element.
*/
- class limitref: public SAXObject, public ReferenceType
- {
+ class limitref: public SAXObject, public ReferenceType {
public:
- /**
- * Class constructor.
- */
- limitref()
- {
+ /**
+ * Class constructor.
+ */
+ limitref() {
}
/**
* Class destructor.
*/
- virtual ~limitref()
- {
+ virtual ~limitref() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
@@ -51,23 +46,20 @@
/**
* Class constructor.
*/
- LimitType()
- {
+ LimitType() {
}
/**
* Class destructor.
*/
- virtual ~LimitType()
- {
+ virtual ~LimitType() {
}
/**
* Get the name of the physics limit.
* @return The name of the physics limit.
*/
- const std::string& get_name() const
- {
+ const std::string& get_name() const {
return _name;
}
@@ -75,8 +67,7 @@
* Get the maximum step length.
* @return The maximum step length.
*/
- const std::string& get_step_length_max() const
- {
+ const std::string& get_step_length_max() const {
return _stepLengthMax;
}
@@ -84,8 +75,7 @@
* Get the maximum track length.
* @return The maximum track length.
*/
- const std::string& get_track_length_max() const
- {
+ const std::string& get_track_length_max() const {
return _trackLengthMax;
}
@@ -93,8 +83,7 @@
* Get the maximum time.
* @return The maximum time.
*/
- const std::string& get_time_max() const
- {
+ const std::string& get_time_max() const {
return _timeMax;
}
@@ -102,8 +91,7 @@
* Get the minimum kinetic energy.
* @return The minimum kinetic energy.
*/
- const std::string& get_ekin_min() const
- {
+ const std::string& get_ekin_min() const {
return _ekinMin;
}
@@ -111,8 +99,7 @@
* Get the minimum range.
* @return The minimum range.
*/
- const std::string& get_range_min() const
- {
+ const std::string& get_range_min() const {
return _rangeMin;
}
@@ -120,8 +107,7 @@
* Get the energy unit.
* @return The energy unit.
*/
- const std::string& get_eunit() const
- {
+ const std::string& get_eunit() const {
return _eunit;
}
@@ -129,8 +115,7 @@
* Get the length unit.
* @return The length unit.
*/
- const std::string& get_lunit() const
- {
+ const std::string& get_lunit() const {
return _lunit;
}
@@ -138,8 +123,7 @@
* Get the time unit.
* @return The time unit.
*/
- const std::string& get_tunit() const
- {
+ const std::string& get_tunit() const {
return _tunit;
}
@@ -147,8 +131,7 @@
* Set the name.
* @param s The name.
*/
- void set_name(const std::string& s)
- {
+ void set_name(const std::string& s) {
_name = s;
}
@@ -156,8 +139,7 @@
* Set the the maximum step length.
* @param s The maximum step length.
*/
- void set_step_length_max(const std::string& s)
- {
+ void set_step_length_max(const std::string& s) {
_stepLengthMax = s;
}
@@ -165,8 +147,7 @@
* Set the maximum track length.
* @param s The maximum track length.
*/
- void set_track_length_max(const std::string& s)
- {
+ void set_track_length_max(const std::string& s) {
_trackLengthMax = s;
}
@@ -174,8 +155,7 @@
* Set the maximum time.
* @param s The maximum time.
*/
- void set_time_max(const std::string& s)
- {
+ void set_time_max(const std::string& s) {
_timeMax = s;
}
@@ -183,8 +163,7 @@
* Set the minimum kinetic energy.
* @param s The minimum kinetic energy.
*/
- void set_ekin_min(const std::string& s)
- {
+ void set_ekin_min(const std::string& s) {
_ekinMin = s;
}
@@ -192,8 +171,7 @@
* Set the minimum range.
* @param s The minimum range.
*/
- void set_range_min(const std::string& s)
- {
+ void set_range_min(const std::string& s) {
_rangeMin = s;
}
@@ -201,8 +179,7 @@
* Set the energy unit.
* @param s The energy unit.
*/
- void set_eunit(const std::string& s)
- {
+ void set_eunit(const std::string& s) {
_eunit = s;
}
@@ -210,16 +187,14 @@
* Set the length unit.
* @param s The length unit.
*/
- void set_lunit(const std::string& s)
- {
+ void set_lunit(const std::string& s) {
_lunit = s;
}
/**
* Set the time unit
*/
- void set_tunit(const std::string& s)
- {
+ void set_tunit(const std::string& s) {
_tunit = s;
}
diff -u -r1.6 -r1.7 --- NonprojectiveCylinderSegmentationType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ NonprojectiveCylinderSegmentationType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/NonprojectiveCylinderSegmentationType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,16 +12,13 @@
/** * @brief The NonprojectiveCylinderSegmentationType from the schema. */
-class NonprojectiveCylinderSegmentationType: public SegmentationType
-{
+class NonprojectiveCylinderSegmentationType: public SegmentationType {
public:
- NonprojectiveCylinderSegmentationType()
- {
+ NonprojectiveCylinderSegmentationType() {
}
- virtual ~NonprojectiveCylinderSegmentationType()
- {
+ virtual ~NonprojectiveCylinderSegmentationType() {
} public:
@@ -30,8 +27,7 @@
* Set the grid size z.
* @param gsz The grid size z.
*/
- void set_gridSizeZ(const std::string& gsz)
- {
+ void set_gridSizeZ(const std::string& gsz) {
_gridSizeZ = gsz;
}
@@ -39,8 +35,7 @@
* Set the grid size phi.
* @param gsp The grid size phi.
*/
- void set_gridSizePhi(const std::string& gsp)
- {
+ void set_gridSizePhi(const std::string& gsp) {
_gridSizePhi = gsp;
}
@@ -48,8 +43,7 @@
* Set the length unit.
* @param lunit The length unit.
*/
- void set_lunit(const std::string& lunit)
- {
+ void set_lunit(const std::string& lunit) {
_lunit = lunit;
}
@@ -57,8 +51,7 @@
* Get the grid size z.
* @return The grid size z.
*/
- const std::string& get_gridSizeZ()
- {
+ const std::string& get_gridSizeZ() {
return _gridSizeZ;
}
@@ -66,8 +59,7 @@
* Get the grid size phi.
* @return The grid size phi.
*/
- const std::string& get_gridSizePhi()
- {
+ const std::string& get_gridSizePhi() {
return _gridSizePhi;
}
@@ -75,8 +67,7 @@
* Get the length unit.
* @return The length unit.
*/
- const std::string& get_lunit()
- {
+ const std::string& get_lunit() {
return _lunit;
}
diff -u -r1.6 -r1.7 --- NonprojectiveSegmentationType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ NonprojectiveSegmentationType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/NonprojectiveSegmentationType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,22 +12,19 @@
/** * @brief The NonprojectiveSegmentationType from the schema. */
-class NonprojectiveSegmentationType: public SegmentationType
-{
+class NonprojectiveSegmentationType: public SegmentationType {
public:
- /**
- * Class constructor.
- */
- NonprojectiveSegmentationType()
- {
+ /**
+ * Class constructor.
+ */
+ NonprojectiveSegmentationType() {
}
/**
* Class destructor.
*/
- virtual ~NonprojectiveSegmentationType()
- {
+ virtual ~NonprojectiveSegmentationType() {
} public:
@@ -36,8 +33,7 @@
* Set the grid size x.
* @param gsx The grid size x.
*/
- void set_gridSizeX(const std::string& gsx)
- {
+ void set_gridSizeX(const std::string& gsx) {
_gridSizeX = gsx;
}
@@ -45,8 +41,7 @@
* Set the grid size y.
* @param gsy The grid size y.
*/
- void set_gridSizeY(const std::string& gsy)
- {
+ void set_gridSizeY(const std::string& gsy) {
_gridSizeY = gsy;
}
@@ -54,8 +49,7 @@
* Set the grid size z.
* @param gsz The grid size z.
*/
- void set_gridSizeZ(const std::string& gsz)
- {
+ void set_gridSizeZ(const std::string& gsz) {
_gridSizeZ = gsz;
}
@@ -63,8 +57,7 @@
* Set the length unit.
* @param lunit The length unit.
*/
- void set_lunit(const std::string& lunit)
- {
+ void set_lunit(const std::string& lunit) {
_lunit = lunit;
}
@@ -72,8 +65,7 @@
* Get the grid size x.
* @return The grid size x.
*/
- const std::string& get_gridSizeX()
- {
+ const std::string& get_gridSizeX() {
return _gridSizeX;
}
@@ -81,8 +73,7 @@
* Get the grid size y.
* @return The grid size y.
*/
- const std::string& get_gridSizeY()
- {
+ const std::string& get_gridSizeY() {
return _gridSizeY;
}
@@ -90,8 +81,7 @@
* Get the grid size z.
* @return The grid size z.
*/
- const std::string& get_gridSizeZ()
- {
+ const std::string& get_gridSizeZ() {
return _gridSizeZ;
}
@@ -99,8 +89,7 @@
* Get the length unit.
* @return The length unit.
*/
- const std::string& get_lunit()
- {
+ const std::string& get_lunit() {
return _lunit;
}
diff -u -r1.6 -r1.7 --- PhysVolIdType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ PhysVolIdType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/PhysVolIdType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,31 +9,27 @@
/** * @brief The PhysVolIdType from the schema. */
-class PhysVolIdType
-{
+class PhysVolIdType {
public:
- /**
- * Class constructor.
- */
- PhysVolIdType()
- {
+ /**
+ * Class constructor.
+ */
+ PhysVolIdType() {
}
- /**
- * Class destructor.
- */
- virtual ~PhysVolIdType()
- {
+ /**
+ * Class destructor.
+ */
+ virtual ~PhysVolIdType() {
}
/**
* Set the value of the ID.
* @param v The value of the ID.
*/
- void set_value(const std::string& v)
- {
+ void set_value(const std::string& v) {
_value = v;
}
@@ -41,8 +37,7 @@
* Set the field name.
* @param f The field name.
*/
- void set_field_name(const std::string& f)
- {
+ void set_field_name(const std::string& f) {
_fieldName = f;
}
@@ -50,8 +45,7 @@
* Get the value of the ID.
* @return The value of the ID.
*/
- const std::string& get_value()
- {
+ const std::string& get_value() {
return _value;
}
@@ -59,8 +53,7 @@
* Get the field name.
* @return The field name.
*/
- const std::string& get_field_name()
- {
+ const std::string& get_field_name() {
return _fieldName;
}
diff -u -r1.6 -r1.7 --- ProjectiveCylinderSegmentationType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ ProjectiveCylinderSegmentationType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/ProjectiveCylinderSegmentationType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,22 +12,19 @@
/** * @brief The ProjectiveCylinderSegmentationType from the schema. */
-class ProjectiveCylinderSegmentationType: public SegmentationType
-{
+class ProjectiveCylinderSegmentationType: public SegmentationType {
public:
- /**
- * Class constructor.
- */
- ProjectiveCylinderSegmentationType()
- {
+ /**
+ * Class constructor.
+ */
+ ProjectiveCylinderSegmentationType() {
}
/**
* Class destructor.
*/
- virtual ~ProjectiveCylinderSegmentationType()
- {
+ virtual ~ProjectiveCylinderSegmentationType() {
} public:
@@ -36,8 +33,7 @@
* Set the number of theta bins. This divides 180 degrees in theta.
* @param ntheta The number of theta bins.
*/
- void set_ntheta(const std::string& ntheta)
- {
+ void set_ntheta(const std::string& ntheta) {
_ntheta = ntheta;
}
@@ -45,8 +41,7 @@
* Set the number of phi bins. This divides 360 degrees in phi.
* @param nphi The number of phi bins.
*/
- void set_nphi(const std::string& nphi)
- {
+ void set_nphi(const std::string& nphi) {
_nphi = nphi;
}
@@ -54,8 +49,7 @@
* Get the number of theta bins.
* @return The number of theta bins.
*/
- const std::string& get_ntheta() const
- {
+ const std::string& get_ntheta() const {
return _ntheta;
}
@@ -63,8 +57,7 @@
* Get the number of phi bins.
* @return The number of phi bins.
*/
- const std::string& get_nphi() const
- {
+ const std::string& get_nphi() const {
return _nphi;
}
diff -u -r1.6 -r1.7 --- ProjectiveZPlaneSegmentationType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ ProjectiveZPlaneSegmentationType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/ProjectiveZPlaneSegmentationType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,22 +12,19 @@
/** * @brief The ProjectiveZPlaneSegmentationType from the schema. */
-class ProjectiveZPlaneSegmentationType: public SegmentationType
-{
+class ProjectiveZPlaneSegmentationType: public SegmentationType {
public:
- /**
- * Class constructor.
- */
- ProjectiveZPlaneSegmentationType()
- {
+ /**
+ * Class constructor.
+ */
+ ProjectiveZPlaneSegmentationType() {
}
/**
* Class destructor.
*/
- virtual ~ProjectiveZPlaneSegmentationType()
- {
+ virtual ~ProjectiveZPlaneSegmentationType() {
} public:
@@ -36,8 +33,7 @@
* Set the number of theta bins.
* @param ntheta The number of theta bins.
*/
- void set_ntheta(const std::string& ntheta)
- {
+ void set_ntheta(const std::string& ntheta) {
_ntheta = ntheta;
}
@@ -45,8 +41,7 @@
* Set the number of phi bins.
* @param nphi The number of phi bins.
*/
- void set_nphi(const std::string& nphi)
- {
+ void set_nphi(const std::string& nphi) {
_nphi = nphi;
}
@@ -54,8 +49,7 @@
* Get the number of theta bins.
* @return The number of theta bins.
*/
- const std::string& get_ntheta() const
- {
+ const std::string& get_ntheta() const {
return _ntheta;
}
@@ -63,8 +57,7 @@
* Get the number of phi bins.
* @return The number of phi bins.
*/
- const std::string& get_nphi() const
- {
+ const std::string& get_nphi() const {
return _nphi;
}
diff -u -r1.6 -r1.7 --- RZBType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ RZBType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/RZBType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -8,31 +8,27 @@
/** * @brief The RZBType from the schema. */
-class RZBType
-{
+class RZBType {
public:
- /**
- * Class constructor.
- */
- RZBType()
- {
+ /**
+ * Class constructor.
+ */
+ RZBType() {
}
/**
* Class destructor.
*/
- virtual ~RZBType()
- {
+ virtual ~RZBType() {
}
/**
* Set the radius.
* @param r The radius [radians].
*/
- void set_r(const std::string& r)
- {
+ void set_r(const std::string& r) {
_r = r;
}
@@ -40,8 +36,7 @@
* Set the z position.
* @param z The z position.
*/
- void set_z(const std::string& z)
- {
+ void set_z(const std::string& z) {
_z = z;
}
@@ -49,8 +44,7 @@
* Set the Br value.
* @param Br The Br value.
*/
- void set_Br(const std::string& Br)
- {
+ void set_Br(const std::string& Br) {
_Br = Br;
}
@@ -58,8 +52,7 @@
* Set the Bz value.
* @param Bz The Bz value.
*/
- void set_Bz(const std::string& Bz)
- {
+ void set_Bz(const std::string& Bz) {
_Bz = Bz;
}
@@ -67,8 +60,7 @@
* Get the radius.
* @return The radius.
*/
- const std::string& get_r() const
- {
+ const std::string& get_r() const {
return _r;
}
@@ -76,8 +68,7 @@
* Get the z position.
* @return The z position.
*/
- const std::string& get_z() const
- {
+ const std::string& get_z() const {
return _z;
}
@@ -85,8 +76,7 @@
* Get the Br value.
* @return The Br value.
*/
- const std::string& get_Br() const
- {
+ const std::string& get_Br() const {
return _Br;
}
@@ -94,8 +84,7 @@
* Get the Bz value.
* @return The Bz value.
*/
- const std::string& get_Bz() const
- {
+ const std::string& get_Bz() const {
return _Bz;
}
diff -u -r1.6 -r1.7 --- RZFieldMapType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ RZFieldMapType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/RZFieldMapType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -8,31 +8,27 @@
/** * @brief The RZFieldMapType from the schema. */
-class RZFieldMapType: public FieldMapType
-{
+class RZFieldMapType: public FieldMapType {
public:
- /**
- * Class constructor.
- */
- RZFieldMapType()
- {
+ /**
+ * Class constructor.
+ */
+ RZFieldMapType() {
}
/**
* Class destructor.
*/
- virtual ~RZFieldMapType()
- {
+ virtual ~RZFieldMapType() {
}
/**
* Set the number of bins in r (radius).
* @param num_bins_r The number of bins in r.
*/
- void set_num_bins_r(const std::string& num_bins_r)
- {
+ void set_num_bins_r(const std::string& num_bins_r) {
_num_bins_r = num_bins_r;
}
@@ -40,8 +36,7 @@
* Get the number of bins in r.
* @return The number of bins in r.
*/
- const std::string& get_num_bins_r() const
- {
+ const std::string& get_num_bins_r() const {
return _num_bins_r;
}
@@ -49,8 +44,7 @@
* Set the r grid size.
* @param grid_size_r The r grid size.
*/
- void set_grid_size_r(const std::string& grid_size_r)
- {
+ void set_grid_size_r(const std::string& grid_size_r) {
_grid_size_r = grid_size_r;
}
@@ -58,8 +52,7 @@
* Get the r grid size.
* @return The r grid size.
*/
- const std::string& get_grid_size_r() const
- {
+ const std::string& get_grid_size_r() const {
return _grid_size_r;
}
@@ -67,8 +60,7 @@
* Set the number of z bins.
* @param num_bins_z The number of z bins.
*/
- void set_num_bins_z(const std::string& num_bins_z)
- {
+ void set_num_bins_z(const std::string& num_bins_z) {
_num_bins_z = num_bins_z;
}
@@ -76,8 +68,7 @@
* Get the number of z bins.
* @return The number of z bins.
*/
- const std::string& get_num_bins_z() const
- {
+ const std::string& get_num_bins_z() const {
return _num_bins_z;
}
@@ -85,8 +76,7 @@
* Set the z grid size.
* @param grid_size_z The z grid size.
*/
- void set_grid_size_z(const std::string& grid_size_z)
- {
+ void set_grid_size_z(const std::string& grid_size_z) {
_grid_size_z = grid_size_z;
}
@@ -94,8 +84,7 @@
* Get the z grid size.
* @return The z grid size.
*/
- const std::string& get_grid_size_z() const
- {
+ const std::string& get_grid_size_z() const {
return _grid_size_z;
}
diff -u -r1.6 -r1.7 --- RegionType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ RegionType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/RegionType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,39 +12,34 @@
/** * @brief The RegionType from the schema. */
-class RegionType
-{
+class RegionType {
public:
/**
* @brief A reference to a region element.
*/
- class regionref: public SAXObject, public ReferenceType
- {
+ class regionref: public SAXObject, public ReferenceType {
public:
- /**
- * Class constructor.
- */
- regionref()
- {
+ /**
+ * Class constructor.
+ */
+ regionref() {
}
/**
* Class destructor.
*/
- virtual ~regionref()
- {
+ virtual ~regionref() {
}
- /**
- * Get the object XML type.
- * @return The object XML type.
- */
- virtual SAXObject::Type type()
- {
+ /**
+ * Get the object XML type.
+ * @return The object XML type.
+ */
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
@@ -54,23 +49,20 @@
/**
* Class constructor.
*/
- RegionType()
- {
+ RegionType() {
}
/**
* Class destructor.
*/
- virtual ~RegionType()
- {
+ virtual ~RegionType() {
}
/**
* Set the name of the region.
* @param s The name of the region.
*/
- void set_name(const std::string& s)
- {
+ void set_name(const std::string& s) {
_name = s;
}
@@ -79,8 +71,7 @@
* as G4 trajectories in this region.
* @param s Set whether to store secondary particle information.
*/
- void set_storeSecondaries(const std::string& s)
- {
+ void set_storeSecondaries(const std::string& s) {
_storeSecondaries = s;
}
@@ -89,8 +80,7 @@
* after their first step.
* @param killTracks Set whether to kill tracks that enter this region.
*/
- void set_killTracks(const std::string& killTracks)
- {
+ void set_killTracks(const std::string& killTracks) {
_killTracks = killTracks;
}
@@ -100,8 +90,7 @@
* (See Geant4 documentation for details.)
* @param s The secondary production cut.
*/
- void set_cut(const std::string& s)
- {
+ void set_cut(const std::string& s) {
_cut = s;
}
@@ -109,8 +98,7 @@
* Set the length unit for the production cut.
* @param s The length unit for the production cut.
*/
- void set_lunit(const std::string& s)
- {
+ void set_lunit(const std::string& s) {
_lunit = s;
}
@@ -118,16 +106,14 @@
* Set the trajectory energy threshold for the region.
* @param s The trajectory energy threshold.
*/
- void set_threshold(const std::string& s)
- {
+ void set_threshold(const std::string& s) {
_threshold = s;
}
/**
* Set the energy unit for the energy threshold.
*/
- void set_eunit(const std::string& s)
- {
+ void set_eunit(const std::string& s) {
_eunit = s;
}
@@ -135,8 +121,7 @@
* Get the name of the region.
* @return The name of the region.
*/
- const std::string& get_name() const
- {
+ const std::string& get_name() const {
return _name;
}
@@ -145,8 +130,7 @@
* or not in this region.
* @return This is "true" to store secondaries and "false" if not.
*/
- const std::string& get_storeSecondaries() const
- {
+ const std::string& get_storeSecondaries() const {
return _storeSecondaries;
}
@@ -155,8 +139,7 @@
* in the region's volume.
* @return This is "true" to kill tracks and "false" if not.
*/
- const std::string& get_killTracks() const
- {
+ const std::string& get_killTracks() const {
return _killTracks;
}
@@ -164,8 +147,7 @@
* Get the production cut for this region.
* @return The production cut for the region.
*/
- const std::string& get_cut() const
- {
+ const std::string& get_cut() const {
return _cut;
}
@@ -173,8 +155,7 @@
* Get the length unit for the production cut.
* @return The length unit for the production cut.
*/
- const std::string& get_lunit() const
- {
+ const std::string& get_lunit() const {
return _lunit;
}
@@ -182,8 +163,7 @@
* Get the trajectory energy threshold.
* @return The trajectory energy threshold.
*/
- const std::string& get_threshold() const
- {
+ const std::string& get_threshold() const {
return _threshold;
}
@@ -191,8 +171,7 @@
* Get the energy unit for the trajectory threshold cut.
* @return The energy unit for the threshold.
*/
- const std::string& get_eunit() const
- {
+ const std::string& get_eunit() const {
return _eunit;
}
@@ -201,8 +180,7 @@
* @param tag The tag of the child.
* @param so The SAXObject of the child.
*/
- void add_content(const std::string& tag, SAXObject* so)
- {
+ void add_content(const std::string& tag, SAXObject* so) {
ContentGroup::ContentItem ci = { tag, so };
_sequence.add_content(ci);
}
@@ -211,8 +189,7 @@
* Get the XML contents.
* @return The object's XML contents.
*/
- const ContentSequence* get_content() const
- {
+ const ContentSequence* get_content() const {
return &_sequence;
}
diff -u -r1.5 -r1.6 --- SegmentationType.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ SegmentationType.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/SegmentationType.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,22 +9,19 @@
/** * @brief The SegmentationType from the schema. */
-class SegmentationType
-{
+class SegmentationType {
public:
- /**
- * Class constructor.
- */
- SegmentationType()
- {
+ /**
+ * Class constructor.
+ */
+ SegmentationType() {
}
/**
* Class destructor.
*/
- virtual ~SegmentationType()
- {
+ virtual ~SegmentationType() {
} };
diff -u -r1.6 -r1.7 --- SensitiveDetectorType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ SensitiveDetectorType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/SensitiveDetectorType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,38 +13,33 @@
/** * @brief The SensitiveDetectorType from the schema. */
-class SensitiveDetectorType
-{
+class SensitiveDetectorType {
public:
/**
* @class SensitiveDetectorType::sdref
* @brief Reference to sd element.
*/
- class sdref: public SAXObject, public ReferenceType
- {
+ class sdref: public SAXObject, public ReferenceType {
public:
- /**
- * Class constructor.
- */
- sdref()
- {
+ /**
+ * Class constructor.
+ */
+ sdref() {
}
/**
* Class destructor.
*/
- virtual ~sdref()
- {
+ virtual ~sdref() {
}
- /**
- * Get the XML object type.
- * @return The XML object type (element).
- */
- virtual SAXObject::Type type()
- {
+ /**
+ * Get the XML object type.
+ * @return The XML object type (element).
+ */
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
@@ -54,23 +49,20 @@
/**
* Class constructor.
*/
- SensitiveDetectorType()
- {
+ SensitiveDetectorType() {
}
/**
* Class destructor.
*/
- virtual ~SensitiveDetectorType()
- {
+ virtual ~SensitiveDetectorType() {
}
/**
* Set the name of the sensitive detector.
* @param n The name of the sensitive detector.
*/
- void set_name(const std::string& n)
- {
+ void set_name(const std::string& n) {
_name = n;
}
@@ -78,8 +70,7 @@
* Set the name of the detector's hits collection.
* @param hcn The name of the hits collection.
*/
- void set_hitsCollectionName(const std::string& hcn)
- {
+ void set_hitsCollectionName(const std::string& hcn) {
_hitsCollectionName = hcn;
}
@@ -87,8 +78,7 @@
* Get the name of the hits collection.
* @return The name of the hits collection.
*/
- const std::string& get_hitsCollectionName() const
- {
+ const std::string& get_hitsCollectionName() const {
return _hitsCollectionName;
}
@@ -96,8 +86,7 @@
* Set the step energy cut for hit processing.
* @param ec The energy cut.
*/
- void set_ecut(const std::string& ec)
- {
+ void set_ecut(const std::string& ec) {
_ecut = ec;
}
@@ -105,8 +94,7 @@
* Set the unit for the energy cut.
* @param eu The energy unit.
*/
- void set_eunit(const std::string& eu)
- {
+ void set_eunit(const std::string& eu) {
_eunit = eu;
}
@@ -114,8 +102,7 @@
* Set the verbosity value; 0 for least verbose; 2 for most.
* @param v Set the verbosity value.
*/
- void set_verbose(const std::string& v)
- {
+ void set_verbose(const std::string& v) {
_verbose = v;
}
@@ -124,8 +111,7 @@
* This should be "calorimeter" or "tracker".
* @param t The sensitive detector type.
*/
- void set_type(const std::string& t)
- {
+ void set_type(const std::string& t) {
_type = t;
}
@@ -134,8 +120,7 @@
* is an endcap and "false" if not.
* @param e The endcap flag.
*/
- void set_endcap_flag(const std::string& e)
- {
+ void set_endcap_flag(const std::string& e) {
_endcapFlag = e;
}
@@ -143,8 +128,7 @@
* Get the name of the sensitive detector.
* @return The name of the sensitive detector.
*/
- const std::string& get_name() const
- {
+ const std::string& get_name() const {
return _name;
}
@@ -152,8 +136,7 @@
* Get the energy cut unit.
* @return The energy cut unit.
*/
- const std::string& get_eunit() const
- {
+ const std::string& get_eunit() const {
return _eunit;
}
@@ -161,8 +144,7 @@
* Get the energy cut unit.
* @return The energy cut unit.
*/
- const std::string& get_ecut() const
- {
+ const std::string& get_ecut() const {
return _ecut;
}
@@ -170,8 +152,7 @@
* Get the verbosity level.
* @return The verbosity level.
*/
- const std::string& get_verbose() const
- {
+ const std::string& get_verbose() const {
return _verbose;
}
@@ -179,8 +160,7 @@
* Get the type of the sensitive detector.
* @return The type of the sensitive detector.
*/
- const std::string& get_type() const
- {
+ const std::string& get_type() const {
return _type;
}
@@ -188,8 +168,7 @@
* Get the endcap flag.
* @return The endcap flag.
*/
- const std::string& get_endcap_flag() const
- {
+ const std::string& get_endcap_flag() const {
return _endcapFlag;
}
@@ -197,8 +176,7 @@
* Get the object's child content.
* @return The object's child content.
*/
- const ContentSequence* get_content() const
- {
+ const ContentSequence* get_content() const {
return &_sequence;
}
@@ -207,8 +185,7 @@
* @param tag The child's tag.
* @param so The child's SAXObject.
*/
- void add_content(const std::string& tag, SAXObject* so)
- {
+ void add_content(const std::string& tag, SAXObject* so) {
ContentGroup::ContentItem ci = { tag, so };
_sequence.add_content(ci);
}
diff -u -r1.5 -r1.6 --- SolenoidType.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ SolenoidType.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/SolenoidType.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,23 +9,20 @@
/** * @brief The SolenoidType from the schema. */
-class SolenoidType: public FieldType
-{
+class SolenoidType: public FieldType {
public:
- /**
- * Class constructor.
- */
- SolenoidType()
- {
+ /**
+ * Class constructor.
+ */
+ SolenoidType() {
}
/**
* Class destructor.
*/
- virtual ~SolenoidType()
- {
+ virtual ~SolenoidType() {
} public:
@@ -34,8 +31,7 @@
* Set the fixed inner Bz value.
* @param s The inner Bz value.
*/
- void set_innerField(const std::string& s)
- {
+ void set_innerField(const std::string& s) {
_innerField = s;
}
@@ -43,8 +39,7 @@
* Set the fixed outer Bz value.
* @param s The outer Bz value.
*/
- void set_outerField(const std::string& s)
- {
+ void set_outerField(const std::string& s) {
_outerField = s;
}
@@ -52,8 +47,7 @@
* Set the minimum Z value defining where the outer field value will apply.
* @param s The minimum Z value.
*/
- void set_zmin(const std::string& s)
- {
+ void set_zmin(const std::string& s) {
_zmin = s;
}
@@ -61,8 +55,7 @@
* Set the maximum Z value defining where the field ends.
* @param s The maximum Z value.
*/
- void set_zmax(const std::string& s)
- {
+ void set_zmax(const std::string& s) {
_zmax = s;
}
@@ -70,8 +63,7 @@
* Set the inner radius.
* @param s The inner radius.
*/
- void set_innerRadius(const std::string& s)
- {
+ void set_innerRadius(const std::string& s) {
_innerRadius = s;
}
@@ -79,8 +71,7 @@
* Set the outer radius.
* @param s The outer radius.
*/
- void set_outerRadius(const std::string& s)
- {
+ void set_outerRadius(const std::string& s) {
_outerRadius = s;
}
@@ -88,8 +79,7 @@
* Get the inner Bz value.
* @return The inner Bz value.
*/
- const std::string& get_innerField() const
- {
+ const std::string& get_innerField() const {
return _innerField;
}
@@ -97,8 +87,7 @@
* Get the outer Bz value.
* @return The outer Bz value.
*/
- const std::string& get_outerField() const
- {
+ const std::string& get_outerField() const {
return _outerField;
}
@@ -106,8 +95,7 @@
* Get the minimum Z value.
* @return The minimum Z.
*/
- const std::string& get_zmin() const
- {
+ const std::string& get_zmin() const {
return _zmin;
}
@@ -115,8 +103,7 @@
* Get the maximum Z value.
* @return The maximum Z value.
*/
- const std::string& get_zmax() const
- {
+ const std::string& get_zmax() const {
return _zmax;
}
@@ -124,8 +111,7 @@
* Get the inner radius.
* @return The inner radius.
*/
- const std::string& get_innerRadius() const
- {
+ const std::string& get_innerRadius() const {
return _innerRadius;
}
@@ -133,8 +119,7 @@
* Get the outer radius.
* @return The outer radius.
*/
- const std::string& get_outerRadius() const
- {
+ const std::string& get_outerRadius() const {
return _outerRadius;
}
diff -u -r1.6 -r1.7 --- TrackerType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ TrackerType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/TrackerType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,31 +12,27 @@
/** * @brief The TrackerType from the schema. */
-class TrackerType: public SensitiveDetectorType
-{
+class TrackerType: public SensitiveDetectorType {
public:
- /**
- * Class constructor.
- */
- TrackerType()
- {
+ /**
+ * Class constructor.
+ */
+ TrackerType() {
}
/**
* Class destructor.
*/
- virtual ~TrackerType()
- {
+ virtual ~TrackerType() {
}
/**
* Set whether to combine hits across steps.
* @param c Set combine hits.
*/
- void set_combine_hits(const std::string& c)
- {
+ void set_combine_hits(const std::string& c) {
_combineHits = c;
}
@@ -44,8 +40,7 @@
* Get whether to combine hits across steps.
* @return This returns "true" if hits are combined and "false" if not.
*/
- const std::string& get_combine_hits() const
- {
+ const std::string& get_combine_hits() const {
return _combineHits;
}
diff -u -r1.6 -r1.7 --- VisType.hh 12 Sep 2013 23:26:42 -0000 1.6 +++ VisType.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/VisType.hh,v 1.6 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,36 +13,31 @@
/** * @brief The VisType from the schema. */
-class VisType
-{
+class VisType {
public:
/**
* @brief A reference to a vis element.
*/
- class visref: public SAXObject, public ReferenceType
- {
+ class visref: public SAXObject, public ReferenceType {
public:
- /**
- * Class constructor.
- */
- visref()
- {
+ /**
+ * Class constructor.
+ */
+ visref() {
}
/**
* Class destructor.
*/
- virtual ~visref()
- {
+ virtual ~visref() {
}
/**
* Get the object type.
* @return The object type (element).
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
@@ -52,15 +47,13 @@
/**
* Class constructor.
*/
- VisType()
- {
+ VisType() {
}
/**
* Class destructor.
*/
- virtual ~VisType()
- {
+ virtual ~VisType() {
} public:
@@ -69,8 +62,7 @@
* Set the name of the visualization attributes.
* @param n The name of the visualization attributes.
*/
- void set_name(const std::string& n)
- {
+ void set_name(const std::string& n) {
_name = n;
}
@@ -78,8 +70,7 @@
* Set visibility; "true" for visible and "false" if invisible.
* @param v The visibility setting.
*/
- void set_visible(const std::string& v)
- {
+ void set_visible(const std::string& v) {
_visible = v;
}
@@ -87,8 +78,7 @@
* Set show daughter volumes; "true" for yes and "false" for no.
* @param d Set show daughters.
*/
- void set_show_daughters(const std::string& d)
- {
+ void set_show_daughters(const std::string& d) {
_showDaughters = d;
}
@@ -96,8 +86,7 @@
* Set the line style; see schema for valid values.
* @param l The line style.
*/
- void set_line_style(const std::string& l)
- {
+ void set_line_style(const std::string& l) {
_lineStyle = l;
}
@@ -105,8 +94,7 @@
* Set the drawing style; see schema for valid values.
* @param d The drawing style.
*/
- void set_drawing_style(const std::string& d)
- {
+ void set_drawing_style(const std::string& d) {
_drawingStyle = d;
}
@@ -114,8 +102,7 @@
* Get the name of the visualization attributes.
* @return The name of the visualization attributes.
*/
- const std::string& get_name() const
- {
+ const std::string& get_name() const {
return _name;
}
@@ -123,8 +110,7 @@
* Get visilibity setting.
* @return The visibility setting.
*/
- const std::string& get_visible() const
- {
+ const std::string& get_visible() const {
return _visible;
}
@@ -132,8 +118,7 @@
* Get show daughters setting.
* @return Show daughters setting.
*/
- const std::string& get_show_daughters() const
- {
+ const std::string& get_show_daughters() const {
return _showDaughters;
}
@@ -141,8 +126,7 @@
* Get the line style.
* @return The line style.
*/
- const std::string& get_line_style() const
- {
+ const std::string& get_line_style() const {
return _lineStyle;
}
@@ -150,8 +134,7 @@
* Get the drawing style.
* @return The drawing style.
*/
- const std::string& get_drawing_style() const
- {
+ const std::string& get_drawing_style() const {
return _drawingStyle;
}
@@ -159,8 +142,7 @@
* Get the child content.
* @return The child content.
*/
- const ContentSequence* get_content() const
- {
+ const ContentSequence* get_content() const {
return &_sequence;
}
@@ -169,8 +151,7 @@
* @param tag The child tag.
* @param so The child's SAXObject.
*/
- void add_content(const std::string& tag, SAXObject* so)
- {
+ void add_content(const std::string& tag, SAXObject* so) {
ContentGroup::ContentItem ci = { tag, so };
_sequence.add_content(ci);
}
diff -u -r1.6 -r1.7 --- author.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ author.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/author.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -10,30 +10,26 @@
/** * @brief The author element from the schema. */
-class author: public SAXObject, public AuthorType
-{
+class author: public SAXObject, public AuthorType {
public:
- /**
- * Class constructor.
- */
- author()
- {
+ /**
+ * Class constructor.
+ */
+ author() {
}
/**
* Class destructor.
*/
- virtual ~author()
- {
+ virtual ~author() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- box_dipole.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ box_dipole.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/box_dipole.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,31 +12,27 @@
/** * @brief The box_dipole element from the schema. */
-class box_dipole: public SAXObject, public BoxDipoleType
-{
+class box_dipole: public SAXObject, public BoxDipoleType {
public:
- /**
- * Class constructor.
- */
- box_dipole()
- {
+ /**
+ * Class constructor.
+ */
+ box_dipole() {
}
/**
* Class destructor.
*/
- virtual ~box_dipole()
- {
+ virtual ~box_dipole() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- calorimeter.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ calorimeter.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/calorimeter.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,30 +11,26 @@
/** * @brief The calorimeter element from the schema. */
-class calorimeter: public SAXObject, public CalorimeterType
-{
+class calorimeter: public SAXObject, public CalorimeterType {
public:
- /**
- * Class constructor.
- */
- calorimeter()
- {
+ /**
+ * Class constructor.
+ */
+ calorimeter() {
}
/**
* Class destructor.
*/
- virtual ~calorimeter()
- {
+ virtual ~calorimeter() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.6 -r1.7 --- cell_readout_2d.hh 12 Sep 2013 19:45:10 -0000 1.6 +++ cell_readout_2d.hh 14 Nov 2013 00:47:21 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/cell_readout_2d.hh,v 1.6 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,31 +12,27 @@
/** * @brief The cell_readout_2d element from the schema. */
-class cell_readout_2d: public SAXObject, public CellReadout2DSegmentationType
-{
+class cell_readout_2d: public SAXObject, public CellReadout2DSegmentationType {
public:
- /**
- * Class constructor.
- */
- cell_readout_2d()
- {
+ /**
+ * Class constructor.
+ */
+ cell_readout_2d() {
}
/**
* Class destructor.
*/
- virtual ~cell_readout_2d()
- {
+ virtual ~cell_readout_2d() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- color.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ color.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/color.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,30 +12,26 @@
/** * @brief The color element from the schema. */
-class color: public SAXObject, public ColorType
-{
+class color: public SAXObject, public ColorType {
public:
- /**
- * Class constructor.
- */
- color()
- {
+ /**
+ * Class constructor.
+ */
+ color() {
}
/**
* Class destructor.
*/
- virtual ~color()
- {
+ virtual ~color() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- comment.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ comment.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/comment.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,30 +12,26 @@
/** * @brief The comment element from the schema. */
-class comment: public SAXObject, public CommentType
-{
+class comment: public SAXObject, public CommentType {
public:
- /**
- * Class constructor.
- */
- comment()
- {
+ /**
+ * Class constructor.
+ */
+ comment() {
}
/**
* Class destructor.
*/
- virtual ~comment()
- {
+ virtual ~comment() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- detector.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ detector.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/detector.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,30 +12,26 @@
/** * @brief The detector element from the schema, within the header block. */
-class detector: public SAXObject, public DetectorType
-{
+class detector: public SAXObject, public DetectorType {
public:
- /**
- * Class constructor.
- */
- detector()
- {
+ /**
+ * Class constructor.
+ */
+ detector() {
}
/**
* Class destructor.
*/
- virtual ~detector()
- {
+ virtual ~detector() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- dipole.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ dipole.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/dipole.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,30 +11,26 @@
/** * @brief The dipole element from the schema. */
-class dipole: public SAXObject, public DipoleType
-{
+class dipole: public SAXObject, public DipoleType {
public:
- /**
- * Class constructor.
- */
- dipole()
- {
+ /**
+ * Class constructor.
+ */
+ dipole() {
}
/**
* Class destructor.
*/
- virtual ~dipole()
- {
+ virtual ~dipole() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- dipole_coeff.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ dipole_coeff.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/dipole_coeff.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -8,30 +8,26 @@
/** * @brief The dipole_coeff element from the schema. */
-class dipole_coeff: public SAXObject, public DipoleCoeffType
-{
+class dipole_coeff: public SAXObject, public DipoleCoeffType {
public:
- /**
- * Class constructor.
- */
- dipole_coeff()
- {
+ /**
+ * Class constructor.
+ */
+ dipole_coeff() {
}
/**
* Class destructor.
*/
- virtual ~dipole_coeff()
- {
+ virtual ~dipole_coeff() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- field.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ field.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/field.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,30 +12,26 @@
/** * @brief The field element from the schema. */
-class field: public SAXObject, public FieldType
-{
+class field: public SAXObject, public FieldType {
public:
- /**
- * Class constructor.
- */
- field()
- {
+ /**
+ * Class constructor.
+ */
+ field() {
}
/**
* Class destructor.
*/
- virtual ~field()
- {
+ virtual ~field() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- field_map_3d.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ field_map_3d.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/field_map_3d.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -8,31 +8,27 @@
/** * @brief The field_map_3d type from the schema. */
-class field_map_3d: public SAXObject, public FieldMap3DType
-{
+class field_map_3d: public SAXObject, public FieldMap3DType {
public:
- /**
- * Class constructor.
- */
- field_map_3d()
- {
+ /**
+ * Class constructor.
+ */
+ field_map_3d() {
}
/**
* Class destructor.
*/
- virtual ~field_map_3d()
- {
+ virtual ~field_map_3d() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- generator.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ generator.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/generator.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,30 +12,26 @@
/** * @brief The generator element from the schema. */
-class generator: public SAXObject, public GeneratorType
-{
+class generator: public SAXObject, public GeneratorType {
public:
- /**
- * Class constructor.
- */
- generator()
- {
+ /**
+ * Class constructor.
+ */
+ generator() {
}
/**
* Class destructor.
*/
- virtual ~generator()
- {
+ virtual ~generator() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- global_field.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ global_field.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/global_field.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,30 +12,26 @@
/** * @brief The global_field element from the schema. */
-class global_field: public SAXObject, public GlobalFieldType
-{
+class global_field: public SAXObject, public GlobalFieldType {
public:
- /**
- * Class constructor.
- */
- global_field()
- {
+ /**
+ * Class constructor.
+ */
+ global_field() {
}
/**
* Class destructor.
*/
- virtual ~global_field()
- {
+ virtual ~global_field() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- global_grid_xy.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ global_grid_xy.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/global_grid_xy.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -14,22 +14,19 @@
/** * @brief The global_grid_xy element from the schema. */
-class global_grid_xy: public SAXObject, public GlobalGridXYSegmentationType
-{
+class global_grid_xy: public SAXObject, public GlobalGridXYSegmentationType {
public:
- /**
- * Class constructor.
- */
- global_grid_xy()
- {
+ /**
+ * Class constructor.
+ */
+ global_grid_xy() {
}
/**
* Class destructor.
*/
- virtual ~global_grid_xy()
- {
+ virtual ~global_grid_xy() {
} public:
@@ -38,8 +35,7 @@
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- grid_xyz.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ grid_xyz.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/grid_xyz.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,31 +12,27 @@
/** * @brief The grid_xyz element from the schema. */
-class grid_xyz: public SAXObject, public NonprojectiveSegmentationType
-{
+class grid_xyz: public SAXObject, public NonprojectiveSegmentationType {
public:
- /**
- * Class constructor.
- */
- grid_xyz()
- {
+ /**
+ * Class constructor.
+ */
+ grid_xyz() {
}
/**
* Class destructor.
*/
- virtual ~grid_xyz()
- {
+ virtual ~grid_xyz() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- header.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ header.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/header.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,30 +12,26 @@
/** * @brief The header element from the schema. */
-class header: public SAXObject, public HeaderType
-{
+class header: public SAXObject, public HeaderType {
public:
- /**
- * Class constructor.
- */
- header()
- {
+ /**
+ * Class constructor.
+ */
+ header() {
}
/**
* Class destructor.
*/
- virtual ~header()
- {
+ virtual ~header() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.3 -r1.4 --- hit_processor.hh 12 Sep 2013 19:45:10 -0000 1.3 +++ hit_processor.hh 14 Nov 2013 00:47:21 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/hit_processor.hh,v 1.3 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/hit_processor.hh,v 1.4 2013/11/14 00:47:21 jeremy Exp $
#ifndef LCDD_SCHEMA_HITPROCESSOR_HH #define LCDD_SCHEMA_HITPROCESSOR_HH 1
@@ -9,14 +9,13 @@
// GDML #include "Saxana/SAXObject.h"
-class hit_processor : public SAXObject, public HitProcessorType
-{
+class hit_processor: public SAXObject, public HitProcessorType {
public:
- /** - * Class constructor. - */
+ /** + * Class constructor. + */
hit_processor();
/**
diff -u -r1.3 -r1.4 --- hits_collection.hh 12 Sep 2013 19:45:10 -0000 1.3 +++ hits_collection.hh 14 Nov 2013 00:47:21 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/hits_collection.hh,v 1.3 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,14 +13,13 @@
* @brief * The hits_collection element from the XML schema. */
-class hits_collection : public SAXObject, public HitsCollectionType
-{
+class hits_collection: public SAXObject, public HitsCollectionType {
public:
- /** - * Class constructor. - */
+ /** + * Class constructor. + */
hits_collection();
/**
diff -u -r1.5 -r1.6 --- idfieldElem.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ idfieldElem.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/idfieldElem.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,30 +12,26 @@
* @brief * The idfield element from the schema. */
-class idfieldElem: public SAXObject, public IdFieldType
-{
+class idfieldElem: public SAXObject, public IdFieldType {
public:
- /**
- * Class constructor.
- */
- idfieldElem()
- {
+ /**
+ * Class constructor.
+ */
+ idfieldElem() {
}
/**
* Class destructor.
*/
- virtual ~idfieldElem()
- {
+ virtual ~idfieldElem() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- idspecElem.hh 12 Sep 2013 19:45:10 -0000 1.5 +++ idspecElem.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/idspecElem.hh,v 1.5 2013/09/12 19:45:10 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,31 +11,27 @@
/** * @brief The idspec element from the schema. */
-class idspecElem: public SAXObject, public IdSpecType
-{
+class idspecElem: public SAXObject, public IdSpecType {
public:
- /**
- * Class constructor.
- */
- idspecElem()
- {
+ /**
+ * Class constructor.
+ */
+ idspecElem() {
}
/**
* Class destructor.
*/
- virtual ~idspecElem()
- {
+ virtual ~idspecElem() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- limit.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ limit.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/limit.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,30 +11,26 @@
/** * @brief The limit element from the subschema. */
-class limit: public SAXObject, public LimitParamType
-{
+class limit: public SAXObject, public LimitParamType {
public:
- /**
- * Class constructor.
- */
- limit()
- {
+ /**
+ * Class constructor.
+ */
+ limit() {
}
/**
* Class destructor.
*/
- virtual ~limit()
- {
+ virtual ~limit() {
}
/**
* Get the type of the object which is XML element.
* @return The type of the object.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- limitset.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ limitset.hh 14 Nov 2013 00:47:21 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/limitset.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,30 +11,26 @@
/** * @brief The limitset element from the schema. */
-class limitset: public SAXObject, public LimitSetType
-{
+class limitset: public SAXObject, public LimitSetType {
public:
- /**
- * Class constructor.
- */
- limitset()
- {
+ /**
+ * Class constructor.
+ */
+ limitset() {
}
/**
* Class destructor.
*/
- virtual ~limitset()
- {
+ virtual ~limitset() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- nonprojective_cylinder.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ nonprojective_cylinder.hh 14 Nov 2013 00:47:22 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/nonprojective_cylinder.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,31 +12,27 @@
/** * @brief The nonprojective_cylinder element from schema. */
-class nonprojective_cylinder: public SAXObject, public NonprojectiveCylinderSegmentationType
-{
+class nonprojective_cylinder: public SAXObject, public NonprojectiveCylinderSegmentationType {
public:
- /**
- * Class constructor.
- */
- nonprojective_cylinder()
- {
+ /**
+ * Class constructor.
+ */
+ nonprojective_cylinder() {
}
/**
* Class destructor.
*/
- virtual ~nonprojective_cylinder()
- {
+ virtual ~nonprojective_cylinder() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- physvolidElem.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ physvolidElem.hh 14 Nov 2013 00:47:22 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/physvolidElem.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,31 +11,27 @@
/** * @brief The physvolid element from the schema. */
-class physvolidElem: public SAXObject, public PhysVolIdType
-{
+class physvolidElem: public SAXObject, public PhysVolIdType {
public:
- /**
- * Class constructor.
- */
- physvolidElem()
- {
+ /**
+ * Class constructor.
+ */
+ physvolidElem() {
}
/**
* Class destructor.
*/
- virtual ~physvolidElem()
- {
+ virtual ~physvolidElem() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- projective_cylinder.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ projective_cylinder.hh 14 Nov 2013 00:47:22 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/projective_cylinder.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,31 +12,27 @@
/** * @brief The projective_cylinder element from the schema. */
-class projective_cylinder: public SAXObject, public ProjectiveCylinderSegmentationType
-{
+class projective_cylinder: public SAXObject, public ProjectiveCylinderSegmentationType {
public:
- /**
- * Class constructor.
- */
- projective_cylinder()
- {
+ /**
+ * Class constructor.
+ */
+ projective_cylinder() {
}
/**
* Class destructor.
*/
- virtual ~projective_cylinder()
- {
+ virtual ~projective_cylinder() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- projective_zplane.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ projective_zplane.hh 14 Nov 2013 00:47:22 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/projective_zplane.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,31 +12,27 @@
/** * @brief The projective_zplane element from the schema. */
-class projective_zplane: public SAXObject, public ProjectiveZPlaneSegmentationType
-{
+class projective_zplane: public SAXObject, public ProjectiveZPlaneSegmentationType {
public:
- /**
- * Class constructor.
- */
- projective_zplane()
- {
+ /**
+ * Class constructor.
+ */
+ projective_zplane() {
}
/**
* Class destructor.
*/
- virtual ~projective_zplane()
- {
+ virtual ~projective_zplane() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- region.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ region.hh 14 Nov 2013 00:47:22 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/region.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,30 +12,26 @@
/** * @brief The region element from the schema. */
-class region: public SAXObject, public RegionType
-{
+class region: public SAXObject, public RegionType {
public:
- /**
- * Class constructor.
- */
- region()
- {
+ /**
+ * Class constructor.
+ */
+ region() {
}
/**
* Class destructor.
*/
- virtual ~region()
- {
+ virtual ~region() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- rz_field_map.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ rz_field_map.hh 14 Nov 2013 00:47:22 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/rz_field_map.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,30 +9,26 @@
/** * @brief The rz_field_map element from the schema. */
-class rz_field_map: public SAXObject, public RZFieldMapType
-{
+class rz_field_map: public SAXObject, public RZFieldMapType {
public:
- /**
- * Class constructor.
- */
- rz_field_map()
- {
+ /**
+ * Class constructor.
+ */
+ rz_field_map() {
}
/**
* Class destructor.
*/
- virtual ~rz_field_map()
- {
+ virtual ~rz_field_map() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- rzb.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ rzb.hh 14 Nov 2013 00:47:22 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/rzb.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,30 +11,26 @@
/** * @brief The rzB element from the schema. */
-class rzb: public SAXObject, public RZBType
-{
+class rzb: public SAXObject, public RZBType {
public:
- /**
- * Class constructor.
- */
- rzb()
- {
+ /**
+ * Class constructor.
+ */
+ rzb() {
}
/**
* Class destructor.
*/
- virtual ~rzb()
- {
+ virtual ~rzb() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- sensitive_detector.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ sensitive_detector.hh 14 Nov 2013 00:47:22 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/sensitive_detector.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,30 +12,26 @@
/** * @brief The sensitive_detector element from the schema. */
-class sensitive_detector: public SAXObject, public SensitiveDetectorType
-{
+class sensitive_detector: public SAXObject, public SensitiveDetectorType {
public:
- /**
- * Class constructor.
- */
- sensitive_detector()
- {
+ /**
+ * Class constructor.
+ */
+ sensitive_detector() {
}
/**
* Class destructor.
*/
- virtual ~sensitive_detector()
- {
+ virtual ~sensitive_detector() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- solenoid.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ solenoid.hh 14 Nov 2013 00:47:22 -0000 1.6 @@ -1,4 +1,4 @@
-// $Id: solenoid.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Id: solenoid.hh,v 1.6 2013/11/14 00:47:22 jeremy Exp $
#ifndef LCDD_SCHEMA_SOLENOID_HH #define LCDD_SCHEMA_SOLENOID_HH
@@ -12,30 +12,26 @@
/** * @brief The solenoid element from the schema. */
-class solenoid: public SAXObject, public SolenoidType
-{
+class solenoid: public SAXObject, public SolenoidType {
public:
- /**
- * Class constructor.
- */
- solenoid()
- {
+ /**
+ * Class constructor.
+ */
+ solenoid() {
}
/**
* Class destructor.
*/
- virtual ~solenoid()
- {
+ virtual ~solenoid() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.5 -r1.6 --- tracker.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ tracker.hh 14 Nov 2013 00:47:22 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/tracker.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,30 +13,26 @@
/** * @brief The tracker element from the schema. */
-class tracker: public SAXObject, public TrackerType
-{
+class tracker: public SAXObject, public TrackerType {
public:
- /**
- * Class constructor.
- */
- tracker()
- {
+ /**
+ * Class constructor.
+ */
+ tracker() {
}
/**
* Class destructor.
*/
- virtual ~tracker()
- {
+ virtual ~tracker() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
//std::cout << "tracker::type()" << std::endl;
return SAXObject::element;
}
diff -u -r1.5 -r1.6 --- vis.hh 12 Sep 2013 23:26:42 -0000 1.5 +++ vis.hh 14 Nov 2013 00:47:22 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/vis.hh,v 1.5 2013/09/12 23:26:42 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,30 +12,26 @@
/** * @brief The vis element from the schema. */
-class vis: public SAXObject, public VisType
-{
+class vis: public SAXObject, public VisType {
public:
- /**
- * Class constructor.
- */
- vis()
- {
+ /**
+ * Class constructor.
+ */
+ vis() {
}
/**
* Class destructor.
*/
- virtual ~vis()
- {
+ virtual ~vis() {
}
/**
* Get the type of this SAXObject.
* @return The type of this SAXObject.
*/
- virtual SAXObject::Type type()
- {
+ virtual SAXObject::Type type() {
return SAXObject::element;
}
};
diff -u -r1.1 -r1.2 --- CellReadout.hh 10 Sep 2013 21:57:32 -0000 1.1 +++ CellReadout.hh 14 Nov 2013 00:47:23 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/segmentation/CellReadout.hh,v 1.1 2013/09/10 21:57:32 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,21 +12,18 @@
* @brief Pure virtual base class for calorimeter cell readouts to implement. * @todo Move to DDSegmentation package. */
-class CellReadout
-{
+class CellReadout {
public:
/** 2D XY position. */
- struct Position2D
- {
+ struct Position2D {
double x;
double y;
};
/** Cell ID represented as a pair of int values. */
- struct CellId
- {
+ struct CellId {
int ix;
int iy;
};
diff -u -r1.1 -r1.2 --- CellReadout2D.hh 10 Sep 2013 21:57:32 -0000 1.1 +++ CellReadout2D.hh 14 Nov 2013 00:47:23 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/segmentation/CellReadout2D.hh,v 1.1 2013/09/10 21:57:32 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -16,8 +16,7 @@
* with coordinate origin in the lower lefthand corner of the * readout volume. */
-class CellReadout2D: public CellReadout
-{
+class CellReadout2D: public CellReadout {
public:
diff -u -r1.1 -r1.2 --- CellReadout2DSegmentation.hh 10 Sep 2013 21:57:32 -0000 1.1 +++ CellReadout2DSegmentation.hh 14 Nov 2013 00:47:23 -0000 1.2 @@ -13,16 +13,15 @@
/** * @brief Adapt a CellReadout2D object to the LCDD Segmentation interface. */
-class CellReadout2DSegmentation: public Segmentation
-{
+class CellReadout2DSegmentation: public Segmentation {
public:
- /** - * Class constructor. - * @param[in] cellSizeX The cell size X. - * @param[in] cellSizeY The cell size Y. - */
+ /** + * Class constructor. + * @param[in] cellSizeX The cell size X. + * @param[in] cellSizeY The cell size Y. + */
CellReadout2DSegmentation(double cellSizeX, double cellSizeY);
/**
diff -u -r1.1 -r1.2 --- GlobalGridXYSegmentation.hh 10 Sep 2013 21:57:32 -0000 1.1 +++ GlobalGridXYSegmentation.hh 14 Nov 2013 00:47:23 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/segmentation/GlobalGridXYSegmentation.hh,v 1.1 2013/09/10 21:57:32 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,16 +13,15 @@
* @brief An XY grid Segmentation in global coordinates. * @note This is a version of grid segmentation with binning on global coordinates. */
-class GlobalGridXYSegmentation: public Segmentation
-{
+class GlobalGridXYSegmentation: public Segmentation {
public:
- /** - * Class constructor. - * @param[in] gridSizeX The grid size X. - * @param[in] gridSizeY The grid size Y. - */
+ /** + * Class constructor. + * @param[in] gridSizeX The grid size X. + * @param[in] gridSizeY The grid size Y. + */
GlobalGridXYSegmentation(double gridSizeX, double gridSizeY);
/**
@@ -45,7 +44,6 @@
* @return The local cell position.
*/
//G4ThreeVector getLocalHitPos(const G4ThreeVector& localStepPos);
-
/**
* Compute the ID bin values from a step.
* @param[in] aStep The G4Step object.
diff -u -r1.1 -r1.2 --- GridXYZSegmentation.hh 10 Sep 2013 21:57:32 -0000 1.1 +++ GridXYZSegmentation.hh 14 Nov 2013 00:47:23 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/segmentation/GridXYZSegmentation.hh,v 1.1 2013/09/10 21:57:32 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,17 +12,16 @@
* @brief A Segmentation that defines a grid in a combination of X, Y or Z coordinates. * @brief This class performs calculations to divide a box-like volume into a uniform, 3D grid of cells. */
-class GridXYZSegmentation: public Segmentation
-{
+class GridXYZSegmentation: public Segmentation {
public:
- /** - * Class constructor. - * @param[in] gridSizeX The grid size in X. - * @param[in] gridSizeY The grid size in Y. - * @param[in] gridSizeZ The grid size in Z. - */
+ /** + * Class constructor. + * @param[in] gridSizeX The grid size in X. + * @param[in] gridSizeY The grid size in Y. + * @param[in] gridSizeZ The grid size in Z. + */
GridXYZSegmentation(double gridSizeX, double gridSizeY, double gridSizeZ);
/**
diff -u -r1.1 -r1.2 --- NonprojectiveCylinderSegmentation.hh 10 Sep 2013 21:57:32 -0000 1.1 +++ NonprojectiveCylinderSegmentation.hh 14 Nov 2013 00:47:23 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/segmentation/NonprojectiveCylinderSegmentation.hh,v 1.1 2013/09/10 21:57:32 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,16 +9,15 @@
* @brief A Segmentation class that implements a nonprojective cylinder. * @todo This class needs much better documentation. Much of the computational code is a black box. */
-class NonprojectiveCylinderSegmentation: public Segmentation
-{
+class NonprojectiveCylinderSegmentation: public Segmentation {
public:
- /** - * Class constructor. - * @param[in] gridSizePhi The grid size in phi (radians). - * @param[in] gridSizeZ The grid size in Z (mm). - */
+ /** + * Class constructor. + * @param[in] gridSizePhi The grid size in phi (radians). + * @param[in] gridSizeZ The grid size in Z (mm). + */
NonprojectiveCylinderSegmentation(double gridSizePhi, double gridSizeZ);
/**
@@ -41,7 +40,6 @@
* @return The global hit position for the step point.
*/
//G4ThreeVector getGlobalHitPos(const G4StepPoint* aPreStepPoint);
-
/**
* Compute bin values from a step.
* @param[in] aStep The G4Step object.
@@ -53,7 +51,6 @@
* @param[in] aPreStepStep The G4StepPoint object.
*/
//void setBins(const G4StepPoint* aPreStepPoint);
-
G4ThreeVector getLocalHitPos(const G4Step* aStep);
/**
diff -u -r1.1 -r1.2 --- ProjectiveCylinderSegmentation.hh 10 Sep 2013 21:57:32 -0000 1.1 +++ ProjectiveCylinderSegmentation.hh 14 Nov 2013 00:47:23 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/segmentation/ProjectiveCylinderSegmentation.hh,v 1.1 2013/09/10 21:57:32 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,16 +11,15 @@
/** * @brief Segmentation that divides cylinders into theta and phi bins. */
-class ProjectiveCylinderSegmentation: public ProjectiveSegmentation
-{
+class ProjectiveCylinderSegmentation: public ProjectiveSegmentation {
public:
- /** - * Class constructor. - * @param[in] ntheta Number of cells in theta. - * @param[in] nphi Number of cells in phi. - */
+ /** + * Class constructor. + * @param[in] ntheta Number of cells in theta. + * @param[in] nphi Number of cells in phi. + */
ProjectiveCylinderSegmentation(G4int ntheta, G4int nphi);
/**
@@ -57,7 +56,6 @@
* @return The radial position of the step point's cell.
*/
//double getRadius(const G4StepPoint* aPreStepPoint);
-
/**
* Get the Z coordinate of a cell from a step point.
* @param[in] aPreStepPoint The G4PreStepPoint object.
diff -u -r1.1 -r1.2 --- ProjectiveSegmentation.hh 10 Sep 2013 21:57:32 -0000 1.1 +++ ProjectiveSegmentation.hh 14 Nov 2013 00:47:23 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/segmentation/ProjectiveSegmentation.hh,v 1.1 2013/09/10 21:57:32 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -10,16 +10,15 @@
* @brief The base class for Segmentation classes with projective readouts. * @todo Should this class be pure virtual or have a protected constructor? */
-class ProjectiveSegmentation: public Segmentation
-{
+class ProjectiveSegmentation: public Segmentation {
public:
- /** - * Class constructor. - * @param[in] ntheta The number of cells in theta per 180 degrees. - * @param[in] nphi The number of cells in phi per 360 degrees. - */
+ /** + * Class constructor. + * @param[in] ntheta The number of cells in theta per 180 degrees. + * @param[in] nphi The number of cells in phi per 360 degrees. + */
ProjectiveSegmentation(int ntheta, int nphi);
/**
diff -u -r1.1 -r1.2 --- ProjectiveZPlaneSegmentation.hh 10 Sep 2013 21:57:32 -0000 1.1 +++ ProjectiveZPlaneSegmentation.hh 14 Nov 2013 00:47:23 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/segmentation/ProjectiveZPlaneSegmentation.hh,v 1.1 2013/09/10 21:57:32 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -13,16 +13,15 @@
* @note This class uses Z from current volume rather than the cylindrical radius. * @todo Document this class better. */
-class ProjectiveZPlaneSegmentation: public ProjectiveSegmentation
-{
+class ProjectiveZPlaneSegmentation: public ProjectiveSegmentation {
public:
- /** - * Class constructor. - * @param[in] ntheta The number of theta bins per 180 degrees. - * @param[in] nphi The number of phi bins per 360 degrees. - */
+ /** + * Class constructor. + * @param[in] ntheta The number of theta bins per 180 degrees. + * @param[in] nphi The number of phi bins per 360 degrees. + */
ProjectiveZPlaneSegmentation(int ntheta, int nphi);
/**
diff -u -r1.1 -r1.2 --- Segmentation.hh 10 Sep 2013 21:57:32 -0000 1.1 +++ Segmentation.hh 14 Nov 2013 00:47:23 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/segmentation/Segmentation.hh,v 1.1 2013/09/10 21:57:32 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -15,15 +15,13 @@
* @brief Base class for calorimeter virtual segmentation implementations. * @todo Add method setVolume(G4LogicalVolume*) for setting up segmentation from the current G4Step. */
-class Segmentation
-{
+class Segmentation {
public:
- /**
- * Defines the basic type of Segmentation, e.g. projective or non-projective.
- */
- enum EType
- {
+ /**
+ * Defines the basic type of Segmentation, e.g. projective or non-projective.
+ */
+ enum EType {
eProjective = 1, eNonprojective
};
diff -u -r1.1 -r1.2 --- SegmentationFactory.hh 10 Sep 2013 21:57:33 -0000 1.1 +++ SegmentationFactory.hh 14 Nov 2013 00:47:23 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/segmentation/SegmentationFactory.hh,v 1.1 2013/09/10 21:57:33 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -12,14 +12,13 @@
/** * @brief Factory for creating Segmentation objects from SAX objects and their tag names. */
-class SegmentationFactory
-{
+class SegmentationFactory {
private:
- /** - * Class constructor which should not be accessed. - */
+ /** + * Class constructor which should not be accessed. + */
SegmentationFactory(); public:
diff -u -r1.3 -r1.4 --- volumeExtendedSubscriber.hh 10 Jul 2013 18:06:19 -0000 1.3 +++ volumeExtendedSubscriber.hh 14 Nov 2013 00:47:23 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/subscribers/volumeExtendedSubscriber.hh,v 1.3 2013/07/10 18:06:19 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -34,8 +34,7 @@
* @brief Handles LCDD tags on GDML volume elements. * @note This is the main extension point of GDML within LCDD package. */
-class volumeExtendedSubscriber: virtual public SAXSubscriber
-{
+class volumeExtendedSubscriber: virtual public SAXSubscriber {
public:
virtual const SAXComponentObject* Build() const;
diff -u -r1.5 -r1.6 --- GDMLWriter.hh 10 Jul 2013 18:06:19 -0000 1.5 +++ GDMLWriter.hh 14 Nov 2013 00:47:23 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/util/GDMLWriter.hh,v 1.5 2013/07/10 18:06:19 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -9,11 +9,9 @@
/** * @brief Wrapper for the GDML package's writer. */
-class GDMLWriter
-{
+class GDMLWriter {
private:
- GDMLWriter()
- {
+ GDMLWriter() {
} public:
diff -u -r1.4 -r1.5 --- GDMLWriterMessenger.hh 10 Jul 2013 18:06:19 -0000 1.4 +++ GDMLWriterMessenger.hh 14 Nov 2013 00:47:23 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/util/GDMLWriterMessenger.hh,v 1.4 2013/07/10 18:06:19 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,8 +11,7 @@
/** * @brief The Geant4 messenger class for the GDMLWriter. */
-class GDMLWriterMessenger: public G4UImessenger
-{
+class GDMLWriterMessenger: public G4UImessenger {
public:
diff -u -r1.6 -r1.7 --- NistElementsDump.hh 10 Jul 2013 20:49:06 -0000 1.6 +++ NistElementsDump.hh 14 Nov 2013 00:47:23 -0000 1.7 @@ -1,4 +1,4 @@
-// $Id: NistElementsDump.hh,v 1.6 2013/07/10 20:49:06 jeremy Exp $
+// $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
@@ -10,8 +10,7 @@
/** * @brief Utility class for dumping NIST element data from Geant4 to XML output. */
-class NistElementsDump
-{
+class NistElementsDump {
private:
static std::string abbrevs[];
diff -u -r1.8 -r1.9 --- StoreInspector.hh 11 Jul 2013 20:41:54 -0000 1.8 +++ StoreInspector.hh 14 Nov 2013 00:47:23 -0000 1.9 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/util/StoreInspector.hh,v 1.8 2013/07/11 20:41:54 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -47,8 +47,7 @@
* The store must have an STL vector or map as its backing data structure. */ template<class Object, class ObjectContainer>
-class StoreInspector: public G4UImessenger
-{
+class StoreInspector: public G4UImessenger {
public:
typedef typename ObjectContainer::iterator iterator;
@@ -60,8 +59,7 @@
* Class constructor.
*/
StoreInspector(const std::string& name, const ObjectContainer* container) :
- G4UImessenger()
- {
+ G4UImessenger() {
//assert(container != 0);
_name = name;
_container = container;
@@ -74,8 +72,7 @@
* @param[in] objVec The list of objects.
* @return The object with name or 0 if doesn't exist.
*/
- Object* findByName(const std::string& name, const std::vector<Object*>* objVec)
- {
+ Object* findByName(const std::string& name, const std::vector<Object*>* objVec) {
Object* obj = 0;
for (typename std::vector<Object*>::const_iterator it = objVec->begin(); it != objVec->end(); it++) {
if (sameName(*it, name)) {
@@ -92,8 +89,7 @@
* @param[in] objMap The object map.
* @return The object with name or 0 if doesn't exist.
*/
- Object* findByName(const std::string& name, const std::map<std::string, Object*>* objMap)
- {
+ Object* findByName(const std::string& name, const std::map<std::string, Object*>* objMap) {
std::map<std::string, Object*>* objMap_nconst = const_cast<std::map<std::string, Object*>*>(objMap);
return (*objMap_nconst)[name];
}
@@ -104,8 +100,7 @@
* @param[in] name The name to compare.
* @return True if names are the same; false if not.
*/
- bool sameName(Object* obj, const std::string& name)
- {
+ bool sameName(Object* obj, const std::string& name) {
return (((std::string) obj->GetName()) == name);
}
@@ -114,8 +109,7 @@
* @param[in] name The object name.
* @return The object with name or 0 if doesn't exist.
*/
- Object* find(const std::string& name)
- {
+ Object* find(const std::string& name) {
return findByName(name, const_cast<const ObjectContainer*>(_container));
}
@@ -124,8 +118,7 @@
* @param[in] it The map iterator.
* @return The object from the iterator.
*/
- Object* getObject(typename std::map<std::string, Object*>::const_iterator it)
- {
+ Object* getObject(typename std::map<std::string, Object*>::const_iterator it) {
return it->second;
}
@@ -134,8 +127,7 @@
* @param[in] it The vector iterator.
* @return The object from the iterator.
*/
- Object* getObject(typename std::vector<Object*>::const_iterator it)
- {
+ Object* getObject(typename std::vector<Object*>::const_iterator it) {
return (*it);
}
@@ -144,8 +136,7 @@
* @param[in] it The map iterator.
* @return The name of the object from the iterator.
*/
- const std::string& getObjectName(typename std::map<std::string, Object*>::const_iterator it)
- {
+ const std::string& getObjectName(typename std::map<std::string, Object*>::const_iterator it) {
return it->first;
}
@@ -154,8 +145,7 @@
* @param[in] it The vector iterator.
* @return The object name.
*/
- const std::string& getObjectName(typename std::vector<Object*>::const_iterator it)
- {
+ const std::string& getObjectName(typename std::vector<Object*>::const_iterator it) {
return (*it)->GetName();
}
@@ -164,8 +154,7 @@
* @param[in] os An output stream.
* @return The same output stream.
*/
- std::ostream& printStore(std::ostream& os)
- {
+ std::ostream& printStore(std::ostream& os) {
os << "********* " + _name + " store ********" << endl << endl;
for (const_iterator it = _container->begin(); it != _container->end(); it++) {
printObject(os, getObjectName(it), getObject(it));
@@ -181,8 +170,7 @@
* @param[in] name The name of the object.
* @param[in] object The object to print.
*/
- std::ostream& printObject(std::ostream& os, const std::string& name, Object* obj)
- {
+ std::ostream& printObject(std::ostream& os, const std::string& name, Object* obj) {
os << _name << " - " << name << endl;
os << (*obj) << endl;
return os;
@@ -191,8 +179,7 @@
/**
* Define commands to be used with this inspector.
*/
- void defineCommands()
- {
+ void defineCommands() {
_dir = new G4UIdirectory(std::string("/stores/" + _name + "/").c_str());
_dir->SetGuidance(std::string("Commands for inspecting the " + _name + " store.").c_str());
@@ -208,8 +195,7 @@
* @param[in] cmd The UI command.
* @param[in] newVals The command arguments.
*/
- virtual void SetNewValue(G4UIcommand* cmd, G4String newVals)
- {
+ virtual void SetNewValue(G4UIcommand* cmd, G4String newVals) {
std::string name = (std::string) newVals;
if (name != std::string("")) {
Object* obj = find(name);
@@ -251,8 +237,7 @@
* @param[in] limset The PhysicsLimitSet to print. * @return The same output stream. */
-std::ostream& operator<<(std::ostream& os, PhysicsLimitSet& limset)
-{
+std::ostream& operator<<(std::ostream& os, PhysicsLimitSet& limset) {
os << endl;
for (PhysicsLimitSet::LimitSetMap::const_iterator it = limset.getLimitSetMap().begin(); it != limset.getLimitSetMap().end(); it++) {
@@ -291,8 +276,7 @@
* @param[in] lv The volume to print. * @return The same output stream. */
-std::ostream& operator<<(std::ostream &os, G4LogicalVolume &lv)
-{
+std::ostream& operator<<(std::ostream &os, G4LogicalVolume &lv) {
os << "solid: " << lv.GetSolid()->GetName() << endl;
os << "material: " << lv.GetMaterial()->GetName() << endl;
os << "mass: " << G4BestUnit(lv.GetMass(), "Mass") << endl;
@@ -343,8 +327,7 @@
* @param[in] pv The volume to print. * @return The same output stream. */
-std::ostream& operator<<(std::ostream &os, G4VPhysicalVolume &pv)
-{
+std::ostream& operator<<(std::ostream &os, G4VPhysicalVolume &pv) {
os << "lvolume: " << pv.GetLogicalVolume()->GetName() << endl;
os << "pos: " << pv.GetTranslation() << endl;
const G4RotationMatrix* rot = pv.GetRotation();
@@ -364,8 +347,7 @@
* @param[in] id The IdSpec to print. * @return The same output stream. */
-std::ostream& operator<<(std::ostream& os, IdSpec& id)
-{
+std::ostream& operator<<(std::ostream& os, IdSpec& id) {
os << "# fields: " << id.getNumFields() << endl;
os << endl;
os << "label\tstart\tlength\tsigned" << endl;
@@ -382,8 +364,7 @@
* @param[in] sd The SensitiveDetector to print. * @return The same output stream. */
-std::ostream& operator<<(std::ostream& os, SensitiveDetector& sd)
-{
+std::ostream& operator<<(std::ostream& os, SensitiveDetector& sd) {
os << "fullPath: " << sd.GetFullPathName() << endl;
os << "HC: " << sd.getHCName() << endl;
os << "HCID: " << sd.getHCID() << endl;
@@ -401,8 +382,7 @@
* @param[in] reg The region to print. * @return The same output stream. */
-std::ostream& operator<<(std::ostream &os, G4Region ®)
-{
+std::ostream& operator<<(std::ostream &os, G4Region ®) {
os << "prod cut: " << reg.GetProductionCuts()->GetProductionCut(0) << endl;
UserRegionInformation* regInfo = static_cast<UserRegionInformation*>(reg.GetUserInformation());
if (0 != regInfo) {
@@ -420,8 +400,7 @@
* @param[in] f The field to print. * @return The same output stream. */
-std::ostream& operator<<(std::ostream& os, G4MagneticField& f)
-{
+std::ostream& operator<<(std::ostream& os, G4MagneticField& f) {
/* Generic B-fields have no displayable data attributes! */
return os;
}
@@ -432,8 +411,7 @@
* @param[in] vis The G4VisAttributes to print. * @return The same output stream. */
-std::ostream& operator<<(std::ostream& os, G4VisAttributes &vis)
-{
+std::ostream& operator<<(std::ostream& os, G4VisAttributes &vis) {
const G4Color& color = vis.GetColor();
os << "RGB: " << color.GetRed() << " " << color.GetGreen() << " " << color.GetBlue() << endl;
os << "Alpha: " << color.GetAlpha() << endl;
diff -u -r1.5 -r1.6 --- StringUtil.hh 10 Jul 2013 18:06:19 -0000 1.5 +++ StringUtil.hh 14 Nov 2013 00:47:23 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/util/StringUtil.hh,v 1.5 2013/07/10 18:06:19 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -11,8 +11,7 @@
/** * @brief A collection of various static string utility functions. */
-class StringUtil
-{
+class StringUtil {
private:
@@ -20,8 +19,7 @@
* Class constructor.
* Should not be instantiated.
*/
- virtual ~StringUtil()
- {
+ virtual ~StringUtil() {
} public:
@@ -136,9 +134,7 @@
* @param[in] delimiters The list of single character delimiters.
* @param[out] tokens The output list of string tokens.
*/
- static void split(const std::string& str, - const std::string& delimiters, - std::vector<std::string>& tokens);
+ static void split(const std::string& str, const std::string& delimiters, std::vector<std::string>& tokens);
}; #endif
diff -u -r1.4 -r1.5 --- Verbose.hh 10 Jul 2013 18:06:19 -0000 1.4 +++ Verbose.hh 14 Nov 2013 00:47:23 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/util/Verbose.hh,v 1.4 2013/07/10 18:06:19 jeremy Exp $
+// $Header: /cvs/lcd/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
@@ -6,8 +6,7 @@
* @brief Mixin class for setting and retrieving verbosity level. * @todo Move code to source file. */
-class Verbose
-{
+class Verbose {
public:
typedef unsigned int LevelType;
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1