 |
 |
code reformatting
diff -u -r1.5 -r1.6 --- AuthorType.hh 18 Dec 2006 22:49:01 -0000 1.5 +++ AuthorType.hh 24 Jun 2013 22:10:32 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/AuthorType.hh,v 1.5 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/AuthorType.hh,v 1.6 2013/06/24 22:10:32 jeremy Exp $
#ifndef LCDD_AUTHORTYPE_HH #define LCDD_AUTHORTYPE_HH 1
@@ -6,42 +6,44 @@
#include <string> /**
- @class AuthorType - @brief AuthorType from schema. -*/
+ @class AuthorType + @brief AuthorType from schema. + */
class AuthorType
{
public:
- AuthorType()
- {}
-
- virtual ~AuthorType()
- {}
-
- void set_name(const std::string& n)
- {
- m_name = n;
- }
-
- void set_email(const std::string& o)
- {
- m_email = o;
- }
-
- const std::string& get_name() const
- {
- return m_name;
- }
-
- const std::string& get_email() const
- {
- return m_email;
- }
+ AuthorType()
+ {
+ }
+
+ virtual ~AuthorType()
+ {
+ }
+
+ void set_name(const std::string& n)
+ {
+ m_name = n;
+ }
+
+ void set_email(const std::string& o)
+ {
+ m_email = o;
+ }
+
+ const std::string& get_name() const
+ {
+ return m_name;
+ }
+
+ const std::string& get_email() const
+ {
+ return m_email;
+ }
private:
- std::string m_name; - std::string m_email;
+ std::string m_name; + std::string m_email;
}; #endif
diff -u -r1.1 -r1.2 --- BoxDipoleType.hh 23 Jun 2011 21:04:09 -0000 1.1 +++ BoxDipoleType.hh 24 Jun 2013 22:10:32 -0000 1.2 @@ -7,121 +7,122 @@
* @class BoxDipoleType * @brief This is a representation of the BoxDipoleType from the LCDD schema. */
-class BoxDipoleType : public FieldType
+class BoxDipoleType: public FieldType
{
- public:
-
- BoxDipoleType()
- {}
-
- virtual ~BoxDipoleType()
- {}
-
-
- public:
-
- void set_x(const std::string& s)
- {
- _x = s;
- }
-
- void set_y(const std::string& s)
- {
- _y = s;
- }
-
- void set_z(const std::string& s)
- {
- _z = s;
- }
-
- void set_dx(const std::string& s)
- {
- _dx = s;
- }
-
- void set_dy(const std::string& s)
- {
- _dy = s;
- }
-
- void set_dz(const std::string& s)
- {
- _dz = s;
- }
-
- void set_bx(const std::string& s)
- {
- _bx = s;
- }
-
- void set_by(const std::string& s)
- {
- _by = s;
- }
-
- void set_bz(const std::string& s)
- {
- _bz = s;
- }
-
- const std::string& get_x() const
- {
- return _x;
- }
-
- const std::string& get_y() const
- {
- return _y;
- }
-
- const std::string& get_z() const
- {
- return _z;
- }
-
- const std::string& get_dx() const
- {
- return _dx;
- }
-
- const std::string& get_dy() const
- {
- return _dy;
- }
-
- const std::string& get_dz() const
- {
- return _dz;
- }
-
- const std::string& get_bx() const
- {
- return _bx;
- }
-
- const std::string& get_by() const
- {
- return _by;
- }
-
- const std::string& get_bz() const
- {
- return _bz;
- }
-
- private:
-
- std::string _x;
- std::string _y;
- std::string _z;
- std::string _dx;
- std::string _dy;
- std::string _dz;
- std::string _bx;
- std::string _by;
- std::string _bz;
+public:
+
+ BoxDipoleType()
+ {
+ }
+
+ virtual ~BoxDipoleType()
+ {
+ }
+
+public:
+
+ void set_x(const std::string& s)
+ {
+ _x = s;
+ }
+
+ void set_y(const std::string& s)
+ {
+ _y = s;
+ }
+
+ void set_z(const std::string& s)
+ {
+ _z = s;
+ }
+
+ void set_dx(const std::string& s)
+ {
+ _dx = s;
+ }
+
+ void set_dy(const std::string& s)
+ {
+ _dy = s;
+ }
+
+ void set_dz(const std::string& s)
+ {
+ _dz = s;
+ }
+
+ void set_bx(const std::string& s)
+ {
+ _bx = s;
+ }
+
+ void set_by(const std::string& s)
+ {
+ _by = s;
+ }
+
+ void set_bz(const std::string& s)
+ {
+ _bz = s;
+ }
+
+ const std::string& get_x() const
+ {
+ return _x;
+ }
+
+ const std::string& get_y() const
+ {
+ return _y;
+ }
+
+ const std::string& get_z() const
+ {
+ return _z;
+ }
+
+ const std::string& get_dx() const
+ {
+ return _dx;
+ }
+
+ const std::string& get_dy() const
+ {
+ return _dy;
+ }
+
+ const std::string& get_dz() const
+ {
+ return _dz;
+ }
+
+ const std::string& get_bx() const
+ {
+ return _bx;
+ }
+
+ const std::string& get_by() const
+ {
+ return _by;
+ }
+
+ const std::string& get_bz() const
+ {
+ return _bz;
+ }
+
+private:
+
+ std::string _x;
+ std::string _y;
+ std::string _z;
+ std::string _dx;
+ std::string _dy;
+ std::string _dz;
+ std::string _bx;
+ std::string _by;
+ std::string _bz;
}; #endif
diff -u -r1.1 -r1.2 --- CalorimeterHitProcessor.hh 18 Jun 2013 19:56:18 -0000 1.1 +++ CalorimeterHitProcessor.hh 24 Jun 2013 22:10:32 -0000 1.2 @@ -21,5 +21,4 @@
CellReadout* m_readout; };
-
#endif
diff -u -r1.7 -r1.8 --- CalorimeterType.hh 18 Dec 2006 22:49:01 -0000 1.7 +++ CalorimeterType.hh 24 Jun 2013 22:10:33 -0000 1.8 @@ -10,46 +10,49 @@
/** * @class CalorimeterType * @brief CalorimeterType from schema.
-*/ -class CalorimeterType : public SensitiveDetectorType
+ */ +class CalorimeterType: public SensitiveDetectorType
{
public:
- CalorimeterType()
- {}
-
- virtual ~CalorimeterType()
- {}
+ CalorimeterType()
+ {
+ }
+
+ virtual ~CalorimeterType()
+ {
+ }
public:
- const ContentSequence* get_content() const {
- return &m_sequence;
- }
-
- // add a segmentation
- void add_content( const std::string& tag, SAXObject* so )
- {
- ContentGroup::ContentItem ci = {tag, so };
- m_sequence.add_content( ci );
- }
-
- void set_compare( const std::string& compare )
- {
- m_compare = compare;
- }
-
- const std::string& get_compare() const
- {
- return m_compare;
- }
+ const ContentSequence* get_content() const
+ {
+ return &m_sequence;
+ }
+
+ // add a segmentation
+ void add_content(const std::string& tag, SAXObject* so)
+ {
+ ContentGroup::ContentItem ci = { tag, so };
+ m_sequence.add_content(ci);
+ }
+
+ void set_compare(const std::string& compare)
+ {
+ m_compare = compare;
+ }
+
+ const std::string& get_compare() const
+ {
+ return m_compare;
+ }
private:
- ContentSequence m_sequence;
+ ContentSequence m_sequence;
- std::string m_compare;
+ std::string m_compare;
};
diff -u -r1.1 -r1.2 --- Cartesian3DMagneticFieldMap.hh 3 Oct 2012 00:48:25 -0000 1.1 +++ Cartesian3DMagneticFieldMap.hh 24 Jun 2013 22:10:33 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/Cartesian3DMagneticFieldMap.hh,v 1.1 2012/10/03 00:48:25 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/Cartesian3DMagneticFieldMap.hh,v 1.2 2013/06/24 22:10:33 jeremy Exp $
#include "G4MagneticField.hh"
@@ -10,35 +10,35 @@
// S.Larsson and J. Generowicz. //
-class Cartesian3DMagneticFieldMap: public G4MagneticField {
+class Cartesian3DMagneticFieldMap: public G4MagneticField
+{
private:
- // Storage space for the table - vector<vector<vector<double> > > _xField; - vector<vector<vector<double> > > _yField; - vector<vector<vector<double> > > _zField; - - // The dimensions of the table - int _nx, _ny, _nz; - - // The physical limits of the defined region - double _minx, _maxx, _miny, _maxy, _minz, _maxz; - - // The physical extent of the defined region - double _dx, _dy, _dz; - - // Offsets if field map is not in global coordinates - double _xOffset; - double _yOffset; - double _zOffset;
+ // Storage space for the table + vector<vector<vector<double> > > _xField; + vector<vector<vector<double> > > _yField; + vector<vector<vector<double> > > _zField; + + // The dimensions of the table + int _nx, _ny, _nz; + + // The physical limits of the defined region + double _minx, _maxx, _miny, _maxy, _minz, _maxz; + + // The physical extent of the defined region + double _dx, _dy, _dz; + + // Offsets if field map is not in global coordinates + double _xOffset; + double _yOffset; + double _zOffset;
- bool _invertX, _invertY, _invertZ;
+ bool _invertX, _invertY, _invertZ;
public:
- Cartesian3DMagneticFieldMap(const char* filename, double xOffset, - double yOffset, double zOffset);
+ Cartesian3DMagneticFieldMap(const char* filename, double xOffset, double yOffset, double zOffset);
- void GetFieldValue(const double Point[4], double* Bfield) const;
+ void GetFieldValue(const double Point[4], double* Bfield) const;
};
diff -u -r1.3 -r1.4 --- CellReadout2D.hh 18 Jun 2013 19:59:33 -0000 1.3 +++ CellReadout2D.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -11,14 +11,14 @@
/** * */
-class CellReadout2D : public CellReadout
+class CellReadout2D: public CellReadout
{
public:
- /** - * Class destructor. - */
+ /** + * Class destructor. + */
virtual ~CellReadout2D();
/**
@@ -51,56 +51,56 @@
* ----------------------------------------------------------
*/
- /** - * Get the X cell size. - */ - double getCellSizeX(); - - /** - * Get the Y cell size. - */ - double getCellSizeY(); - - /** - * Get the X index from a position. - */ - int getXIndex(double x); - - /** - * Get the Y index from a position. - */ - int getYIndex(double y); - - /* - * Get the X position from a cell index. - */ - double getCellPositionX(int ix); - - /** - * Get the Y position from a Y bin value. - */ - double getCellPositionY(int iy); - - /** - * Get a pair of indices representing a cell. - * This method should check that the indices are valid. - */ - CellId createCell(int x, int y); - - /** - * Given an index and cell size, compute the corresponding coordinate. - */ - double getCellCoordinate(int u, double cellSize); - - /** - * Given a coordinate and cell size, compute the corresponding cell index. - */ - int getCellIndex(double x, double cellSize);
+ /** + * Get the X cell size. + */ + double getCellSizeX(); + + /** + * Get the Y cell size. + */ + double getCellSizeY(); + + /** + * Get the X index from a position. + */ + int getXIndex(double x); + + /** + * Get the Y index from a position. + */ + int getYIndex(double y); + + /* + * Get the X position from a cell index. + */ + double getCellPositionX(int ix); + + /** + * Get the Y position from a Y bin value. + */ + double getCellPositionY(int iy); + + /** + * Get a pair of indices representing a cell. + * This method should check that the indices are valid. + */ + CellId createCell(int x, int y); + + /** + * Given an index and cell size, compute the corresponding coordinate. + */ + double getCellCoordinate(int u, double cellSize); + + /** + * Given a coordinate and cell size, compute the corresponding cell index. + */ + int getCellIndex(double x, double cellSize);
private:
- double m_cellSizeX; - double m_cellSizeY;
+ double m_cellSizeX; + double m_cellSizeY;
}; #endif
diff -u -r1.2 -r1.3 --- CellReadout2DSegmentation.hh 18 Jun 2013 20:00:10 -0000 1.2 +++ CellReadout2DSegmentation.hh 24 Jun 2013 22:10:33 -0000 1.3 @@ -13,14 +13,14 @@
/** * Adapt a CellReadout2D to the LCDD Segmentation interface. */
-class CellReadout2DSegmentation : public G4Segmentation
+class CellReadout2DSegmentation: public G4Segmentation
{
public:
- CellReadout2DSegmentation(double cellSizeX, double cellSizeY);
+ CellReadout2DSegmentation(double cellSizeX, double cellSizeY);
- virtual ~CellReadout2DSegmentation();
+ virtual ~CellReadout2DSegmentation();
G4ThreeVector getGlobalHitPos(const G4Step*);
diff -u -r1.1 -r1.2 --- CellReadout2DSegmentationType.hh 30 May 2013 00:04:12 -0000 1.1 +++ CellReadout2DSegmentationType.hh 24 Jun 2013 22:10:33 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/CellReadout2DSegmentationType.hh,v 1.1 2013/05/30 00:04:12 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/CellReadout2DSegmentationType.hh,v 1.2 2013/06/24 22:10:33 jeremy Exp $
#ifndef lcdd_CellReadout2DSegmentationType_hh #define lcdd_CellReadout2DSegmentationType_hh 1
@@ -7,46 +7,50 @@
#include <string>
-class CellReadout2DSegmentationType : public SegmentationType
+class CellReadout2DSegmentationType: public SegmentationType
{
public:
- CellReadout2DSegmentationType() {}
-
- virtual ~CellReadout2DSegmentationType() {}
+ CellReadout2DSegmentationType()
+ {
+ }
+
+ virtual ~CellReadout2DSegmentationType()
+ {
+ }
public:
- void setCellSizeX(const std::string& cellSizeX)
- {
- m_cellSizeX = cellSizeX;
- }
-
- void setCellSizeY(const std::string& cellSizeY)
- {
- m_cellSizeY = cellSizeY;
- }
-
- void setLengthUnit(const std::string& lengthUnit)
- {
- m_lengthUnit = lengthUnit;
- }
-
- const std::string& getCellSizeX()
- {
- return m_cellSizeX;
- }
-
- const std::string& getCellSizeY()
- {
- return m_cellSizeY;
- }
-
- const std::string& getLengthUnit()
- {
- return m_lengthUnit;
- }
+ void setCellSizeX(const std::string& cellSizeX)
+ {
+ m_cellSizeX = cellSizeX;
+ }
+
+ void setCellSizeY(const std::string& cellSizeY)
+ {
+ m_cellSizeY = cellSizeY;
+ }
+
+ void setLengthUnit(const std::string& lengthUnit)
+ {
+ m_lengthUnit = lengthUnit;
+ }
+
+ const std::string& getCellSizeX()
+ {
+ return m_cellSizeX;
+ }
+
+ const std::string& getCellSizeY()
+ {
+ return m_cellSizeY;
+ }
+
+ const std::string& getLengthUnit()
+ {
+ return m_lengthUnit;
+ }
protected:
diff -u -r1.1 -r1.2 --- Cerenkov.hh 17 Jun 2013 22:06:28 -0000 1.1 +++ Cerenkov.hh 24 Jun 2013 22:10:33 -0000 1.2 @@ -1,23 +1,21 @@
/* ------------------------------------------------------------------------
- |\___/| - ) ( - =\ /= - )===( - / \ CaTS: Calorimeter and Tracker Simulation - | | Author: Hans Wenzel (Fermilab) - / \
+ |\___/| + ) ( + =\ /= + )===( + / \ CaTS: Calorimeter and Tracker Simulation + | | Author: Hans Wenzel (Fermilab) + / \
\ /
- \__ _/ - ( ( - ) ) - (_( --------------------------------------------------------------------------*/
+ \__ _/ + ( ( + ) ) + (_( + -------------------------------------------------------------------------*/
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
#ifndef Cerenkov_h #define Cerenkov_h 1
-
#include <vector> #include "G4PhysicsOrderedFreeVector.hh" #include "G4Material.hh"
@@ -25,7 +23,8 @@
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-class Cerenkov {
+class Cerenkov
+{
public:
Cerenkov();
~Cerenkov();
diff -u -r1.5 -r1.6 --- ColorType.hh 18 Dec 2006 22:49:01 -0000 1.5 +++ ColorType.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/ColorType.hh,v 1.5 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/ColorType.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_COLORTYPE_HH #define LCDD_COLORTYPE_HH 1
@@ -6,64 +6,65 @@
#include <string> /**
- @class ColorType - @brief ColorType from schema. -*/
+ @class ColorType + @brief ColorType from schema. + */
class ColorType
{
public:
- ColorType()
- {}
-
- virtual ~ColorType()
- {}
-
- void set_R(const std::string& r)
- {
- m_R = r;
- }
-
- void set_G(const std::string& g)
- {
- m_G = g;
- }
-
-
- void set_B(const std::string& b)
- {
- m_B = b;
- }
-
- void set_alpha(const std::string& a)
- {
- m_alpha = a;
- }
-
- const std::string& get_R()
- {
- return m_R;
- }
-
- const std::string& get_G()
- {
- return m_G;
- }
-
- const std::string& get_B()
- {
- return m_B;
- }
-
- const std::string& get_alpha()
- {
- return m_alpha;
- }
+ ColorType()
+ {
+ }
+
+ virtual ~ColorType()
+ {
+ }
+
+ void set_R(const std::string& r)
+ {
+ m_R = r;
+ }
+
+ void set_G(const std::string& g)
+ {
+ m_G = g;
+ }
+
+ void set_B(const std::string& b)
+ {
+ m_B = b;
+ }
+
+ void set_alpha(const std::string& a)
+ {
+ m_alpha = a;
+ }
+
+ const std::string& get_R()
+ {
+ return m_R;
+ }
+
+ const std::string& get_G()
+ {
+ return m_G;
+ }
+
+ const std::string& get_B()
+ {
+ return m_B;
+ }
+
+ const std::string& get_alpha()
+ {
+ return m_alpha;
+ }
private:
- std::string m_R; - std::string m_G; - std::string m_B; - std::string m_alpha;
+ std::string m_R; + std::string m_G; + std::string m_B; + std::string m_alpha;
}; #endif
diff -u -r1.4 -r1.5 --- CommentType.hh 18 Dec 2006 22:49:01 -0000 1.4 +++ CommentType.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/CommentType.hh,v 1.4 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/CommentType.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_COMMENTTYPE_HH #define LCDD_COMMENTTYPE_HH 1
@@ -6,31 +6,33 @@
#include <string> /**
- @class CommentType - @brief CommentType from schema.
+ @class CommentType + @brief CommentType from schema.
*/
class CommentType
{
public:
- CommentType()
- {}
-
- virtual ~CommentType()
- {}
-
- void set_comment(const std::string& c)
- {
- m_comment = c;
- }
-
- const std::string& get_comment() const
- {
- return m_comment;
- }
+ CommentType()
+ {
+ }
+
+ virtual ~CommentType()
+ {
+ }
+
+ void set_comment(const std::string& c)
+ {
+ m_comment = c;
+ }
+
+ const std::string& get_comment() const
+ {
+ return m_comment;
+ }
private:
- std::string m_comment;
+ std::string m_comment;
};
diff -u -r1.5 -r1.6 --- DetectorType.hh 18 Dec 2006 22:49:01 -0000 1.5 +++ DetectorType.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/DetectorType.hh,v 1.5 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/DetectorType.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_DETECTORTYPE_HH #define LCDD_DETECTORTYPE_HH 1
@@ -6,54 +6,56 @@
#include <string> /**
- @class DetectorType - @brief DetectorType from schema. -*/
+ @class DetectorType + @brief DetectorType from schema. + */
class DetectorType
{
public:
- DetectorType()
- {}
-
- virtual ~DetectorType()
- {}
+ DetectorType()
+ {
+ }
+
+ virtual ~DetectorType()
+ {
+ }
public:
-
- void set_name(const std::string& n)
- {
- m_name = n;
- }
-
- void set_version(const std::string& v)
- {
- m_version = v;
- }
-
- void set_url(const std::string& u)
- {
- m_url = u;
- }
-
- const std::string& get_name() const
- {
- return m_name;
- }
-
- const std::string& get_version() const
- {
- return m_version;
- }
-
- const std::string& get_url() const
- {
- return m_url;
- }
+
+ void set_name(const std::string& n)
+ {
+ m_name = n;
+ }
+
+ void set_version(const std::string& v)
+ {
+ m_version = v;
+ }
+
+ void set_url(const std::string& u)
+ {
+ m_url = u;
+ }
+
+ const std::string& get_name() const
+ {
+ return m_name;
+ }
+
+ const std::string& get_version() const
+ {
+ return m_version;
+ }
+
+ const std::string& get_url() const
+ {
+ return m_url;
+ }
private:
- std::string m_name; - std::string m_version; - std::string m_url;
+ std::string m_name; + std::string m_version; + std::string m_url;
}; #endif
diff -u -r1.3 -r1.4 --- DipoleCoeffType.hh 18 Dec 2006 22:49:01 -0000 1.3 +++ DipoleCoeffType.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/DipoleCoeffType.hh,v 1.3 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/DipoleCoeffType.hh,v 1.4 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_DIPOLECOEFFTYPE_HH #define LCDD_DIPOLECOEFFTYPE_HH
@@ -11,26 +11,28 @@
class DipoleCoeffType
{
public:
- DipoleCoeffType()
- {}
-
- virtual ~DipoleCoeffType()
- {}
+ DipoleCoeffType()
+ {
+ }
+
+ virtual ~DipoleCoeffType()
+ {
+ }
public:
- void set_value(const std::string& s)
- {
- m_value = s;
- }
-
- const std::string& get_value()
- {
- return m_value;
- }
+ void set_value(const std::string& s)
+ {
+ m_value = s;
+ }
+
+ const std::string& get_value()
+ {
+ return m_value;
+ }
private:
- std::string m_value;
+ std::string m_value;
}; #endif
diff -u -r1.4 -r1.5 --- DipoleType.hh 18 Dec 2006 22:49:01 -0000 1.4 +++ DipoleType.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -14,66 +14,68 @@
* @class DipoleType * @brief DipoleType from lcdd_fields.xsd schema. */
-class DipoleType : public FieldType
+class DipoleType: public FieldType
{
public:
- DipoleType()
- {}
-
- virtual ~DipoleType()
- {}
+ DipoleType()
+ {
+ }
+
+ virtual ~DipoleType()
+ {
+ }
public:
- void set_zmax(const std::string& s)
- {
- m_zmax = s;
- }
-
- void set_zmin(const std::string& s)
- {
- m_zmin = s;
- }
-
- void set_rmax(const std::string& s)
- {
- m_rmax = s;
- }
-
- const std::string& get_zmin() const
- {
- return m_zmin;
- }
-
- const std::string& get_zmax() const
- {
- return m_zmax;
- }
-
- const std::string& get_rmax() const
- {
- return m_rmax;
- }
-
- void add_content(const std::string& tag, SAXObject* so)
- {
- ContentGroup::ContentItem ci = {tag, so };
- m_sequence.add_content(ci);
- }
-
- const ContentSequence* get_content() const
- {
- return &m_sequence;
- }
+ void set_zmax(const std::string& s)
+ {
+ m_zmax = s;
+ }
+
+ void set_zmin(const std::string& s)
+ {
+ m_zmin = s;
+ }
+
+ void set_rmax(const std::string& s)
+ {
+ m_rmax = s;
+ }
+
+ const std::string& get_zmin() const
+ {
+ return m_zmin;
+ }
+
+ const std::string& get_zmax() const
+ {
+ return m_zmax;
+ }
+
+ const std::string& get_rmax() const
+ {
+ return m_rmax;
+ }
+
+ void add_content(const std::string& tag, SAXObject* so)
+ {
+ ContentGroup::ContentItem ci = { tag, so };
+ m_sequence.add_content(ci);
+ }
+
+ const ContentSequence* get_content() const
+ {
+ return &m_sequence;
+ }
private:
- std::string m_zmax; - std::string m_zmin; - std::string m_rmax;
+ std::string m_zmax; + std::string m_zmin; + std::string m_rmax;
- ContentSequence m_sequence;
+ ContentSequence m_sequence;
}; #endif
diff -u -r1.3 -r1.4 --- FieldMap3DType.hh 3 Oct 2012 17:53:00 -0000 1.3 +++ FieldMap3DType.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/FieldMap3DType.hh,v 1.3 2012/10/03 17:53:00 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/FieldMap3DType.hh,v 1.4 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_FIELDMAP3DTYPE_HH #define LCDD_FIELDMAP3DTYPE_HH 1
@@ -9,23 +9,28 @@
/** * @class * @brief
-*/
-class FieldMap3DType : public FieldMapType {
+ */
+class FieldMap3DType: public FieldMapType
+{
public:
- FieldMap3DType() {
+ FieldMap3DType()
+ {
}
- virtual ~FieldMap3DType() {
+ virtual ~FieldMap3DType()
+ {
}
- void set_filename(const std::string& filename) {
- _filename = filename;
+ void set_filename(const std::string& filename)
+ {
+ _filename = filename;
}
- const std::string& get_filename() const {
- return _filename;
+ const std::string& get_filename() const
+ {
+ return _filename;
} private:
diff -u -r1.5 -r1.6 --- FieldMapType.hh 3 Oct 2012 00:48:25 -0000 1.5 +++ FieldMapType.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/FieldMapType.hh,v 1.5 2012/10/03 00:48:25 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/FieldMapType.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_FIELDMAPTYPE_HH #define LCDD_FIELDMAPTYPE_HH 1
@@ -13,30 +13,34 @@
* @brief The "abstract" FieldMapType from lcdd_fields.xsd subschema. * @note The only behavior implemented by this class is adding generic content. */
-class FieldMapType : public FieldType
+class FieldMapType: public FieldType
{
public:
- FieldMapType() {
- }
+ FieldMapType()
+ {
+ }
- virtual ~FieldMapType() {
+ virtual ~FieldMapType()
+ {
} public:
- const ContentSequence* get_content() const {
+ const ContentSequence* get_content() const
+ {
return &m_sequence;
}
- void add_content(const std::string& tag, SAXObject* so) {
- ContentGroup::ContentItem ci = {tag, so};
+ void add_content(const std::string& tag, SAXObject* so)
+ {
+ ContentGroup::ContentItem ci = { tag, so };
m_sequence.add_content(ci);
}
public:
- ContentSequence m_sequence;
+ ContentSequence m_sequence;
};
diff -u -r1.3 -r1.4 --- FieldMapTypeProcess.hh 18 Dec 2006 22:49:01 -0000 1.3 +++ FieldMapTypeProcess.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/FieldMapTypeProcess.hh,v 1.3 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/FieldMapTypeProcess.hh,v 1.4 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_FIELDMAPTYPEPROCESS_HH #define LCDD_FIELDMAPTYPEPROCESS_HH 1
@@ -21,42 +21,46 @@
* @class FieldMapTypeProcess * @brief Generic process for field maps. * @note This class adds generic content using StackPopNotify.
-*/ -class FieldMapTypeProcess : public FieldTypeProcess
+ */ +class FieldMapTypeProcess: public FieldTypeProcess
{
public:
- FieldMapTypeProcess( const ProcessingContext* context = 0)
- : FieldTypeProcess(context)
- {}
-
- virtual ~FieldMapTypeProcess()
- {}
-
- 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)
- {
- // std::cout << "FieldMapTypeProcess::StartElement - " << name << std::endl;
- FieldTypeProcess::StartElement(name, attrs);
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string& name)
- {
- // std::cout << "FieldMapTypeProcess::StackPopNotify" << std::endl;
- SAXObject** so = Context()->GetTopObject();
- FieldMapType* fmap = dynamic_cast<FieldMapType*>( m_obj );
- fmap->add_content( name, *so);
- }
+ FieldMapTypeProcess(const ProcessingContext* context = 0) :
+ FieldTypeProcess(context)
+ {
+ }
+
+ virtual ~FieldMapTypeProcess()
+ {
+ }
+
+ 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)
+ {
+ // std::cout << "FieldMapTypeProcess::StartElement - " << name << std::endl;
+ FieldTypeProcess::StartElement(name, attrs);
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string& name)
+ {
+ // std::cout << "FieldMapTypeProcess::StackPopNotify" << std::endl;
+ SAXObject** so = Context()->GetTopObject();
+ FieldMapType* fmap = dynamic_cast<FieldMapType*>(m_obj);
+ fmap->add_content(name, *so);
+ }
}; #endif
diff -u -r1.7 -r1.8 --- FieldType.hh 18 Dec 2006 22:49:01 -0000 1.7 +++ FieldType.hh 24 Jun 2013 22:10:33 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/FieldType.hh,v 1.7 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/FieldType.hh,v 1.8 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_FIELDTYPE_HH #define LCDD_FIELDTYPE_HH 1
@@ -16,67 +16,72 @@
{
public:
- /**
- * @class FieldType::fieldref
- * @brief Reference to a field element.
- */
- class fieldref : public SAXObject, public ReferenceType {
- public:
- fieldref()
- {}
+ /**
+ * @class FieldType::fieldref
+ * @brief Reference to a field element.
+ */
+ class fieldref: public SAXObject, public ReferenceType
+ {
+ public:
+ fieldref()
+ {
+ }
+
+ virtual ~fieldref()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
+ };
- virtual ~fieldref()
- {}
+public:
- virtual SAXObject::Type type()
+ FieldType()
{
- return SAXObject::element;
}
- };
-public:
+ virtual ~FieldType()
+ {
+ }
+
+ void set_name(const std::string& n)
+ {
+ _name = n;
+ }
+
+ const std::string& get_name() const
+ {
+ return _name;
+ }
- FieldType()
- {}
+ void set_funit(const std::string& s)
+ {
+ _funit = s;
+ }
+
+ void set_lunit(const std::string& s)
+ {
+ _lunit = s;
+ }
- virtual ~FieldType()
- {}
+ const std::string& get_funit() const
+ {
+ return _funit;
+ }
- void set_name(const std::string& n)
- {
- _name = n;
- }
-
- const std::string& get_name() const
- {
- return _name;
- }
-
- void set_funit(const std::string& s)
- {
- _funit = s;
- }
-
- void set_lunit(const std::string& s)
- {
- _lunit = s;
- }
-
- const std::string& get_funit() const
- {
- return _funit;
- }
-
- const std::string& get_lunit() const
- {
- return _lunit;
- }
+ const std::string& get_lunit() const
+ {
+ return _lunit;
+ }
private:
- std::string _name; - std::string _funit; - std::string _lunit;
+ std::string _name; + std::string _funit; + std::string _lunit;
}; #endif
diff -u -r1.5 -r1.6 --- FieldTypeProcess.hh 18 Dec 2006 22:49:01 -0000 1.5 +++ FieldTypeProcess.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/FieldTypeProcess.hh,v 1.5 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/FieldTypeProcess.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_FIELDTYPEPROCESS_HH #define LCDD_FIELDTYPEPROCESS_HH 1
@@ -18,55 +18,57 @@
* @class FieldTypeProcess * @brief Generic 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),
- m_obj(0)
- {}
-
- virtual ~FieldTypeProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "FieldTypeProcess::StartElement: " << name << std::endl;
-
- FieldType* fld = dynamic_cast<FieldType*>( m_obj );
-
- if ( fld ) {
+ FieldTypeProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
- fld->set_name( attrs.getValue( "name" ) ); - fld->set_funit( attrs.getValue( "funit" ) ); - fld->set_lunit( attrs.getValue( "lunit" ) );
+ virtual ~FieldTypeProcess()
+ {
+ }
- //std::cout << "name: " << fld->get_name() << std::endl;
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
}
- else {
- std::cerr << "Failed cast to FieldType." << std::endl;
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "FieldTypeProcess::StartElement: " << name << std::endl;
+
+ FieldType* fld = dynamic_cast<FieldType*>(m_obj);
+
+ if (fld) {
+
+ fld->set_name(attrs.getValue("name"));
+ fld->set_funit(attrs.getValue("funit"));
+ fld->set_lunit(attrs.getValue("lunit"));
+
+ //std::cout << "name: " << fld->get_name() << std::endl;
+ } else {
+ std::cerr << "Failed cast to FieldType." << std::endl;
+ }
}
- }
- 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&)
- {
- //std::cout << "FieldTypeProcess::StackPopNotify" << std::endl;
- }
+ virtual void StackPopNotify(const std::string&)
+ {
+ //std::cout << "FieldTypeProcess::StackPopNotify" << std::endl;
+ }
protected:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; #endif
diff -u -r1.1 -r1.2 --- G4BoxDipole.hh 23 Jun 2011 21:04:10 -0000 1.1 +++ G4BoxDipole.hh 24 Jun 2013 22:10:33 -0000 1.2 @@ -3,42 +3,37 @@
#include "G4MagneticField.hh"
-class G4BoxDipole : public G4MagneticField
+class G4BoxDipole: public G4MagneticField
{
- public:
+public:
- G4BoxDipole(double x,
- double y,
- double z,
- double dx,
- double dy,
- double dz,
- double bx,
- double by,
- double bz);
-
- virtual ~G4BoxDipole() {;}
-
- void GetFieldValue(const double point[3], double *bfield) const;
-
- private:
-
- double _x;
- double _y;
- double _z;
- double _dx;
- double _dy;
- double _dz;
- double _bx;
- double _by;
- double _bz;
-
- double _maxx;
- double _maxy;
- double _maxz;
- double _minx;
- double _miny;
- double _minz;
+ G4BoxDipole(double x, double y, double z, double dx, double dy, double dz, double bx, double by, double bz);
+
+ virtual ~G4BoxDipole()
+ {
+ ;
+ }
+
+ void GetFieldValue(const double point[3], double *bfield) const;
+
+private:
+
+ double _x;
+ double _y;
+ double _z;
+ double _dx;
+ double _dy;
+ double _dz;
+ double _bx;
+ double _by;
+ double _bz;
+
+ double _maxx;
+ double _maxy;
+ double _maxz;
+ double _minx;
+ double _miny;
+ double _minz;
}; #endif
diff -u -r1.16 -r1.17 --- G4CalorimeterHit.hh 23 Aug 2011 22:40:51 -0000 1.16 +++ G4CalorimeterHit.hh 24 Jun 2013 22:10:33 -0000 1.17 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4CalorimeterHit.hh,v 1.16 2011/08/23 22:40:51 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/G4CalorimeterHit.hh,v 1.17 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4CALORIMETERHIT_HH #define LCDD_G4CALORIMETERHIT_HH 1
@@ -22,108 +22,108 @@
class G4CalorimeterHit: public G4VHit
{
- public:
+public:
- G4CalorimeterHit(); - G4CalorimeterHit(const G4CalorimeterHit &right); - G4CalorimeterHit(G4double edep, G4ThreeVector globalCellPos); - virtual ~G4CalorimeterHit(); - - const G4CalorimeterHit& operator=(const G4CalorimeterHit &right); - bool operator==(const G4CalorimeterHit &right); - inline void *operator new(size_t); - inline void operator delete(void *aHit);
+ G4CalorimeterHit(); + G4CalorimeterHit(const G4CalorimeterHit &right); + G4CalorimeterHit(G4double edep, G4ThreeVector globalCellPos); + virtual ~G4CalorimeterHit(); + + const G4CalorimeterHit& operator=(const G4CalorimeterHit &right); + bool operator==(const G4CalorimeterHit &right); + inline void *operator new(size_t); + inline void operator delete(void *aHit);
#ifdef G4VIS_USE
- void Draw();
+ void Draw();
#endif
- void printMcpHitContribs(std::ostream&); - void printMcpHitContribsHeader(std::ostream&);
+ void printMcpHitContribs(std::ostream&); + void printMcpHitContribsHeader(std::ostream&);
- void Print();
+ void Print();
- public:
+public:
- friend std::ostream& operator<<(std::ostream &os, const G4CalorimeterHit& hit);
+ friend std::ostream& operator<<(std::ostream &os, const G4CalorimeterHit& hit);
- void setPos(const G4ThreeVector& posXYZ)
- {
- m_pos = posXYZ;
- }
-
- void setEdep(const G4double ed)
- {
- m_edep = ed;
- }
-
- void incrEdep(const G4double edincr)
- {
- m_edep += edincr;
- }
-
- G4ThreeVector getPos() const
- {
- return m_pos;
- }
-
- G4double getEdep() const
- {
- return m_edep;
- }
-
- void addMcpHitContrib(McpHitContrib contrib)
- {
- m_particleList.push_back(contrib);
- }
-
- const McpHitContribList& getMcpHitContribList() const
- {
- return m_particleList;
- }
-
- // set value of 64 bit id
- void setId64bit(Id64bit::ElementType id0, Id64bit::ElementType id1)
- {
- m_id64.setId0(id0);
- m_id64.setId1(id1);
- }
-
- // get 64 bit id
- const Id64bit& getId64bit() const
- {
- return m_id64;
- }
-
- void setEndcapFlag(bool ec = true)
- {
- m_endcap = ec;
- }
-
- bool getEndcapFlag()
- {
- return m_endcap;
- }
-
- private:
-
- // 64-bit id.
- Id64bit m_id64;
-
- // Energy deposition.
- G4double m_edep;
+ void setPos(const G4ThreeVector& posXYZ)
+ {
+ m_pos = posXYZ;
+ }
+
+ void setEdep(const G4double ed)
+ {
+ m_edep = ed;
+ }
+
+ void incrEdep(const G4double edincr)
+ {
+ m_edep += edincr;
+ }
+
+ G4ThreeVector getPos() const
+ {
+ return m_pos;
+ }
+
+ G4double getEdep() const
+ {
+ return m_edep;
+ }
+
+ void addMcpHitContrib(McpHitContrib contrib)
+ {
+ m_particleList.push_back(contrib);
+ }
+
+ const McpHitContribList& getMcpHitContribList() const
+ {
+ return m_particleList;
+ }
+
+ // set value of 64 bit id
+ void setId64bit(Id64bit::ElementType id0, Id64bit::ElementType id1)
+ {
+ m_id64.setId0(id0);
+ m_id64.setId1(id1);
+ }
+
+ // get 64 bit id
+ const Id64bit& getId64bit() const
+ {
+ return m_id64;
+ }
+
+ void setEndcapFlag(bool ec = true)
+ {
+ m_endcap = ec;
+ }
+
+ bool getEndcapFlag()
+ {
+ return m_endcap;
+ }
+
+private:
+
+ // 64-bit id.
+ Id64bit m_id64;
+
+ // Energy deposition.
+ G4double m_edep;
- // Position. - G4ThreeVector m_pos;
+ // Position. + G4ThreeVector m_pos;
- // Endcap flag. - bool m_endcap;
+ // Endcap flag. + bool m_endcap;
- // List of contributions by MCParticle. - McpHitContribList m_particleList;
+ // List of contributions by MCParticle. + McpHitContribList m_particleList;
};
-typedef G4THitsCollection<G4CalorimeterHit> ( G4CalorimeterHitsCollection);
+typedef G4THitsCollection<G4CalorimeterHit> (G4CalorimeterHitsCollection);
extern G4Allocator<G4CalorimeterHit> G4CalorimeterHitAllocator;
diff -u -r1.16 -r1.17 --- G4CalorimeterSD.hh 8 Dec 2010 21:06:24 -0000 1.16 +++ G4CalorimeterSD.hh 24 Jun 2013 22:10:33 -0000 1.17 @@ -1,4 +1,4 @@
-// $Id: G4CalorimeterSD.hh,v 1.16 2010/12/08 21:06:24 jeremy Exp $
+// $Id: G4CalorimeterSD.hh,v 1.17 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4CALORIMETERSD_HH #define LCDD_G4CALORIMETERSD_HH 1
@@ -15,64 +15,57 @@
// class G4Segmentation /**
- @class G4CalorimeterSD - @brief Simulator implementation of calorimeter-type SD. -*/ -class G4CalorimeterSD : public G4SensitiveDetector
+ @class G4CalorimeterSD + @brief Simulator implementation of calorimeter-type SD. + */ +class G4CalorimeterSD: public G4SensitiveDetector
{
public:
- typedef std::vector<G4CalorimeterHit*> G4CalorimeterHitList;
+ typedef std::vector<G4CalorimeterHit*> G4CalorimeterHitList;
public:
- G4CalorimeterSD(G4String sdName, - G4String hcName, - G4Segmentation* sdSeg, - HitComparator* compare = 0); - - G4CalorimeterSD(G4String sdName, - const std::vector<G4String>& hcNames, - G4Segmentation* sdSeg, - HitComparator* compare = 0);
+ G4CalorimeterSD(G4String sdName, G4String hcName, G4Segmentation* sdSeg, HitComparator* compare = 0);
- virtual ~G4CalorimeterSD();
+ G4CalorimeterSD(G4String sdName, const std::vector<G4String>& hcNames, G4Segmentation* sdSeg, HitComparator* compare = 0);
-public:
+ virtual ~G4CalorimeterSD();
- virtual bool isValidVolume(G4LogicalVolume* lv);
+public:
- virtual void Initialize(G4HCofThisEvent *); - virtual void EndOfEvent(G4HCofThisEvent *);
+ virtual bool isValidVolume(G4LogicalVolume* lv);
- G4Segmentation* getSegmentation() const;
+ virtual void Initialize(G4HCofThisEvent *); + virtual void EndOfEvent(G4HCofThisEvent *);
- G4CalorimeterHit* findHit(G4CalorimeterHit* aHit) const; - G4CalorimeterHit* findHit(G4CalorimeterHit* aHit,G4int nHC) const;
+ G4Segmentation* getSegmentation() const;
- std::ostream& printHits(std::ostream& os);
+ G4CalorimeterHit* findHit(G4CalorimeterHit* aHit) const; + G4CalorimeterHit* findHit(G4CalorimeterHit* aHit, G4int nHC) const;
- void clearHits();
+ std::ostream& printHits(std::ostream& os);
- virtual std::ostream& printBasicInfo(std::ostream& os);
+ void clearHits();
- virtual double getEdep() const; - virtual double getEdep(G4int nHC) const;
+ virtual std::ostream& printBasicInfo(std::ostream& os);
- G4CalorimeterHitList getCalorimeterHitList(); - G4CalorimeterHitList getCalorimeterHitList(G4int nHC);
+ virtual double getEdep() const; + virtual double getEdep(G4int nHC) const;
+ G4CalorimeterHitList getCalorimeterHitList(); + G4CalorimeterHitList getCalorimeterHitList(G4int nHC);
protected:
- virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
+ virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
protected:
- G4Segmentation* m_segmentation; - G4CalorimeterHitsCollection* m_collection; - std::vector<G4CalorimeterHitsCollection*> m_hitsCollections; - G4CalorimeterHitList m_hits; - std::vector<G4CalorimeterHitList> hits_vector; - HitComparator* m_hitCompare;
+ G4Segmentation* m_segmentation; + G4CalorimeterHitsCollection* m_collection; + std::vector<G4CalorimeterHitsCollection*> m_hitsCollections; + G4CalorimeterHitList m_hits; + std::vector<G4CalorimeterHitList> hits_vector; + HitComparator* m_hitCompare;
}; #endif
diff -u -r1.5 -r1.6 --- G4Dipole.hh 18 Dec 2006 22:49:01 -0000 1.5 +++ G4Dipole.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4Dipole.hh,v 1.5 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/G4Dipole.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4DIPOLE_HH #define LCDD_G4DIPOLE_HH 1
@@ -11,40 +11,44 @@
* @class G4Dipole * @brief The Geant4 binding for the dipole element. */
-class G4Dipole : public G4MagneticField
+class G4Dipole: public G4MagneticField
{
public:
- G4Dipole() {}
- virtual ~G4Dipole() {}
+ G4Dipole()
+ {
+ }
+ virtual ~G4Dipole()
+ {
+ }
public:
- void GetFieldValue( const double Point[3], double *Bfield ) const;
+ void GetFieldValue(const double Point[3], double *Bfield) const;
- void setZMax(double zmax); - double getZMax();
+ void setZMax(double zmax); + double getZMax();
- void setRMax(double rmax); - double getRMax();
+ void setRMax(double rmax); + double getRMax();
- void setZMin(double zmin); - double getZMin();
+ void setZMin(double zmin); + double getZMin();
- void addCoeff(double coeff); - const std::vector<double>& getCoeffs();
+ void addCoeff(double coeff); + const std::vector<double>& getCoeffs();
- void setFieldUnit(double unit); - double getFieldUnit();
+ void setFieldUnit(double unit); + double getFieldUnit();
- void setLengthUnit(double unit); - double getLengthUnit();
+ void setLengthUnit(double unit); + double getLengthUnit();
private:
- double m_zmin; - double m_zmax; - double m_rmax; - double m_lunit; - double m_funit; - std::vector<double> m_coeffs;
+ double m_zmin; + double m_zmax; + double m_rmax; + double m_lunit; + double m_funit; + std::vector<double> m_coeffs;
}; #endif
diff -u -r1.2 -r1.3 --- G4GlobalGridXYSegmentation.hh 30 Oct 2009 23:34:09 -0000 1.2 +++ G4GlobalGridXYSegmentation.hh 24 Jun 2013 22:10:33 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4GlobalGridXYSegmentation.hh,v 1.2 2009/10/30 23:34:09 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/G4GlobalGridXYSegmentation.hh,v 1.3 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4GLOBALGRIDXYSEGMENTATION_HH #define LCDD_G4GLOBALGRIDXYSEGMENTATION_HH 1
@@ -10,51 +10,49 @@
* @class G4GridXYSegmentation * @brief Uniform 3D grid segmentation class. * @note Version of grid segmentation with binning on global coordinates, not local.
-*/ -class G4GlobalGridXYSegmentation : public G4Segmentation
+ */ +class G4GlobalGridXYSegmentation: public G4Segmentation
{
-
- public:
-
- G4GlobalGridXYSegmentation(double gridSizeX,
- double gridSizeY);
-
- virtual ~G4GlobalGridXYSegmentation();
-
- public:
-
- // from par class
- virtual G4ThreeVector getGlobalHitPos(const G4Step* aStep);
-
- // hit position from step position
- G4ThreeVector getLocalHitPos(const G4ThreeVector& localStepPos);
-
- virtual void setBins(const G4Step* aStep);
-
- virtual void setBinNames()
- {
- addBinName("x");
- addBinName("y");
- }
-
-
- protected:
-
- // compute signed int bin values with base at local origin
- int computeBinX(const G4ThreeVector& localStepPos);
- int computeBinY(const G4ThreeVector& localStepPos);
- int computeBinZ(const G4ThreeVector& localStepPos);
-
- // individual position dim from bin
- double computeDimX(int bin);
- double computeDimY(int bin);
- double computeDimZ(int bin);
-
- private:
-
- double m_gridSizeX;
- double m_gridSizeY;
- double m_gridSizeZ;
+
+public:
+
+ G4GlobalGridXYSegmentation(double gridSizeX, double gridSizeY);
+
+ virtual ~G4GlobalGridXYSegmentation();
+
+public:
+
+ // from par class
+ virtual G4ThreeVector getGlobalHitPos(const G4Step* aStep);
+
+ // hit position from step position
+ G4ThreeVector getLocalHitPos(const G4ThreeVector& localStepPos);
+
+ virtual void setBins(const G4Step* aStep);
+
+ virtual void setBinNames()
+ {
+ addBinName("x");
+ addBinName("y");
+ }
+
+protected:
+
+ // compute signed int bin values with base at local origin
+ int computeBinX(const G4ThreeVector& localStepPos);
+ int computeBinY(const G4ThreeVector& localStepPos);
+ int computeBinZ(const G4ThreeVector& localStepPos);
+
+ // individual position dim from bin
+ double computeDimX(int bin);
+ double computeDimY(int bin);
+ double computeDimZ(int bin);
+
+private:
+
+ double m_gridSizeX;
+ double m_gridSizeY;
+ double m_gridSizeZ;
}; #endif
diff -u -r1.9 -r1.10 --- G4GridXYZSegmentation.hh 30 Oct 2009 23:16:59 -0000 1.9 +++ G4GridXYZSegmentation.hh 24 Jun 2013 22:10:33 -0000 1.10 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4GridXYZSegmentation.hh,v 1.9 2009/10/30 23:16:59 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/G4GridXYZSegmentation.hh,v 1.10 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4GRIDXYZSEGMENTATION_HH #define LCDD_G4GRIDXYZSEGMENTATION_HH 1
@@ -11,56 +11,53 @@
* @brief Uniform 3D grid segmentation class. * @note This class performs calculations to divide a box-like * volume into a uniform, 3D grid with square cells.
-*/ -class G4GridXYZSegmentation : public G4Segmentation
+ */ +class G4GridXYZSegmentation: public G4Segmentation
{
-
- public:
-
- G4GridXYZSegmentation(double gridSizeX,
- double gridSizeY,
- double gridSizeZ);
-
- virtual ~G4GridXYZSegmentation();
-
- public:
-
- // from par class
- virtual G4ThreeVector getGlobalHitPos(const G4Step* aStep);
-
- virtual void setBins(const G4Step* aStep);
-
- // DEPRECATED
- virtual G4ThreeVector getGlobalHitPosPreStep(const G4StepPoint* aPreStepPoint);
-
- // DEPRECATED
- virtual G4ThreeVector getLocalHitPos(const G4ThreeVector& localStepPos);
-
- virtual void setBinNames()
- {
- addBinName("x");
- addBinName("y");
- addBinName("z");
- }
-
-
- protected:
-
- // compute signed int bin values with base at local origin
- int computeBinX(const G4ThreeVector& localStepPos);
- int computeBinY(const G4ThreeVector& localStepPos);
- int computeBinZ(const G4ThreeVector& localStepPos);
-
- // individual position dim from bin
- double computeDimX(int bin);
- double computeDimY(int bin);
- double computeDimZ(int bin);
-
- private:
-
- double m_gridSizeX;
- double m_gridSizeY;
- double m_gridSizeZ;
+
+public:
+
+ G4GridXYZSegmentation(double gridSizeX, double gridSizeY, double gridSizeZ);
+
+ virtual ~G4GridXYZSegmentation();
+
+public:
+
+ // from par class
+ virtual G4ThreeVector getGlobalHitPos(const G4Step* aStep);
+
+ virtual void setBins(const G4Step* aStep);
+
+ // DEPRECATED
+ virtual G4ThreeVector getGlobalHitPosPreStep(const G4StepPoint* aPreStepPoint);
+
+ // DEPRECATED
+ virtual G4ThreeVector getLocalHitPos(const G4ThreeVector& localStepPos);
+
+ virtual void setBinNames()
+ {
+ addBinName("x");
+ addBinName("y");
+ addBinName("z");
+ }
+
+protected:
+
+ // compute signed int bin values with base at local origin
+ int computeBinX(const G4ThreeVector& localStepPos);
+ int computeBinY(const G4ThreeVector& localStepPos);
+ int computeBinZ(const G4ThreeVector& localStepPos);
+
+ // individual position dim from bin
+ double computeDimX(int bin);
+ double computeDimY(int bin);
+ double computeDimZ(int bin);
+
+private:
+
+ double m_gridSizeX;
+ double m_gridSizeY;
+ double m_gridSizeZ;
}; #endif
diff -u -r1.5 -r1.6 --- G4LimitSet.hh 18 Dec 2006 22:49:01 -0000 1.5 +++ G4LimitSet.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -12,79 +12,75 @@
* @brief Looks up physics limits by particle type from the G4Track. */
-class G4LimitSet : public G4UserLimits
+class G4LimitSet: public G4UserLimits
{
public:
- typedef G4String ParticleType; - typedef G4String LimitNameType; - typedef G4double LimitValueType; - typedef std::map<ParticleType, LimitValueType> LimitMap; - typedef std::map<LimitNameType, LimitMap> LimitSetMap; - typedef const G4String& LimitNameKeyType; - - static const ParticleType ANY_PARTICLE; - - static const LimitValueType LIMIT_NOT_SET; - - static const LimitNameKeyType STEP_LENGTH_MAX_KEY; - static const LimitNameKeyType TRACK_LENGTH_MAX_KEY; - static const LimitNameKeyType TIME_MAX_KEY; - static const LimitNameKeyType EKIN_MIN_KEY; - static const LimitNameKeyType RANGE_MIN_KEY; - - static const LimitValueType STEP_LENGTH_MAX_DEFAULT; - static const LimitValueType TRACK_LENGTH_MAX_DEFAULT; - static const LimitValueType TIME_MAX_DEFAULT; - static const LimitValueType EKIN_MIN_DEFAULT; - static const LimitValueType RANGE_MIN_DEFAULT;
+ typedef G4String ParticleType; + typedef G4String LimitNameType; + typedef G4double LimitValueType; + typedef std::map<ParticleType, LimitValueType> LimitMap; + typedef std::map<LimitNameType, LimitMap> LimitSetMap; + typedef const G4String& LimitNameKeyType; + + static const ParticleType ANY_PARTICLE; + + static const LimitValueType LIMIT_NOT_SET; + + static const LimitNameKeyType STEP_LENGTH_MAX_KEY; + static const LimitNameKeyType TRACK_LENGTH_MAX_KEY; + static const LimitNameKeyType TIME_MAX_KEY; + static const LimitNameKeyType EKIN_MIN_KEY; + static const LimitNameKeyType RANGE_MIN_KEY; + + static const LimitValueType STEP_LENGTH_MAX_DEFAULT; + static const LimitValueType TRACK_LENGTH_MAX_DEFAULT; + static const LimitValueType TIME_MAX_DEFAULT; + static const LimitValueType EKIN_MIN_DEFAULT; + static const LimitValueType RANGE_MIN_DEFAULT;
public:
- G4LimitSet(const G4String& name); - virtual ~G4LimitSet();
+ G4LimitSet(const G4String& name); + virtual ~G4LimitSet();
public:
- const LimitSetMap& getLimitSetMap() const
- {
- return m_limitsMap;
- }
-
- virtual G4double GetMaxAllowedStep(const G4Track&);
- virtual G4double GetUserMaxTrackLength(const G4Track&) ;
- virtual G4double GetUserMaxTime (const G4Track&);
- virtual G4double GetUserMinEkine(const G4Track&);
- virtual G4double GetUserMinRange(const G4Track&);
-
- /* Set limits by particle type. */
- void setLimitForParticle(LimitNameType limitName,
- ParticleType particleType,
- LimitValueType limitValue);
+ const LimitSetMap& getLimitSetMap() const
+ {
+ return m_limitsMap;
+ }
+
+ virtual G4double GetMaxAllowedStep(const G4Track&);
+ virtual G4double GetUserMaxTrackLength(const G4Track&);
+ virtual G4double GetUserMaxTime(const G4Track&);
+ virtual G4double GetUserMinEkine(const G4Track&);
+ virtual G4double GetUserMinRange(const G4Track&);
- void setName(const G4String& n); - G4String& getName();
+ /* Set limits by particle type. */ + void setLimitForParticle(LimitNameType limitName, ParticleType particleType, LimitValueType limitValue); + + void setName(const G4String& n); + G4String& getName();
private:
- /** - * Get the limit value for a particular particle type. - * @param limitName The name of the limit type (1 of 5 valid types). - * @param particleType Type, e.g. name, of the Geant4 particle. - * @return Value of the limit or LIMIT_NOT_SET if no key exists and ANY_PARTICLE is also not set. - */ - LimitValueType getLimitForParticle(LimitNameType limitName, - ParticleType particleType = ANY_PARTICLE);
+ /** + * Get the limit value for a particular particle type. + * @param limitName The name of the limit type (1 of 5 valid types). + * @param particleType Type, e.g. name, of the Geant4 particle. + * @return Value of the limit or LIMIT_NOT_SET if no key exists and ANY_PARTICLE is also not set. + */ + LimitValueType getLimitForParticle(LimitNameType limitName, ParticleType particleType = ANY_PARTICLE);
- LimitValueType getLimitForParticle(LimitNameType limitName, - const G4Track&);
+ LimitValueType getLimitForParticle(LimitNameType limitName, const G4Track&);
- const ParticleType getParticleType(const G4Track&);
+ const ParticleType getParticleType(const G4Track&);
protected:
- /* Map of ( limitName -> particleName -> limitValue ). */ - LimitSetMap m_limitsMap;
+ /* Map of ( limitName -> particleName -> limitValue ). */ + LimitSetMap m_limitsMap;
- G4String m_name;
+ G4String m_name;
}; #endif
diff -u -r1.7 -r1.8 --- G4NonprojectiveCylinderSegmentation.hh 1 Apr 2008 19:53:02 -0000 1.7 +++ G4NonprojectiveCylinderSegmentation.hh 24 Jun 2013 22:10:33 -0000 1.8 @@ -1,48 +1,47 @@
-// $Header: /cvs/lcd/lcdd/include/G4NonprojectiveCylinderSegmentation.hh,v 1.7 2008/04/01 19:53:02 wenzel Exp $
+// $Header: /cvs/lcd/lcdd/include/G4NonprojectiveCylinderSegmentation.hh,v 1.8 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4NONPROJECTIVECYLINDERSEGMENTATION #define LCDD_G4NONPROJECTIVECYLINDERSEGMENTATION 1 #include "G4Segmentation.hh" /**
- @class G4NonprojectiveCylinderSegmentation - @brief Segmentation using a nonprojective cylinder. -*/ -class G4NonprojectiveCylinderSegmentation : public G4Segmentation
+ @class G4NonprojectiveCylinderSegmentation + @brief Segmentation using a nonprojective cylinder. + */ +class G4NonprojectiveCylinderSegmentation: public G4Segmentation
{
public:
- G4NonprojectiveCylinderSegmentation(double gridSizePhi, - double gridSizeZ); - virtual ~G4NonprojectiveCylinderSegmentation();
+ G4NonprojectiveCylinderSegmentation(double gridSizePhi, double gridSizeZ); + virtual ~G4NonprojectiveCylinderSegmentation();
public:
- virtual G4ThreeVector getGlobalHitPos(const G4Step* aStep);
- virtual G4ThreeVector getGlobalHitPos(const G4StepPoint* aPreStepPoint);
- virtual void setBins(const G4Step* aStep);
- virtual void setBins(const G4StepPoint* aPreStepPoint);
- virtual void setBinNames()
- {
- addBinName("phi");
- addBinName("z");
- }
-
- G4ThreeVector getLocalHitPos(const G4Step* aStep);
- G4ThreeVector getLocalHitPos(const G4StepPoint* aPreStepPoint);
- virtual bool isValidSolid(G4VSolid*);
+ virtual G4ThreeVector getGlobalHitPos(const G4Step* aStep);
+ virtual G4ThreeVector getGlobalHitPos(const G4StepPoint* aPreStepPoint);
+ virtual void setBins(const G4Step* aStep);
+ virtual void setBins(const G4StepPoint* aPreStepPoint);
+ virtual void setBinNames()
+ {
+ addBinName("phi");
+ addBinName("z");
+ }
+
+ G4ThreeVector getLocalHitPos(const G4Step* aStep);
+ G4ThreeVector getLocalHitPos(const G4StepPoint* aPreStepPoint);
+ virtual bool isValidSolid(G4VSolid*);
private:
- double computeDeltaPhi(const G4Step* aStep); - double computeDeltaPhi(const G4StepPoint* aPreStepPoint); - int computeBinPhi( const G4Step* aStep ); - int computeBinPhi( const G4StepPoint* aPreStepPoint); - int computeBinZ(const G4ThreeVector& localStepPos);
+ double computeDeltaPhi(const G4Step* aStep); + double computeDeltaPhi(const G4StepPoint* aPreStepPoint); + int computeBinPhi(const G4Step* aStep); + int computeBinPhi(const G4StepPoint* aPreStepPoint); + int computeBinZ(const G4ThreeVector& localStepPos);
private:
- double m_gridSizePhi; - double m_gridSizeZ;
+ double m_gridSizePhi; + double m_gridSizeZ;
}; #endif
diff -u -r1.6 -r1.7 --- G4OpticalCalorimeterSD.hh 17 Jun 2013 22:06:28 -0000 1.6 +++ G4OpticalCalorimeterSD.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -9,31 +9,28 @@
class Cerenkov; /**
- @class G4OpticalCalorimeterSD - @brief Simulator implementation of a calorimeter SD that is sensitive to optical photons. -*/ -class G4OpticalCalorimeterSD : public G4CalorimeterSD
+ @class G4OpticalCalorimeterSD + @brief Simulator implementation of a calorimeter SD that is sensitive to optical photons. + */ +class G4OpticalCalorimeterSD: public G4CalorimeterSD
{
- private:
+private:
Cerenkov* CerenGenerator;
- public:
- //enum for the two Hit Collections (cerenkov and edep):
- enum HCType { eEdep=0, eCerenkov=1};
-
- G4OpticalCalorimeterSD(G4String sdName,
- G4String hcName,
- G4Segmentation* sdSeg,
- HitComparator* compare = 0);
-
- G4OpticalCalorimeterSD(G4String sdName,
- const std::vector<G4String>& hcNames,
- G4Segmentation* sdSeg,
- HitComparator* compare = 0);
-
- virtual ~G4OpticalCalorimeterSD();
-
- protected:
- virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
-};
+public:
+ //enum for the two Hit Collections (cerenkov and edep):
+ enum HCType
+ {
+ eEdep = 0, eCerenkov = 1
+ };
+
+ G4OpticalCalorimeterSD(G4String sdName, G4String hcName, G4Segmentation* sdSeg, HitComparator* compare = 0);
+
+ G4OpticalCalorimeterSD(G4String sdName, const std::vector<G4String>& hcNames, G4Segmentation* sdSeg, HitComparator* compare = 0);
+
+ virtual ~G4OpticalCalorimeterSD();
+
+protected:
+ virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
+};
#endif
diff -u -r1.9 -r1.10 --- G4ProjectiveCylinderSegmentation.hh 1 Apr 2008 19:53:02 -0000 1.9 +++ G4ProjectiveCylinderSegmentation.hh 24 Jun 2013 22:10:33 -0000 1.10 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4ProjectiveCylinderSegmentation.hh,v 1.9 2008/04/01 19:53:02 wenzel Exp $
+// $Header: /cvs/lcd/lcdd/include/G4ProjectiveCylinderSegmentation.hh,v 1.10 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4PROJECTIVECYLINDERSEGMENTATION_HH #define LCDD_G4PROJECTIVECYLINDERSEGMENTATION_HH 1
@@ -7,26 +7,25 @@
#include "globals.hh" /**
- @class G4ProjectiveCylinderSegmentation - @brief Simulation class for projective cylinder segmentation. -*/ -class G4ProjectiveCylinderSegmentation : public G4ProjectiveSegmentation
+ @class G4ProjectiveCylinderSegmentation + @brief Simulation class for projective cylinder segmentation. + */ +class G4ProjectiveCylinderSegmentation: public G4ProjectiveSegmentation
{
public:
- G4ProjectiveCylinderSegmentation(G4int ntheta, - G4int nphi);
+ G4ProjectiveCylinderSegmentation(G4int ntheta, G4int nphi);
- virtual ~G4ProjectiveCylinderSegmentation();
+ virtual ~G4ProjectiveCylinderSegmentation();
- virtual bool isValidSolid(G4VSolid* s);
+ virtual bool isValidSolid(G4VSolid* s);
protected:
- virtual double getRadius(const G4Step* aStep); - virtual double getZ(const G4Step* aStep); - virtual double getRadius(const G4StepPoint* aPreStepPoint); - virtual double getZ(const G4StepPoint* aPreStepPoint);
+ virtual double getRadius(const G4Step* aStep); + virtual double getZ(const G4Step* aStep); + virtual double getRadius(const G4StepPoint* aPreStepPoint); + virtual double getZ(const G4StepPoint* aPreStepPoint);
}; #endif
diff -u -r1.10 -r1.11 --- G4ProjectiveSegmentation.hh 1 Apr 2008 19:53:02 -0000 1.10 +++ G4ProjectiveSegmentation.hh 24 Jun 2013 22:10:33 -0000 1.11 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4ProjectiveSegmentation.hh,v 1.10 2008/04/01 19:53:02 wenzel Exp $
+// $Header: /cvs/lcd/lcdd/include/G4ProjectiveSegmentation.hh,v 1.11 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4PROJECTIVESEGMENTATION_HH #define LCDD_G4PROJECTIVESEGMENTATION_HH 1
@@ -7,67 +7,66 @@
#include "globals.hh" /**
- @class G4ProjectiveSegmentation - @brief Generic projective segmentation class.
+ @class G4ProjectiveSegmentation + @brief Generic projective segmentation class.
*/
-class G4ProjectiveSegmentation : public G4Segmentation
+class G4ProjectiveSegmentation: public G4Segmentation
{
public:
- G4ProjectiveSegmentation(int ntheta, - int nphi);
+ G4ProjectiveSegmentation(int ntheta, int nphi);
- virtual ~G4ProjectiveSegmentation();
+ virtual ~G4ProjectiveSegmentation();
public:
- // virtuals from G4Segmentation; should not be overridden
- // in subclasses
- G4ThreeVector getGlobalHitPos(const G4Step* aStep);
- G4ThreeVector getGlobalHitPos(const G4StepPoint* aPreStepPoint);
- void setBins(const G4Step* aStep);
- void setBins(const G4StepPoint* aPreStepPoint);
- virtual void setBinNames()
- {
- addBinName("theta");
- addBinName("phi");
- }
+ // virtuals from G4Segmentation; should not be overridden
+ // in subclasses
+ G4ThreeVector getGlobalHitPos(const G4Step* aStep);
+ G4ThreeVector getGlobalHitPos(const G4StepPoint* aPreStepPoint);
+ void setBins(const G4Step* aStep);
+ void setBins(const G4StepPoint* aPreStepPoint);
+ virtual void setBinNames()
+ {
+ addBinName("theta");
+ addBinName("phi");
+ }
protected:
- int getNtheta() const; - int getNphi() const;
+ int getNtheta() const; + int getNphi() const;
- // bins from 3vect pos - int getThetaBin(const G4ThreeVector& globalStepPos); - int getPhiBin(const G4ThreeVector& globalStepPos); - - // dim from bin - double getThetaDim(const int &thetaBin) const; - double getPhiDim(const int &phiBin) const; - - // dim from step - double getThetaDim( const G4Step* aStep ); - // dim from prestep - double getThetaDim( const G4StepPoint* aPreStepPoint ); - - double getPhiDim( const G4Step* aStep ); - // dim from prestep point: - double getPhiDim( const G4StepPoint* aPreStepPoint ); - - // These should be overridden in subclasses - // for a specific shape or orientation. - virtual double getRadius(const G4Step* aStep); - virtual double getZ(const G4Step* aStep); - virtual double getRadius(const G4StepPoint* aPreStepPoint); - virtual double getZ(const G4StepPoint* aPreStepPoint);
+ // bins from 3vect pos + int getThetaBin(const G4ThreeVector& globalStepPos); + int getPhiBin(const G4ThreeVector& globalStepPos); + + // dim from bin + double getThetaDim(const int &thetaBin) const; + double getPhiDim(const int &phiBin) const; + + // dim from step + double getThetaDim(const G4Step* aStep); + // dim from prestep + double getThetaDim(const G4StepPoint* aPreStepPoint); + + double getPhiDim(const G4Step* aStep); + // dim from prestep point: + double getPhiDim(const G4StepPoint* aPreStepPoint); + + // These should be overridden in subclasses + // for a specific shape or orientation. + virtual double getRadius(const G4Step* aStep); + virtual double getZ(const G4Step* aStep); + virtual double getRadius(const G4StepPoint* aPreStepPoint); + virtual double getZ(const G4StepPoint* aPreStepPoint);
private:
- void computeDivisions();
+ void computeDivisions();
private:
- int m_ntheta, m_nphi; - double m_divTheta, m_divPhi;
+ int m_ntheta, m_nphi; + double m_divTheta, m_divPhi;
}; #endif
diff -u -r1.6 -r1.7 --- G4ProjectiveZPlaneSegmentation.hh 1 Apr 2008 19:53:02 -0000 1.6 +++ G4ProjectiveZPlaneSegmentation.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4ProjectiveZPlaneSegmentation.hh,v 1.6 2008/04/01 19:53:02 wenzel Exp $
+// $Header: /cvs/lcd/lcdd/include/G4ProjectiveZPlaneSegmentation.hh,v 1.7 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4PROJECTIVEZPLANESEGMENTATION_HH #define LCDD_G4PROJECTIVEZPLANESEGMENTATION_HH 1
@@ -7,26 +7,25 @@
#include "globals.hh" /**
- @class G4ProjectiveZPlaneSegmentation - @brief Projective segmentation using Z. - @note This class uses Z from current volume - rather than the cylindrical radius. -*/ -class G4ProjectiveZPlaneSegmentation : public G4ProjectiveSegmentation
+ @class G4ProjectiveZPlaneSegmentation + @brief Projective segmentation using Z. + @note This class uses Z from current volume + rather than the cylindrical radius. + */ +class G4ProjectiveZPlaneSegmentation: public G4ProjectiveSegmentation
{
public:
- G4ProjectiveZPlaneSegmentation(int ntheta, - int nphi);
+ G4ProjectiveZPlaneSegmentation(int ntheta, int nphi);
- virtual ~G4ProjectiveZPlaneSegmentation();
+ virtual ~G4ProjectiveZPlaneSegmentation();
protected:
- virtual double getRadius(const G4Step* aStep); - virtual double getZ(const G4Step* aStep); - virtual double getRadius(const G4StepPoint* aPreStepPoint); - virtual double getZ(const G4StepPoint* aPreStepPoint);
+ virtual double getRadius(const G4Step* aStep); + virtual double getZ(const G4Step* aStep); + virtual double getRadius(const G4StepPoint* aPreStepPoint); + virtual double getZ(const G4StepPoint* aPreStepPoint);
}; #endif
diff -u -r1.7 -r1.8 --- G4RZFieldMap.hh 18 Dec 2006 22:49:01 -0000 1.7 +++ G4RZFieldMap.hh 24 Jun 2013 22:10:33 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4RZFieldMap.hh,v 1.7 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/G4RZFieldMap.hh,v 1.8 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4RZFIELDMAP_HH #define LCDD_G4RZFIELDMAP_HH 1
@@ -15,44 +15,40 @@
* @class G4RZFieldMap * @brief Magnetic field defined by rows of r, z, Br and Bz values. */
-class G4RZFieldMap : public G4MagneticField
+class G4RZFieldMap: public G4MagneticField
{
public:
- G4RZFieldMap(int numBinsR, - int numBinsZ, - double gridSizeR, - double gridSizeZ, - std::vector<RZBData> fieldData);
+ G4RZFieldMap(int numBinsR, int numBinsZ, double gridSizeR, double gridSizeZ, std::vector<RZBData> fieldData);
- virtual ~G4RZFieldMap();
+ virtual ~G4RZFieldMap();
public:
- void GetFieldValue( const double Point[3], double *Bfield ) const;
+ void GetFieldValue(const double Point[3], double *Bfield) const;
private:
- void initializeArrays(); - void fillArrays(std::vector<RZBData> fieldData); - void deleteArrays();
+ void initializeArrays(); + void fillArrays(std::vector<RZBData> fieldData); + void deleteArrays();
private:
- void computeNumBins();
+ void computeNumBins();
private:
- int m_numBinsR; - int m_numBinsZ;
+ int m_numBinsR; + int m_numBinsZ;
- double m_gridSizeR; - double m_gridSizeZ;
+ double m_gridSizeR; + double m_gridSizeZ;
- double m_maxR; - double m_maxZ;
+ double m_maxR; + double m_maxZ;
- double** m_BrArray; - double** m_BzArray;
+ double** m_BrArray; + double** m_BzArray;
}; #endif
diff -u -r1.6 -r1.7 --- G4ScorerSD.hh 18 Dec 2006 22:49:01 -0000 1.6 +++ G4ScorerSD.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -6,17 +6,17 @@
/** * @class G4ScorerSD * @brief Scoring plane sensitive detector.
-*/ -class G4ScorerSD : public G4TrackerSD
+ */ +class G4ScorerSD: public G4TrackerSD
{
public:
- G4ScorerSD(G4String sdName,G4String hcName);
+ G4ScorerSD(G4String sdName, G4String hcName);
protected:
- virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
+ virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
protected:
- int m_currentTrackID;
+ int m_currentTrackID;
}; #endif
diff -u -r1.18 -r1.19 --- G4Segmentation.hh 30 May 2013 00:04:12 -0000 1.18 +++ G4Segmentation.hh 24 Jun 2013 22:10:33 -0000 1.19 @@ -78,11 +78,9 @@
static G4String typestr;
if (m_type == eProjective) {
typestr = "Projective";
- }
- else if (m_type == eNonprojective) {
+ } else if (m_type == eNonprojective) {
typestr = "Nonprojective";
- }
- else {
+ } else {
typestr = "Unknown";
}
diff -u -r1.5 -r1.6 --- G4SegmentationFactory.hh 18 Dec 2006 22:49:01 -0000 1.5 +++ G4SegmentationFactory.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4SegmentationFactory.hh,v 1.5 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/G4SegmentationFactory.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4SEGMENTATIONFACTORY_HH #define LCDD_G4SEGMENTATIONFACTORY_HH 1
@@ -9,20 +9,21 @@
#include <string> /**
- @class G4SegmentationFactory - @brief Returns a concrete segmentation object depending on input tag. - @note Includes a single, static method. -*/
+ @class G4SegmentationFactory + @brief Returns a concrete segmentation object depending on input tag. + @note Includes a single, static method. + */
class G4SegmentationFactory
{
private:
- // should not be instantiated
- G4SegmentationFactory()
- {}
+ // should not be instantiated
+ G4SegmentationFactory()
+ {
+ }
public:
- static G4Segmentation* createSegmentation(SAXObject* obj, const std::string& tag);
+ static G4Segmentation* createSegmentation(SAXObject* obj, const std::string& tag);
}; #endif
diff -u -r1.22 -r1.23 --- G4SensitiveDetector.hh 1 Feb 2012 09:46:09 -0000 1.22 +++ G4SensitiveDetector.hh 24 Jun 2013 22:10:33 -0000 1.23 @@ -19,287 +19,286 @@
* @note Primary attributes include verbosity, energy cut, * IdSpec,and hits collections. */
-class G4SensitiveDetector : public G4VSensitiveDetector, protected StepReadout
+class G4SensitiveDetector: public G4VSensitiveDetector, protected StepReadout
{
- public:
+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;
-
- public:
-
- G4SensitiveDetector(G4String sdName,
- G4String hcName,
- EType sdType);
-
- G4SensitiveDetector(G4String sdName,
- const std::vector<G4String>& hcNames,
- EType sdType);
-
- virtual ~G4SensitiveDetector();
-
- public:
-
- /**
- * Geant4 initialization function called at beginning of event.
- */
- virtual void Initialize(G4HCofThisEvent *);
-
- /**
- * Geant4 EndOfEvent hook.
- */
- virtual void EndOfEvent(G4HCofThisEvent *);
-
- protected:
-
- /**
- * Geant4 function to make hits from the step.
- */
- virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
-
- public:
-
- /**
- * Return the type of this detector encoded as an int.
- */
- inline G4SensitiveDetector::EType getType() const
- {
- return m_type;
- }
-
- /**
- * Return the type of this detector encoded as a string.
- */
- inline const std::string& getTypeString() const;
-
- /**
- * Return the hits collection ID associated with this detector.
- */
- inline G4int getHCID() const
- {
- return m_hcids[0];
- }
-
- inline G4int getHCID(G4int nHC) const
- {
- if ( nHC > getNumberOfHitsCollections() + 1 || nHC < 0 ) {
- G4cerr << "The index " << nHC << " is not valid for SD " << this->GetName() << "." << G4endl;
- G4Exception("", "", FatalException, "Invalid index.");
- }
- return m_hcids[nHC];
- }
-
- /**
- * Check whether the G4LogicalVolume can be readout by this detector.
- * Base function just returns if the volume was assigned to this detector.
- */
- inline virtual bool isValidVolume(G4LogicalVolume* lv)
- {
- return lv != 0;
- }
-
- /**
- * Return the hits collection name associated with this detector.
- */
- inline const std::string& getHCName() const
- {
- return collectionName[0];
- }
-
- inline const std::string& getHCName(G4int nHC) const
- {
- return collectionName[nHC];
- }
-
- /**
- * Set the verbosity level of this detector.
- */
- inline void setVerbose(unsigned int v)
- {
- m_verbose = v;
- }
-
- /**
- * Get the verbosity level of this detector.
- */
- inline unsigned int getVerbose() const
- {
- return m_verbose;
- }
-
- /**
- * Return the hit energy cut of this detector.
- */
- inline G4double getEcut()
- {
- return m_ecut;
- }
-
- /**
- * Set the hit energy cut of this detector.
- */
- inline void setEcut(G4double ecut)
- {
- m_ecut = ecut;
- }
-
- /**
- * Set the identifier specification for this detector.
- */
- inline void setIdSpec(IdSpec* idspec)
- {
- m_idspec = idspec;
- }
-
- /**
- * Return the identifier specification for this detector.
- */
- inline IdSpec* getIdSpec() const
- {
- return m_idspec;
- }
-
- /**
- * Returns whether or not this detector has an associated identifier specification.
- */
- inline bool hasIdSpec() const
- {
- return m_idspec != 0;
- }
-
- /**
- * Create a 64-bit identifier based on the current step information.
- */
- Id64bit makeId() const;
-
- /**
- * Set the endcap flag.
- */
- inline void setEndcapFlag( bool ec = true )
- {
- m_endcap = ec;
- }
-
- /**
- * Return the endcap flag.
- */
- inline bool getEndcapFlag()
- {
- return m_endcap;
- }
-
- /**
- * Print basic information about this detector to the output stream.
- */
- virtual std::ostream& printBasicInfo(std::ostream& os);
-
- /**
- * Print the number of hits to the output stream.
- */
- virtual std::ostream& printNumberOfHits(std::ostream& os);
-
- /**
- * Print the number of hits to the output stream.
- */
- virtual std::ostream& printEdep(std::ostream& os);
-
- /**
- * Print the names of volumes associated to this detector.
- */
- virtual std::ostream& printVolumes(std::ostream& os);
-
- /**
- * Print the list of hits. Subclasses must implement this.
- */
- virtual std::ostream& printHits(std::ostream& os) { return os; }
-
- /**
- * Get single (first) HC associated with this detector.
- */
- G4VHitsCollection* getHitsCollection() const;
-
- /**
- * Retrieve the hits collection associated with this detector,
- * using the hits collection ID (HCID).
- */
- G4VHitsCollection* getHitsCollection(G4int) const;
-
- /**
- * Get the number of hits collections in this SD.
- */
- inline int getNumberOfHitsCollections() const { return m_hcids.size(); }
-
- /**
- * Return the total energy deposition from the hits of this detector.
- * Requires access to concrete hit types, so this function must be
- * implemented by subclasses.
- */
- virtual double getEdep() const { return 0.0;}
-
- /**
- * Return a list of G4LogicalVolume objects that have been assigned
- * this sensitive detector.
- */
- std::vector<G4LogicalVolume*> getLogicalVolumes() const;
-
- /**
- * Subclasses need to implement this method.
- */
- virtual void clearHits() {;}
-
- protected:
-
- /**
- * Set the Hits Collection ID for a single collection.
- */
- inline void setHCID(G4int hcid)
- {
- m_hcids[0] = hcid;
- }
-
- /**
- * Set the Hits Collection ID for a given collection.
- */
- inline void setHCID(G4int hcid, G4int nHC)
- {
- if ( nHC > getNumberOfHitsCollections() + 1 || nHC < 0)
- {
- G4cerr << this->GetName() << "setHCID Nr of HC"<< nHC << "not valid"<< G4endl;
- G4Exception("", "", FatalException, "Bad HC index.");
- }
- m_hcids[nHC] = hcid;
- }
-
- protected:
-
- // vector containing Hit Collection ID's
- std::vector<G4int> m_hcids;
-
- // verbosity
- unsigned int m_verbose;
-
- // endcap flag for LCIO's CHBIT_BARREL bit
- bool m_endcap;
-
- // energy cut
- double m_ecut;
-
- // identifier field description
- IdSpec* m_idspec;
-
- private:
-
- // type = calorimeter or tracker
- EType m_type;
-
- // The Geant4 command messenger associated with this detector.
- G4UImessenger* m_messenger;
-};
+ /**
+ * 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;
+
+public:
+
+ G4SensitiveDetector(G4String sdName, G4String hcName, EType sdType);
+
+ G4SensitiveDetector(G4String sdName, const std::vector<G4String>& hcNames, EType sdType);
+
+ virtual ~G4SensitiveDetector();
+
+public:
+
+ /**
+ * Geant4 initialization function called at beginning of event.
+ */
+ virtual void Initialize(G4HCofThisEvent *);
+
+ /**
+ * Geant4 EndOfEvent hook.
+ */
+ virtual void EndOfEvent(G4HCofThisEvent *);
+
+protected:
+
+ /**
+ * Geant4 function to make hits from the step.
+ */
+ virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
+
+public:
+
+ /**
+ * Return the type of this detector encoded as an int.
+ */
+ inline G4SensitiveDetector::EType getType() const
+ {
+ return m_type;
+ }
+
+ /**
+ * Return the type of this detector encoded as a string.
+ */
+ inline const std::string& getTypeString() const;
+
+ /**
+ * Return the hits collection ID associated with this detector.
+ */
+ inline G4int getHCID() const
+ {
+ return m_hcids[0];
+ }
+
+ inline G4int getHCID(G4int nHC) const
+ {
+ if (nHC > getNumberOfHitsCollections() + 1 || nHC < 0) {
+ G4cerr << "The index " << nHC << " is not valid for SD " << this->GetName() << "." << G4endl;
+ G4Exception("", "", FatalException, "Invalid index.");
+ }
+ return m_hcids[nHC];
+ }
+
+ /**
+ * Check whether the G4LogicalVolume can be readout by this detector.
+ * Base function just returns if the volume was assigned to this detector.
+ */
+ inline virtual bool isValidVolume(G4LogicalVolume* lv)
+ {
+ return lv != 0;
+ }
+
+ /**
+ * Return the hits collection name associated with this detector.
+ */
+ inline const std::string& getHCName() const
+ {
+ return collectionName[0];
+ }
+
+ inline const std::string& getHCName(G4int nHC) const
+ {
+ return collectionName[nHC];
+ }
+
+ /**
+ * Set the verbosity level of this detector.
+ */
+ inline void setVerbose(unsigned int v)
+ {
+ m_verbose = v;
+ }
+
+ /**
+ * Get the verbosity level of this detector.
+ */
+ inline unsigned int getVerbose() const
+ {
+ return m_verbose;
+ }
+
+ /**
+ * Return the hit energy cut of this detector.
+ */
+ inline G4double getEcut()
+ {
+ return m_ecut;
+ }
+
+ /**
+ * Set the hit energy cut of this detector.
+ */
+ inline void setEcut(G4double ecut)
+ {
+ m_ecut = ecut;
+ }
+
+ /**
+ * Set the identifier specification for this detector.
+ */
+ inline void setIdSpec(IdSpec* idspec)
+ {
+ m_idspec = idspec;
+ }
+
+ /**
+ * Return the identifier specification for this detector.
+ */
+ inline IdSpec* getIdSpec() const
+ {
+ return m_idspec;
+ }
+
+ /**
+ * Returns whether or not this detector has an associated identifier specification.
+ */
+ inline bool hasIdSpec() const
+ {
+ return m_idspec != 0;
+ }
+
+ /**
+ * Create a 64-bit identifier based on the current step information.
+ */
+ Id64bit makeId() const;
+
+ /**
+ * Set the endcap flag.
+ */
+ inline void setEndcapFlag( bool ec = true )
+ {
+ m_endcap = ec;
+ }
+
+ /**
+ * Return the endcap flag.
+ */
+ inline bool getEndcapFlag()
+ {
+ return m_endcap;
+ }
+
+ /**
+ * Print basic information about this detector to the output stream.
+ */
+ virtual std::ostream& printBasicInfo(std::ostream& os);
+
+ /**
+ * Print the number of hits to the output stream.
+ */
+ virtual std::ostream& printNumberOfHits(std::ostream& os);
+
+ /**
+ * Print the number of hits to the output stream.
+ */
+ virtual std::ostream& printEdep(std::ostream& os);
+
+ /**
+ * Print the names of volumes associated to this detector.
+ */
+ virtual std::ostream& printVolumes(std::ostream& os);
+
+ /**
+ * Print the list of hits. Subclasses must implement this.
+ */
+ virtual std::ostream& printHits(std::ostream& os) {return os;}
+
+ /**
+ * Get single (first) HC associated with this detector.
+ */
+ G4VHitsCollection* getHitsCollection() const;
+
+ /**
+ * Retrieve the hits collection associated with this detector,
+ * using the hits collection ID (HCID).
+ */
+ G4VHitsCollection* getHitsCollection(G4int) const;
+
+ /**
+ * Get the number of hits collections in this SD.
+ */
+ inline int getNumberOfHitsCollections() const {return m_hcids.size();}
+
+ /**
+ * Return the total energy deposition from the hits of this detector.
+ * Requires access to concrete hit types, so this function must be
+ * implemented by subclasses.
+ */
+ virtual double getEdep() const {return 0.0;}
+
+ /**
+ * Return a list of G4LogicalVolume objects that have been assigned
+ * this sensitive detector.
+ */
+ std::vector<G4LogicalVolume*> getLogicalVolumes() const;
+
+ /**
+ * Subclasses need to implement this method.
+ */
+ virtual void clearHits() {;}
+
+protected:
+
+ /**
+ * Set the Hits Collection ID for a single collection.
+ */
+ inline void setHCID(G4int hcid)
+ {
+ m_hcids[0] = hcid;
+ }
+
+ /**
+ * Set the Hits Collection ID for a given collection.
+ */
+ inline void setHCID(G4int hcid, G4int nHC)
+ {
+ if ( nHC > getNumberOfHitsCollections() + 1 || nHC < 0)
+ {
+ G4cerr << this->GetName() << "setHCID Nr of HC"<< nHC << "not valid"<< G4endl;
+ G4Exception("", "", FatalException, "Bad HC index.");
+ }
+ m_hcids[nHC] = hcid;
+ }
+
+protected:
+
+ // vector containing Hit Collection ID's
+ std::vector<G4int> m_hcids;
+
+ // verbosity
+ unsigned int m_verbose;
+
+ // endcap flag for LCIO's CHBIT_BARREL bit
+ bool m_endcap;
+
+ // energy cut
+ double m_ecut;
+
+ // identifier field description
+ IdSpec* m_idspec;
+
+ private:
+
+ // type = calorimeter or tracker
+ EType m_type;
+
+ // The Geant4 command messenger associated with this detector.
+ G4UImessenger* m_messenger;
+ };
#endif
diff -u -r1.6 -r1.7 --- G4Solenoid.hh 18 Dec 2006 22:49:01 -0000 1.6 +++ G4Solenoid.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4Solenoid.hh,v 1.6 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/G4Solenoid.hh,v 1.7 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4SOLENOID_HH #define LCDD_G4SOLENOID_HH 1
@@ -8,77 +8,89 @@
#include <iostream> /**
- @class G4Solenoid - @brief Simulation class for a simple magnetic solenoid. -*/ -class G4Solenoid : public G4MagneticField
+ @class G4Solenoid + @brief Simulation class for a simple magnetic solenoid. + */ +class G4Solenoid: public G4MagneticField
{
public:
- G4Solenoid(); - virtual ~G4Solenoid();
+ G4Solenoid(); + virtual ~G4Solenoid();
public:
- void GetFieldValue( const double Point[3], double *Bfield ) const;
+ void GetFieldValue(const double Point[3], double *Bfield) const;
- void setInnerField(double d) {
- _innerField = d;
- }
+ void setInnerField(double d)
+ {
+ _innerField = d;
+ }
+
+ void setOuterField(double d)
+ {
+ _outerField = d;
+ }
+
+ void setInnerR(double d)
+ {
+ _innerR = d;
+ }
+
+ void setOuterR(double d)
+ {
+ _outerR = d;
+ }
+
+ void setInnerZ(double d)
+ {
+ _innerZ = d;
+ }
+
+ void setOuterZ(double d)
+ {
+ _outerZ = d;
+ }
+
+ double getInnerField() const
+ {
+ return _innerField;
+ }
+
+ double getOuterField() const
+ {
+ return _outerField;
+ }
+
+ double getInnerR() const
+ {
+ return _innerR;
+ }
+
+ double getOuterR() const
+ {
+ return _outerR;
+ }
+
+ double getInnerZ() const
+ {
+ return _innerZ;
+ }
+
+ double getOuterZ() const
+ {
+ return _outerZ;
+ }
- void setOuterField(double d) {
- _outerField = d;
- }
-
- void setInnerR(double d) {
- _innerR = d;
- }
-
- void setOuterR(double d) {
- _outerR = d;
- }
-
- void setInnerZ(double d) {
- _innerZ = d;
- }
-
- void setOuterZ(double d) {
- _outerZ = d;
- }
-
- double getInnerField() const {
- return _innerField;
- }
-
- double getOuterField() const {
- return _outerField;
- }
-
- double getInnerR() const {
- return _innerR;
- }
-
- double getOuterR() const {
- return _outerR;
- }
-
- double getInnerZ() const {
- return _innerZ;
- }
-
- double getOuterZ() const {
- return _outerZ;
- }
-
- void printOut(std::ostream &os);
+ void printOut(std::ostream &os);
private:
- double _innerField; - double _outerField; - double _innerR; - double _outerR; - double _innerZ; - double _outerZ;
+ double _innerField; + double _outerField; + double _innerR; + double _outerR; + double _innerZ; + double _outerZ;
}; #endif
diff -u -r1.6 -r1.7 --- G4StoreManager.hh 16 Feb 2007 02:04:47 -0000 1.6 +++ G4StoreManager.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4StoreManager.hh,v 1.6 2007/02/16 02:04:47 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/G4StoreManager.hh,v 1.7 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4STOREMANAGER_HH #define LCDD_G4STOREMANAGER_HH 1
@@ -6,28 +6,28 @@
// FIXME: This class actually needs to do something besides just creating "/stores/" cmd dir. /**
- @class G4StoreManager G4StoreManager.hh - @brief Singleton manager class for retrieval of - G4 solids, LV, PV and regions from stores. - @note Can also dumps/clear G4 stores. -*/
+ @class G4StoreManager G4StoreManager.hh + @brief Singleton manager class for retrieval of + G4 solids, LV, PV and regions from stores. + @note Can also dumps/clear G4 stores. + */
class G4StoreManager
{
protected:
- G4StoreManager();
+ G4StoreManager();
public:
- virtual ~G4StoreManager();
+ virtual ~G4StoreManager();
public:
- // get singleton instance - static G4StoreManager* instance();
+ // get singleton instance + static G4StoreManager* instance();
private:
- static G4StoreManager *_instance;
+ static G4StoreManager *_instance;
}; #endif
diff -u -r1.5 -r1.6 --- G4TrackerCombineSD.hh 18 Dec 2006 22:49:01 -0000 1.5 +++ G4TrackerCombineSD.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4TrackerCombineSD.hh,v 1.5 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/G4TrackerCombineSD.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4TRACKERCOMBINESD_HH #define LCDD_G4TRACKERCOMBINESD_HH 1
@@ -10,40 +10,39 @@
* into a single hit having the mean momentum and position. * @note The logic in this class is based on a refactoring of Mokka's TRKSD00. */
-class G4TrackerCombineSD : public G4TrackerSD
+class G4TrackerCombineSD: public G4TrackerSD
{
public:
- G4TrackerCombineSD(G4String sdName, - G4String hcName);
+ G4TrackerCombineSD(G4String sdName, G4String hcName);
- virtual ~G4TrackerCombineSD();
+ virtual ~G4TrackerCombineSD();
-public: - virtual void EndOfEvent(G4HCofThisEvent *);
+public: + virtual void EndOfEvent(G4HCofThisEvent *);
protected:
- virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
+ virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
private:
- void startHit(G4StepPoint* aStepPoint); - void updateHit(); - bool insertHit(); - void clear();
+ void startHit(G4StepPoint* aStepPoint); + void updateHit(); + bool insertHit(); + void clear();
private:
- bool m_combineHits; - int m_currentTrackID; - G4VPhysicalVolume* m_currentPV; - G4ThreeVector m_entryPoint; - G4ThreeVector m_exitPoint; - G4ThreeVector m_entryMomentum; - G4ThreeVector m_exitMomentum; - G4double m_edepTotal; - G4double m_minTime; - bool m_startedHit; - G4Track* m_currentTrack;
+ bool m_combineHits; + int m_currentTrackID; + G4VPhysicalVolume* m_currentPV; + G4ThreeVector m_entryPoint; + G4ThreeVector m_exitPoint; + G4ThreeVector m_entryMomentum; + G4ThreeVector m_exitMomentum; + G4double m_edepTotal; + G4double m_minTime; + bool m_startedHit; + G4Track* m_currentTrack;
}; #endif
diff -u -r1.12 -r1.13 --- G4TrackerHit.hh 18 Dec 2006 22:49:01 -0000 1.12 +++ G4TrackerHit.hh 24 Jun 2013 22:10:33 -0000 1.13 @@ -10,81 +10,125 @@
#include "G4UnitsTable.hh" /**
- @class G4TrackerHit - @brief Simulation class for a tracker-type hit. -*/ -class G4TrackerHit : public G4VHit
+ @class G4TrackerHit + @brief Simulation class for a tracker-type hit. + */ +class G4TrackerHit: public G4VHit
{
public:
- G4TrackerHit();
+ G4TrackerHit();
- virtual ~G4TrackerHit();
+ virtual ~G4TrackerHit();
- inline void *operator new(size_t); - inline void operator delete(void *aHit);
+ inline void *operator new(size_t); + inline void operator delete(void *aHit);
#ifdef G4VIS_USE
- void Draw();
+ void Draw();
#endif
- void Print();
+ void Print();
public:
- friend std::ostream& operator<<(std::ostream &os, const G4TrackerHit& hit);
+ friend std::ostream& operator<<(std::ostream &os, const G4TrackerHit& hit);
- void setTdep(const G4double tdep) { m_tdep = tdep; }
- void setEdep(const G4double edep) { m_edep = edep; }
- void setPos(const G4ThreeVector& posXYZ) { m_pos = posXYZ; }
- void setMomentum(const G4ThreeVector& mom) { m_mom = mom; }
- void setTrackID(const G4int trkID) { m_trkID = trkID; }
- void setPDG(const G4int pdg) { m_PDG = pdg; }
- void setLength(const G4double l) { m_length = l; }
-
- G4double getTdep() const { return m_tdep; }
- G4double getEdep() const { return m_edep; }
- G4ThreeVector getPos() const { return m_pos; }
- G4ThreeVector getMomentum() const { return m_mom; }
- G4int getTrackID() const { return m_trkID; }
- G4int getPDG() const { return m_PDG; }
- G4double getLength() const { return m_length; }
-
- void setId( Id64bit::ElementType id1 )
- {
- m_id64.setId1( id1 );
- }
-
- int getId()
- {
- return m_id64.getId1();
- }
+ void setTdep(const G4double tdep)
+ {
+ m_tdep = tdep;
+ }
+ void setEdep(const G4double edep)
+ {
+ m_edep = edep;
+ }
+ void setPos(const G4ThreeVector& posXYZ)
+ {
+ m_pos = posXYZ;
+ }
+ void setMomentum(const G4ThreeVector& mom)
+ {
+ m_mom = mom;
+ }
+ void setTrackID(const G4int trkID)
+ {
+ m_trkID = trkID;
+ }
+ void setPDG(const G4int pdg)
+ {
+ m_PDG = pdg;
+ }
+ void setLength(const G4double l)
+ {
+ m_length = l;
+ }
+
+ G4double getTdep() const
+ {
+ return m_tdep;
+ }
+ G4double getEdep() const
+ {
+ return m_edep;
+ }
+ G4ThreeVector getPos() const
+ {
+ return m_pos;
+ }
+ G4ThreeVector getMomentum() const
+ {
+ return m_mom;
+ }
+ G4int getTrackID() const
+ {
+ return m_trkID;
+ }
+ G4int getPDG() const
+ {
+ return m_PDG;
+ }
+ G4double getLength() const
+ {
+ return m_length;
+ }
+
+ void setId(Id64bit::ElementType id1)
+ {
+ m_id64.setId1(id1);
+ }
+
+ int getId()
+ {
+ return m_id64.getId1();
+ }
public:
- G4double m_edep; - G4double m_tdep; - G4ThreeVector m_pos; - G4ThreeVector m_mom; - G4int m_trkID; - G4int m_PDG; - G4double m_length;
+ G4double m_edep; + G4double m_tdep; + G4ThreeVector m_pos; + G4ThreeVector m_mom; + G4int m_trkID; + G4int m_PDG; + G4double m_length;
- // TODO: make this a 32-bit, as only first 32-bits are used - Id64bit m_id64;
+ // TODO: make this a 32-bit, as only first 32-bits are used + Id64bit m_id64;
}; typedef G4THitsCollection<G4TrackerHit> (G4TrackerHitsCollection); extern G4Allocator<G4TrackerHit> G4TrackerHitAllocator;
-inline void* G4TrackerHit::operator new(size_t) {
- void* aHit;
- aHit = (void *) G4TrackerHitAllocator.MallocSingle();
- return aHit;
+inline void* G4TrackerHit::operator new(size_t)
+{
+ void* aHit;
+ aHit = (void *) G4TrackerHitAllocator.MallocSingle();
+ return aHit;
}
-inline void G4TrackerHit::operator delete(void *aHit) {
- G4TrackerHitAllocator.FreeSingle( ( G4TrackerHit* ) aHit );
+inline void G4TrackerHit::operator delete(void *aHit)
+{
+ G4TrackerHitAllocator.FreeSingle((G4TrackerHit*) aHit);
} #endif
diff -u -r1.18 -r1.19 --- G4TrackerSD.hh 12 Dec 2007 03:19:00 -0000 1.18 +++ G4TrackerSD.hh 24 Jun 2013 22:10:33 -0000 1.19 @@ -4,40 +4,38 @@
#include "G4SensitiveDetector.hh" #include "G4TrackerHit.hh" #include "ReadoutUtil.hh" // for cc file and subclasses
-
/**
- @class G4TrackerSD - @brief Geant4 binding for a tracker-type SD. -*/ -class G4TrackerSD : public G4SensitiveDetector
+ @class G4TrackerSD + @brief Geant4 binding for a tracker-type SD. + */ +class G4TrackerSD: public G4SensitiveDetector
{
- public: - - typedef std::vector<G4TrackerHit*> G4TrackerHitList; - - public: - G4TrackerSD(G4String sdName, - G4String hcName); - - virtual ~G4TrackerSD(); - - public: - virtual void Initialize(G4HCofThisEvent *); - virtual void EndOfEvent(G4HCofThisEvent *); - std::ostream& printHits(std::ostream& os); - - double getEdep() const; - - void clearHits(); - - G4TrackerHitList getTrackerHitList(); - - protected: - virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*); - - protected: - G4TrackerHitsCollection* m_HC; - G4TrackerHitList m_hits;
+public: + + typedef std::vector<G4TrackerHit*> G4TrackerHitList; + +public: + G4TrackerSD(G4String sdName, G4String hcName); + + virtual ~G4TrackerSD(); + +public: + virtual void Initialize(G4HCofThisEvent *); + virtual void EndOfEvent(G4HCofThisEvent *); + std::ostream& printHits(std::ostream& os); + + double getEdep() const; + + void clearHits(); + + G4TrackerHitList getTrackerHitList(); + +protected: + virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*); + +protected: + G4TrackerHitsCollection* m_HC; + G4TrackerHitList m_hits;
}; #endif
diff -u -r1.2 -r1.3 --- G4UnsegmentedCalorimeterSD.hh 8 Dec 2010 21:06:24 -0000 1.2 +++ G4UnsegmentedCalorimeterSD.hh 24 Jun 2013 22:10:33 -0000 1.3 @@ -1,4 +1,4 @@
-// $Id: G4UnsegmentedCalorimeterSD.hh,v 1.2 2010/12/08 21:06:24 jeremy Exp $
+// $Id: G4UnsegmentedCalorimeterSD.hh,v 1.3 2013/06/24 22:10:33 jeremy Exp $
#ifndef G4UNSEGMENTEDCALORIMETERSD_HH_ #define G4UNSEGMENTEDCALORIMETERSD_HH_
@@ -10,18 +10,15 @@
* @brief A sensitive detector that writes out a CalorimeterHit for * each step. It does not have any segmentation. */
-class G4UnsegmentedCalorimeterSD : public G4CalorimeterSD
+class G4UnsegmentedCalorimeterSD: public G4CalorimeterSD
{
- public:
+public:
- G4UnsegmentedCalorimeterSD( - G4String sdName, - G4String hcName, - G4Segmentation* seg);
+ G4UnsegmentedCalorimeterSD(G4String sdName, G4String hcName, G4Segmentation* seg);
- protected:
+protected:
- virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
+ virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
}; #endif /* G4UNSEGMENTEDCALORIMETERSD_HH_ */
diff -u -r1.10 -r1.11 --- G4UserRegionInformation.hh 30 Apr 2013 23:04:44 -0000 1.10 +++ G4UserRegionInformation.hh 24 Jun 2013 22:10:33 -0000 1.11 @@ -1,4 +1,4 @@
-//$Header: /cvs/lcd/lcdd/include/G4UserRegionInformation.hh,v 1.10 2013/04/30 23:04:44 jeremy Exp $
+//$Header: /cvs/lcd/lcdd/include/G4UserRegionInformation.hh,v 1.11 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_G4USERREGIONINFORMATION_HH #define LCDD_G4USERREGIONINFORMATION_HH 1
@@ -14,64 +14,74 @@
@class G4UserRegionInformation @brief Implementation of G4VUserRegionInformation. */
-class G4UserRegionInformation: public G4VUserRegionInformation {
+class G4UserRegionInformation: public G4VUserRegionInformation
+{
public:
- G4UserRegionInformation() :
- _storeSecondaries(false), _killTracks(false) {
- }
-
- virtual ~G4UserRegionInformation() {
- }
+ G4UserRegionInformation() :
+ _storeSecondaries(false), _killTracks(false)
+ {
+ }
+
+ virtual ~G4UserRegionInformation()
+ {
+ }
public:
- void setStoreSecondaries(bool b) {
- _storeSecondaries = b;
- }
-
- bool getStoreSecondaries() const {
- return _storeSecondaries;
- }
-
- void setKillTracks(bool killTracks) {
- _killTracks = killTracks;
- }
-
- bool getKillTracks() const {
- return _killTracks;
- }
-
- void setThreshold(G4double t) {
- _threshold = t;
- }
-
- G4double getThreshold() const {
- return _threshold;
- }
-
- // region info from track
- static inline G4UserRegionInformation* getRegionInformation(
- const G4Track* aTrack) {
- return static_cast<G4UserRegionInformation*>(aTrack->GetLogicalVolumeAtVertex()->GetRegion()->GetUserInformation());
- }
-
- // region info from step point
- static G4UserRegionInformation* getRegionInformation(
- const G4StepPoint* aStepPoint) {
- return static_cast<G4UserRegionInformation*>(aStepPoint->GetPhysicalVolume()->GetLogicalVolume()->GetRegion()->GetUserInformation());
- }
-
- void Print() const {
- }
+ void setStoreSecondaries(bool b)
+ {
+ _storeSecondaries = b;
+ }
+
+ bool getStoreSecondaries() const
+ {
+ return _storeSecondaries;
+ }
+
+ void setKillTracks(bool killTracks)
+ {
+ _killTracks = killTracks;
+ }
+
+ bool getKillTracks() const
+ {
+ return _killTracks;
+ }
+
+ void setThreshold(G4double t)
+ {
+ _threshold = t;
+ }
+
+ G4double getThreshold() const
+ {
+ return _threshold;
+ }
+
+ // region info from track
+ static inline G4UserRegionInformation* getRegionInformation(const G4Track* aTrack)
+ {
+ return static_cast<G4UserRegionInformation*>(aTrack->GetLogicalVolumeAtVertex()->GetRegion()->GetUserInformation());
+ }
+
+ // region info from step point
+ static G4UserRegionInformation* getRegionInformation(const G4StepPoint* aStepPoint)
+ {
+ return static_cast<G4UserRegionInformation*>(aStepPoint->GetPhysicalVolume()->GetLogicalVolume()->GetRegion()->GetUserInformation());
+ }
+
+ void Print() const
+ {
+ }
private:
- bool _storeSecondaries; - bool _killTracks;
+ bool _storeSecondaries; + bool _killTracks;
- G4double _threshold;
+ G4double _threshold;
}; #endif
diff -u -r1.4 -r1.5 --- GDMLWriter.hh 3 Sep 2008 18:53:47 -0000 1.4 +++ GDMLWriter.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/GDMLWriter.hh,v 1.4 2008/09/03 18:53:47 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/GDMLWriter.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_GDMLWRITER_HH #define LCDD_GDMLWRITER_HH 1
@@ -8,9 +8,9 @@
class GDMLWriter
{
- public: - static void writeCurrentGeometry(const std::string& fileName); - static void writeCurrentGeometry(const std::string& fileName, std::vector<std::string> volumes);
+public: + static void writeCurrentGeometry(const std::string& fileName); + static void writeCurrentGeometry(const std::string& fileName, std::vector<std::string> volumes);
}; #endif
diff -u -r1.2 -r1.3 --- GDMLWriterMessenger.hh 3 Sep 2008 18:53:47 -0000 1.2 +++ GDMLWriterMessenger.hh 24 Jun 2013 22:10:33 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/GDMLWriterMessenger.hh,v 1.2 2008/09/03 18:53:47 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/GDMLWriterMessenger.hh,v 1.3 2013/06/24 22:10:33 jeremy Exp $
#ifndef GDMLWriterMessenger_h #define GDMLWriterMessenger_h 1
@@ -11,23 +11,24 @@
* @class GDMLWriterMessenger * @brief Messenger for GDMLWriter */
-class GDMLWriterMessenger : public G4UImessenger
+class GDMLWriterMessenger: public G4UImessenger
{
public:
- GDMLWriterMessenger(); - virtual ~GDMLWriterMessenger();
+ GDMLWriterMessenger(); + virtual ~GDMLWriterMessenger();
public:
- void SetNewValue(G4UIcommand *, G4String newVals);
+ void SetNewValue(G4UIcommand *, G4String newVals);
private:
- void defineCommands();
+ void defineCommands();
private:
- G4UIcommand* m_dumpGDMLCmd; -}; // class
+ G4UIcommand* m_dumpGDMLCmd; +}; +// class
#endif
diff -u -r1.5 -r1.6 --- GeneratorType.hh 18 Dec 2006 22:49:01 -0000 1.5 +++ GeneratorType.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/GeneratorType.hh,v 1.5 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/GeneratorType.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_GENERATORTYPE_HH #define LCDD_GENERATORTYPE_HH 1
@@ -6,64 +6,66 @@
#include <string> /**
- @class GeneratorType - @brief GeneratorType from schema. -*/
+ @class GeneratorType + @brief GeneratorType from schema. + */
class GeneratorType
{
public:
- GeneratorType()
- {}
-
- virtual ~GeneratorType()
- {}
-
- void set_name(const std::string& n)
- {
- m_name = n;
- }
-
- void set_version(const std::string& v)
- {
- m_version = v;
- }
-
- void set_file(const std::string& u)
- {
- m_file = u;
- }
-
- void set_checksum(const std::string& c)
- {
- m_checksum = c;
- }
-
- const std::string& get_name() const
- {
- return m_name;
- }
-
- const std::string& get_version() const
- {
- return m_version;
- }
-
- const std::string& get_file() const
- {
- return m_file;
- }
-
- const std::string& get_checksum() const
- {
- return m_checksum;
- }
+ GeneratorType()
+ {
+ }
+
+ virtual ~GeneratorType()
+ {
+ }
+
+ void set_name(const std::string& n)
+ {
+ m_name = n;
+ }
+
+ void set_version(const std::string& v)
+ {
+ m_version = v;
+ }
+
+ void set_file(const std::string& u)
+ {
+ m_file = u;
+ }
+
+ void set_checksum(const std::string& c)
+ {
+ m_checksum = c;
+ }
+
+ const std::string& get_name() const
+ {
+ return m_name;
+ }
+
+ const std::string& get_version() const
+ {
+ return m_version;
+ }
+
+ const std::string& get_file() const
+ {
+ return m_file;
+ }
+
+ const std::string& get_checksum() const
+ {
+ return m_checksum;
+ }
private:
- std::string m_name; - std::string m_version; - std::string m_file; - std::string m_checksum;
+ std::string m_name; + std::string m_version; + std::string m_file; + std::string m_checksum;
}; #endif
diff -u -r1.12 -r1.13 --- GeometryManager.hh 12 Jul 2007 18:09:00 -0000 1.12 +++ GeometryManager.hh 24 Jun 2013 22:10:33 -0000 1.13 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/GeometryManager.hh,v 1.12 2007/07/12 18:09:00 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/GeometryManager.hh,v 1.13 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_GEOMETRYMANAGER_HH #define LCDD_GEOMETRYMANAGER_HH 1
@@ -11,65 +11,65 @@
/** * @class GeometryManager * @brief Singleton manager class with miscellaneous geometry utility functions.
-*/
+ */
class GeometryManager
{
public:
- virtual ~GeometryManager(); - static GeometryManager* instance();
+ virtual ~GeometryManager(); + static GeometryManager* instance();
protected:
- GeometryManager();
+ GeometryManager();
public:
- /** - * Retrieve the world's logical volume from Geant4. - */ - G4LogicalVolume* getWorldLogicalVolume() const; - - /** - * Retrieve the world's physical volume from Geant4. - */ - G4VPhysicalVolume* getWorldPhysicalVolume() const; - - /** - * Hook for beginning the run. - */ - void beginRun(const G4Run*); - - /** - * Attach the RegionInformation to the world's region. - */ - void setupWorldRegionInformation();
+ /** + * Retrieve the world's logical volume from Geant4. + */ + G4LogicalVolume* getWorldLogicalVolume() const; + + /** + * Retrieve the world's physical volume from Geant4. + */ + G4VPhysicalVolume* getWorldPhysicalVolume() const; + + /** + * Hook for beginning the run. + */ + void beginRun(const G4Run*); + + /** + * Attach the RegionInformation to the world's region. + */ + void setupWorldRegionInformation();
#ifdef HAVE_G4PVPLACEMENT_CHECKOVERLAPS
- /** - * Check overlaps starting with the world volume - * and recursing to daughters. - */ - void checkOverlaps() const; - - /** - * Check for overlaps by calling CheckOverlaps on all daughters - * of a given logical volume, with possible recursion to - * daughters. - */ - 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. - */ - void checkOverlaps(const G4String&, bool recurse=true) const;
+ /** + * Check overlaps starting with the world volume + * and recursing to daughters. + */ + void checkOverlaps() const; + + /** + * Check for overlaps by calling CheckOverlaps on all daughters + * of a given logical volume, with possible recursion to + * daughters. + */ + 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. + */ + void checkOverlaps(const G4String&, bool recurse=true) const;
#endif private:
- static GeometryManager* m_instance; - bool m_worldRegionIsSetup;
+ static GeometryManager* m_instance; + bool m_worldRegionIsSetup;
}; #endif
diff -u -r1.6 -r1.7 --- GlobalFieldType.hh 18 Dec 2006 22:49:01 -0000 1.6 +++ GlobalFieldType.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/GlobalFieldType.hh,v 1.6 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/GlobalFieldType.hh,v 1.7 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_GLOBALFIELDTYPE_HH #define LCDD_GLOBALFIELDTYPE_HH 1
@@ -6,29 +6,32 @@
/** * @class GlobalFieldType * @brief GlobalFieldType from schema.
-*/
+ */
class GlobalFieldType
{
public:
- GlobalFieldType()
- {}
-
- virtual ~GlobalFieldType()
- {}
-
- const ContentSequence* get_content() const {
- return &m_sequence;
- }
-
- void add_content( const std::string& tag, SAXObject* so )
- {
- ContentGroup::ContentItem ci = {tag, so };
- m_sequence.add_content( ci );
- }
+ GlobalFieldType()
+ {
+ }
+
+ virtual ~GlobalFieldType()
+ {
+ }
+
+ const ContentSequence* get_content() const
+ {
+ return &m_sequence;
+ }
+
+ void add_content(const std::string& tag, SAXObject* so)
+ {
+ ContentGroup::ContentItem ci = { tag, so };
+ m_sequence.add_content(ci);
+ }
private:
- ContentSequence m_sequence;
+ ContentSequence m_sequence;
}; #endif
diff -u -r1.1 -r1.2 --- GlobalGridXYSegmentationType.hh 30 Oct 2009 23:16:59 -0000 1.1 +++ GlobalGridXYSegmentationType.hh 24 Jun 2013 22:10:33 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/GlobalGridXYSegmentationType.hh,v 1.1 2009/10/30 23:16:59 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/GlobalGridXYSegmentationType.hh,v 1.2 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_GLOBALGRIDXYSEGMENTATIONTYPE_HH #define LCDD_GLOBALGRIDXYSEGMENTATIONTYPE_HH 1
@@ -13,53 +13,55 @@
* @class GlobalGridXYSegmentationType * @brief GlobalGridXYSegmentation from schema. */
-class GlobalGridXYSegmentationType : public SegmentationType
+class GlobalGridXYSegmentationType: public SegmentationType
{
- public:
+public:
- GlobalGridXYSegmentationType()
- {}
-
- virtual ~GlobalGridXYSegmentationType()
- {}
-
- public:
-
- void set_gridSizeX(const std::string& gsx)
- {
- m_gridSizeX = gsx;
- }
-
- void set_gridSizeY(const std::string& gsy)
- {
- m_gridSizeY = gsy;
- }
-
- void set_lunit( const std::string& lunit)
- {
- m_lunit = lunit;
- }
-
- const std::string& get_gridSizeX()
- {
- return m_gridSizeX;
- }
-
- const std::string& get_gridSizeY()
- {
- return m_gridSizeY;
- }
-
- const std::string& get_lunit()
- {
- return m_lunit;
- }
-
- protected:
-
- std::string m_gridSizeX;
- std::string m_gridSizeY;
- std::string m_lunit;
+ GlobalGridXYSegmentationType()
+ {
+ }
+
+ virtual ~GlobalGridXYSegmentationType()
+ {
+ }
+
+public:
+
+ void set_gridSizeX(const std::string& gsx)
+ {
+ m_gridSizeX = gsx;
+ }
+
+ void set_gridSizeY(const std::string& gsy)
+ {
+ m_gridSizeY = gsy;
+ }
+
+ void set_lunit(const std::string& lunit)
+ {
+ m_lunit = lunit;
+ }
+
+ const std::string& get_gridSizeX()
+ {
+ return m_gridSizeX;
+ }
+
+ const std::string& get_gridSizeY()
+ {
+ return m_gridSizeY;
+ }
+
+ const std::string& get_lunit()
+ {
+ return m_lunit;
+ }
+
+protected:
+
+ std::string m_gridSizeX;
+ std::string m_gridSizeY;
+ std::string m_lunit;
}; #endif
diff -u -r1.5 -r1.6 --- HeaderType.hh 18 Dec 2006 22:49:01 -0000 1.5 +++ HeaderType.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/HeaderType.hh,v 1.5 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/HeaderType.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_HEADERTYPE_HH #define LCDD_HEADERTYPE_HH 1
@@ -8,31 +8,34 @@
#include <string> /**
- @class HeaderType - @brief HeaderType from schema. -*/
+ @class HeaderType + @brief HeaderType from schema. + */
class HeaderType
{
public:
- HeaderType()
- {}
-
- virtual ~HeaderType()
- {}
-
- void add_content(const std::string& tag, SAXObject* so)
- {
- ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content( ci );
- }
-
- const ContentSequence* get_content() const {
- return &m_sequence;
- }
+ HeaderType()
+ {
+ }
+
+ virtual ~HeaderType()
+ {
+ }
+
+ void add_content(const std::string& tag, SAXObject* so)
+ {
+ ContentGroup::ContentItem ci = { tag, so };
+ m_sequence.add_content(ci);
+ }
+
+ const ContentSequence* get_content() const
+ {
+ return &m_sequence;
+ }
private:
- ContentSequence m_sequence;
+ ContentSequence m_sequence;
}; #endif
diff -u -r1.3 -r1.4 --- HitComparator.hh 18 Dec 2006 22:49:01 -0000 1.3 +++ HitComparator.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/HitComparator.hh,v 1.3 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/HitComparator.hh,v 1.4 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_HITCOMPARATOR_HH #define LCDD_HITCOMPARATOR_HH 1
@@ -7,10 +7,12 @@
class HitComparator
{
public:
- virtual ~HitComparator() {}
+ virtual ~HitComparator()
+ {
+ }
public:
- virtual bool compare(const G4CalorimeterHit&, const G4CalorimeterHit&) = 0;
+ virtual bool compare(const G4CalorimeterHit&, const G4CalorimeterHit&) = 0;
}; #endif
diff -u -r1.5 -r1.6 --- Id64bit.hh 18 Dec 2006 22:49:01 -0000 1.5 +++ Id64bit.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,61 +1,61 @@
-// $Header: /cvs/lcd/lcdd/include/Id64bit.hh,v 1.5 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/Id64bit.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_ID64BIT_HH #define LCDD_ID64BIT_HH 1 /**
- @class Id64bit - @brief Packed, 64-bit ID for Lcio output.
+ @class Id64bit + @brief Packed, 64-bit ID for Lcio output.
*/
class Id64bit
{
public:
- typedef int ElementType;
+ typedef int ElementType;
public:
- Id64bit()
- {
- resetIds();
- }
-
- virtual ~Id64bit()
- {}
-
- void resetIds()
- {
- m_ids[0] = 0;
- m_ids[1] = 0;
- }
-
- void setId0(ElementType id0)
- {
- m_ids[0] = id0;
- }
-
- void setId1(ElementType id1)
- {
- m_ids[1] = id1;
- }
-
- ElementType getId0() const
- {
- return m_ids[0];
- }
-
- ElementType getId1() const
- {
- return m_ids[1];
- }
-
- bool operator==(const Id64bit& right) const
- {
- return ( m_ids[0] == right.m_ids[0] &&
- m_ids[1] == right.m_ids[1] );
- }
+ Id64bit()
+ {
+ resetIds();
+ }
+
+ virtual ~Id64bit()
+ {
+ }
+
+ void resetIds()
+ {
+ m_ids[0] = 0;
+ m_ids[1] = 0;
+ }
+
+ void setId0(ElementType id0)
+ {
+ m_ids[0] = id0;
+ }
+
+ void setId1(ElementType id1)
+ {
+ m_ids[1] = id1;
+ }
+
+ ElementType getId0() const
+ {
+ return m_ids[0];
+ }
+
+ ElementType getId1() const
+ {
+ return m_ids[1];
+ }
+
+ bool operator==(const Id64bit& right) const
+ {
+ return (m_ids[0] == right.m_ids[0] && m_ids[1] == right.m_ids[1]);
+ }
private:
- ElementType m_ids[2];
+ ElementType m_ids[2];
}; #endif
diff -u -r1.3 -r1.4 --- IdComparator.hh 18 Dec 2006 22:49:01 -0000 1.3 +++ IdComparator.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -1,19 +1,21 @@
-// $Header: /cvs/lcd/lcdd/include/IdComparator.hh,v 1.3 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/IdComparator.hh,v 1.4 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_IDCOMPARATOR_HH #define LCDD_IDCOMPARATOR_HH 1 #include "HitComparator.hh"
-class IdComparator : public HitComparator
+class IdComparator: public HitComparator
{
public:
- virtual ~IdComparator() {}
+ virtual ~IdComparator()
+ {
+ }
public:
- virtual bool compare(const G4CalorimeterHit& hit1, const G4CalorimeterHit& hit2)
- {
+ virtual bool compare(const G4CalorimeterHit& hit1, const G4CalorimeterHit& hit2)
+ {
// std::cout << "ID --> hit1 " << hit1.getId64bit().getId0() << " " << hit2.getId64bit().getId1()
// << " == hit2 " << hit2.getId64bit().getId0() << " " << hit2.getId64bit().getId1() << std::endl;
// if ( hit1.getId64bit() == hit2.getId64bit() ) {
@@ -23,8 +25,8 @@
// std::cout << "NOT EQUAL" << std::endl; // }
- return ( hit1.getId64bit() == hit2.getId64bit() ); - }
+ return (hit1.getId64bit() == hit2.getId64bit()); + }
}; #endif
diff -u -r1.11 -r1.12 --- IdFactory.hh 18 Dec 2006 22:49:01 -0000 1.11 +++ IdFactory.hh 24 Jun 2013 22:10:33 -0000 1.12 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/IdFactory.hh,v 1.11 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/IdFactory.hh,v 1.12 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_IDFACTORY_HH #define LCDD_IDFACTORY_HH 1
@@ -21,64 +21,66 @@
class G4SensitiveDetector; /**
- @class IdFactory - @brief Produce int IDs based on stepping info. - @note Can also convert from an IdVec to Id64bit, packed ID. -*/
+ @class IdFactory + @brief Produce int IDs based on stepping info. + @note Can also convert from an IdVec to Id64bit, packed ID. + */
class IdFactory
{
public:
- typedef unsigned int Bits;
+ typedef unsigned int Bits;
- static const Bits MASK_ON;
+ static const Bits MASK_ON;
public:
- virtual ~IdFactory()
- {}
+ virtual ~IdFactory()
+ {
+ }
private:
- // class should not be instantiated
- IdFactory()
- {}
+ // class should not be instantiated
+ IdFactory()
+ {
+ }
public:
- /* Create an Id64bit from the input IdVec and its matching specification. */ - static Id64bit createId64bit(const IdVec& idvec, IdSpec* idspec);
+ /* Create an Id64bit from the input IdVec and its matching specification. */ + static Id64bit createId64bit(const IdVec& idvec, IdSpec* idspec);
- /* - * TJ's suggestion for making a bit mask. - * @param len length of mask - */ - static inline Bits makeBitMask(IdField::SizeType len); - - /** - * Check that the given value does not overflow the given mask. - * - * @return If overflow, then returns the bits outside the mask. Otherwise, returns 0. - */ - static inline Bits checkOverflow(Id64bit::ElementType field_val, Bits mask); - - // create IdVec ordered by this SD's idspec, or empty vec if sd does not have an idspec - static IdVec createOrderedIdVec(G4Step* aStep, const G4SensitiveDetector* sd); - - /* lkp bin value by field name in segmentation */ - static int findFieldIdxInSegmentation(G4Segmentation*, const std::string& field_name); - - /* Check if PV list has PVid with given label. */ - static bool hasPhysVolId(const std::vector<G4VPhysicalVolume*>& pvs, const std::string& field_name);
+ /* + * TJ's suggestion for making a bit mask. + * @param len length of mask + */ + static inline Bits makeBitMask(IdField::SizeType len); + + /** + * Check that the given value does not overflow the given mask. + * + * @return If overflow, then returns the bits outside the mask. Otherwise, returns 0. + */ + static inline Bits checkOverflow(Id64bit::ElementType field_val, Bits mask); + + // create IdVec ordered by this SD's idspec, or empty vec if sd does not have an idspec + static IdVec createOrderedIdVec(G4Step* aStep, const G4SensitiveDetector* sd); + + /* lkp bin value by field name in segmentation */ + static int findFieldIdxInSegmentation(G4Segmentation*, const std::string& field_name); + + /* Check if PV list has PVid with given label. */ + static bool hasPhysVolId(const std::vector<G4VPhysicalVolume*>& pvs, const std::string& field_name);
- // lkp bin value by field name in PV ids - static int findIdInPhysVols(const std::vector<G4VPhysicalVolume*>& pvs, const std::string& field_name);
+ // lkp bin value by field name in PV ids + static int findIdInPhysVols(const std::vector<G4VPhysicalVolume*>& pvs, const std::string& field_name);
- // add physvolids from step to an IdVec - static void addPhysVolIds(G4Step* aStep, IdVec& v);
+ // add physvolids from step to an IdVec + static void addPhysVolIds(G4Step* aStep, IdVec& v);
- // list of PVs - static std::vector<G4VPhysicalVolume*> getPhysVolList( G4Step* aStep );
+ // list of PVs + static std::vector<G4VPhysicalVolume*> getPhysVolList(G4Step* aStep);
}; #endif
diff -u -r1.6 -r1.7 --- IdField.hh 18 Dec 2006 22:49:01 -0000 1.6 +++ IdField.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/IdField.hh,v 1.6 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/IdField.hh,v 1.7 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_IDFIELD_HH #define LCDD_IDFIELD_HH 1
@@ -6,79 +6,76 @@
#include <string> /**
- @class IdField - @brief Field in an IdSpec. - @note Includes start, length, label and signed flag.
+ @class IdField + @brief Field in an IdSpec. + @note Includes start, length, label and signed flag.
*/
class IdField
{
public:
- typedef unsigned short int SizeType;
+ typedef unsigned short int SizeType;
public:
- IdField()
- {}
-
- IdField(const std::string& label,
- SizeType start,
- SizeType length,
- bool is_signed)
- : m_label(label),
- m_start(start),
- m_length(length),
- m_isSigned(is_signed)
- {}
-
- virtual ~IdField()
- {}
-
- void setLabel(const std::string& l)
- {
- m_label = l;
- }
-
- void setStart(SizeType st)
- {
- m_start = st;
- }
-
- void setLength(SizeType st)
- {
- m_length = st;
- }
-
- void setSigned(bool s)
- {
- m_isSigned = s;
- }
-
- const std::string& getLabel()
- {
- return m_label;
- }
-
- SizeType getStart()
- {
- return m_start;
- }
-
- SizeType getLength()
- {
- return m_length;
- }
-
- bool getSigned()
- {
- return m_isSigned;
- }
+ IdField()
+ {
+ }
+
+ IdField(const std::string& label, SizeType start, SizeType length, bool is_signed) :
+ m_label(label), m_start(start), m_length(length), m_isSigned(is_signed)
+ {
+ }
+
+ virtual ~IdField()
+ {
+ }
+
+ void setLabel(const std::string& l)
+ {
+ m_label = l;
+ }
+
+ void setStart(SizeType st)
+ {
+ m_start = st;
+ }
+
+ void setLength(SizeType st)
+ {
+ m_length = st;
+ }
+
+ void setSigned(bool s)
+ {
+ m_isSigned = s;
+ }
+
+ const std::string& getLabel()
+ {
+ return m_label;
+ }
+
+ SizeType getStart()
+ {
+ return m_start;
+ }
+
+ SizeType getLength()
+ {
+ return m_length;
+ }
+
+ bool getSigned()
+ {
+ return m_isSigned;
+ }
private:
- std::string m_label; - SizeType m_start; - SizeType m_length; - bool m_isSigned;
+ std::string m_label; + SizeType m_start; + SizeType m_length; + bool m_isSigned;
}; #endif
diff -u -r1.4 -r1.5 --- IdFieldType.hh 18 Dec 2006 22:49:01 -0000 1.4 +++ IdFieldType.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,69 +1,71 @@
-// $Header: /cvs/lcd/lcdd/include/IdFieldType.hh,v 1.4 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/IdFieldType.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_IDFIELDTYPE_HH #define LCDD_IDFIELDTYPE_HH 1 #include <string> /**
- @class IdFieldType - @brief IdFieldType from schema. -*/
+ @class IdFieldType + @brief IdFieldType from schema. + */
class IdFieldType
{
public:
- IdFieldType()
- {}
-
- virtual ~IdFieldType()
- {}
+ IdFieldType()
+ {
+ }
+
+ virtual ~IdFieldType()
+ {
+ }
public:
- void set_label(const std::string& l)
- {
- m_label = l;
- }
-
- void set_start(const std::string& s)
- {
- m_start = s;
- }
-
- void set_length(const std::string& l)
- {
- m_length = l;
- }
-
- void set_signed(const std::string& s)
- {
- m_signed = s;
- }
-
- const std::string& get_label()
- {
- return m_label;
- }
-
- const std::string& get_start()
- {
- return m_start;
- }
-
- const std::string& get_length()
- {
- return m_length;
- }
-
- const std::string& get_signed()
- {
- return m_signed;
- }
+ void set_label(const std::string& l)
+ {
+ m_label = l;
+ }
+
+ void set_start(const std::string& s)
+ {
+ m_start = s;
+ }
+
+ void set_length(const std::string& l)
+ {
+ m_length = l;
+ }
+
+ void set_signed(const std::string& s)
+ {
+ m_signed = s;
+ }
+
+ const std::string& get_label()
+ {
+ return m_label;
+ }
+
+ const std::string& get_start()
+ {
+ return m_start;
+ }
+
+ const std::string& get_length()
+ {
+ return m_length;
+ }
+
+ const std::string& get_signed()
+ {
+ return m_signed;
+ }
private:
- std::string m_label; - std::string m_start; - std::string m_length; - std::string m_signed;
+ std::string m_label; + std::string m_start; + std::string m_length; + std::string m_signed;
}; #endif
diff -u -r1.9 -r1.10 --- IdManager.hh 18 Dec 2006 22:49:01 -0000 1.9 +++ IdManager.hh 24 Jun 2013 22:10:33 -0000 1.10 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/IdManager.hh,v 1.9 2006/12/18 22:49:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/IdManager.hh,v 1.10 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_IDMANAGER_HH #define LCDD_IDMANAGER_HH 1
@@ -20,76 +20,75 @@
class G4LogicalVolume; /**
- @class IdManager - @brief Singleton manager class for geometric ids. - @note Mainly provides utility functions based on G4VPhysicalVolume ptrs. -*/
+ @class IdManager + @brief Singleton manager class for geometric ids. + @note Mainly provides utility functions based on G4VPhysicalVolume ptrs. + */
class IdManager
{
public:
- typedef std::map<std::string, IdSpec*> IdSpecs;
+ typedef std::map<std::string, IdSpec*> IdSpecs;
public:
- virtual ~IdManager(); - static IdManager* instance();
+ virtual ~IdManager(); + static IdManager* instance();
protected:
- IdManager();
+ IdManager();
public:
- // *** idspecs ***
- void addIdSpec(const std::string& name,
- IdSpec* spec);
-
- IdSpec* getIdSpec(const char* name);
- IdSpec* getIdSpec(const std::string& name);
-
- IdSpecs::const_iterator getIdSpecsBegin();
- IdSpecs::const_iterator getIdSpecsEnd();
-
- const IdSpecs* getIdSpecStore()
- {
- return &m_idSpecs;
- }
-
- // *** physvolids ***
- void addPhysVolId( G4LogicalVolume* lvMom, int childIdx, PhysVolId childId );
-
- bool hasPhysVolIds(G4VPhysicalVolume* pv) const
- {
- return m_physVolIdMap.hasPhysVolIds( pv );
- }
-
- // caller cannot directly alter this map
- const PhysVolIdMap& getPhysVolIdMap() const
- {
- return m_physVolIdMap;
- }
+ // *** idspecs *** + void addIdSpec(const std::string& name, IdSpec* spec);
- /*
+ IdSpec* getIdSpec(const char* name);
+ IdSpec* getIdSpec(const std::string& name);
+
+ IdSpecs::const_iterator getIdSpecsBegin();
+ IdSpecs::const_iterator getIdSpecsEnd();
+
+ const IdSpecs* getIdSpecStore()
+ {
+ return &m_idSpecs;
+ }
+
+ // *** physvolids ***
+ void addPhysVolId(G4LogicalVolume* lvMom, int childIdx, PhysVolId childId);
+
+ bool hasPhysVolIds(G4VPhysicalVolume* pv) const
+ {
+ return m_physVolIdMap.hasPhysVolIds(pv);
+ }
+
+ // caller cannot directly alter this map
+ const PhysVolIdMap& getPhysVolIdMap() const
+ {
+ return m_physVolIdMap;
+ }
+
+ /*
This ref should always exist because map's function
will create an empty vec if one does not exist already.
- */
- PhysVolId::PhysVolIds& getPhysVolIds(G4VPhysicalVolume* pv)
- {
- return m_physVolIdMap.getPhysVolIds(pv);
- }
+ */
+ PhysVolId::PhysVolIds& getPhysVolIds(G4VPhysicalVolume* pv)
+ {
+ return m_physVolIdMap.getPhysVolIds(pv);
+ }
- // print - static void printIds(std::ostream& os, const IdVec& ids);
+ // print + static void printIds(std::ostream& os, const IdVec& ids);
private:
- // static singleton instance - static IdManager* m_instance;
+ // static singleton instance + static IdManager* m_instance;
- // id specifications by name - IdSpecs m_idSpecs;
+ // id specifications by name + IdSpecs m_idSpecs;
- // map of PV ids - PhysVolIdMap m_physVolIdMap;
+ // map of PV ids + PhysVolIdMap m_physVolIdMap;
}; #endif
diff -u -r1.10 -r1.11 --- IdSpec.hh 18 Dec 2006 22:49:02 -0000 1.10 +++ IdSpec.hh 24 Jun 2013 22:10:33 -0000 1.11 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/IdSpec.hh,v 1.10 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/IdSpec.hh,v 1.11 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_IDSPEC_HH #define LCDD_IDSPEC_HH 1
@@ -16,115 +16,112 @@
* @class IdSpec * @brief Id specification for a full geometric ID. * @note Includes a vector of IdFields.
-*/
+ */
class IdSpec
{
public:
- typedef unsigned int SizeType; - typedef std::vector<IdField*> IdFields;
+ typedef unsigned int SizeType; + typedef std::vector<IdField*> IdFields;
public:
- IdSpec()
- {}
+ IdSpec()
+ {
+ }
+
+ virtual ~IdSpec()
+ {
+ deleteIdFields();
+ }
+
+ void deleteIdFields()
+ {
+ if (m_idFields.size() > 0) {
+ for (IdFields::iterator iter = m_idFields.begin(); iter != m_idFields.end(); iter++) {
+ delete *iter;
+ }
+ m_idFields.clear();
+ }
+ }
+
+ void setName(const std::string& n)
+ {
+ m_name = n;
+ }
+
+ void setBitLength(SizeType st)
+ {
+ m_bitLength = st;
+ }
+
+ SizeType getBitLength() const
+ {
+ return m_bitLength;
+ }
+
+ const std::string& getName() const
+ {
+ return m_name;
+ }
+
+ SizeType getNumFields() const
+ {
+ return m_idFields.size();
+ }
- virtual ~IdSpec()
- {
- deleteIdFields();
- }
-
- void deleteIdFields()
- {
- if ( m_idFields.size() > 0 ) {
- for ( IdFields::iterator iter = m_idFields.begin();
- iter != m_idFields.end();
- iter++ ) {
- delete *iter;
- }
- m_idFields.clear();
- }
- }
-
- void setName(const std::string& n)
- {
- m_name = n;
- }
-
- void setBitLength(SizeType st)
- {
- m_bitLength = st;
- }
-
- SizeType getBitLength() const
- {
- return m_bitLength;
- }
-
- const std::string& getName() const
- {
- return m_name;
- }
-
- SizeType getNumFields() const
- {
- return m_idFields.size();
- }
-
- void addIdField(IdField* f)
- {
- m_idFields.push_back(f);
- }
-
- IdField* getIdField(const std::string& n) const
- {
- IdField* f = 0;
- for ( IdFields::const_iterator iter = IdFieldsBegin();
- iter != IdFieldsEnd();
- iter++ ) {
- if ( n == (*iter)->getLabel() ) {
- f = *iter;
- break;
- }
- }
- return f;
- }
-
- IdField* getIdField(SizeType st) const
- {
- // harsh index check!
- assert (st < m_idFields.size() );
-
- return m_idFields[ st ];
- }
-
- const IdFields& getIdFields() const
- {
- return m_idFields;
- }
-
- IdFields::const_iterator IdFieldsBegin() const
- {
- return m_idFields.begin();
- }
-
- IdFields::const_iterator IdFieldsEnd() const
- {
- return m_idFields.end();
- }
-
- void clear()
- {
- m_idFields.clear();
- }
+ void addIdField(IdField* f)
+ {
+ m_idFields.push_back(f);
+ }
+
+ IdField* getIdField(const std::string& n) const
+ {
+ IdField* f = 0;
+ for (IdFields::const_iterator iter = IdFieldsBegin(); iter != IdFieldsEnd(); iter++) {
+ if (n == (*iter)->getLabel()) {
+ f = *iter;
+ break;
+ }
+ }
+ return f;
+ }
+
+ IdField* getIdField(SizeType st) const
+ {
+ // harsh index check!
+ assert(st < m_idFields.size());
+
+ return m_idFields[st];
+ }
+
+ const IdFields& getIdFields() const
+ {
+ return m_idFields;
+ }
+
+ IdFields::const_iterator IdFieldsBegin() const
+ {
+ return m_idFields.begin();
+ }
+
+ IdFields::const_iterator IdFieldsEnd() const
+ {
+ return m_idFields.end();
+ }
+
+ void clear()
+ {
+ m_idFields.clear();
+ }
- void printOut(std::ostream& os) const;
+ void printOut(std::ostream& os) const;
- std::string getFieldDescription();
+ std::string getFieldDescription();
private:
- std::string m_name; - SizeType m_bitLength; - IdFields m_idFields;
+ std::string m_name; + SizeType m_bitLength; + IdFields m_idFields;
}; #endif
diff -u -r1.7 -r1.8 --- IdSpecType.hh 18 Dec 2006 22:49:02 -0000 1.7 +++ IdSpecType.hh 24 Jun 2013 22:10:33 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/IdSpecType.hh,v 1.7 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/IdSpecType.hh,v 1.8 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_IDSPECTYPE_HH #define LCDD_IDSPECTYPE_HH
@@ -10,75 +10,81 @@
#include <string> /**
- @class IdSpecType - @brief IdSpecType from schema. -*/
+ @class IdSpecType + @brief IdSpecType from schema. + */
class IdSpecType
{
public:
- /**
- * @class IdSpecType::idspecref
- * @brief Reference to an idspec element.
- *
- */
- class idspecref : public SAXObject, public ReferenceType {
- public:
- idspecref()
- {}
+ /**
+ * @class IdSpecType::idspecref
+ * @brief Reference to an idspec element.
+ *
+ */
+ class idspecref: public SAXObject, public ReferenceType
+ {
+ public:
+ idspecref()
+ {
+ }
+
+ virtual ~idspecref()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
+ };
- virtual ~idspecref()
- {}
+public:
+ IdSpecType()
+ {
+ }
- virtual SAXObject::Type type()
+ virtual ~IdSpecType()
{
- return SAXObject::element;
}
- };
-public:
- IdSpecType()
- {}
+ void set_name(const std::string& n)
+ {
+ m_name = n;
+ }
+
+ void set_length(const std::string& l)
+ {
+ m_length = l;
+ }
- virtual ~IdSpecType()
- {}
+ const std::string& get_name() const
+ {
+ return m_name;
+ }
+
+ const std::string& get_length() const
+ {
+ return m_length;
+ }
- void set_name(const std::string& n)
- {
- m_name = n;
- }
-
- void set_length(const std::string& l)
- {
- m_length = l;
- }
-
- const std::string& get_name() const
- {
- return m_name;
- }
-
- const std::string& get_length() const
- {
- return m_length;
- }
-
- const ContentSequence* get_content() const {
- return &m_sequence;
- }
-
- void add_content( const std::string& tag, SAXObject* so )
- {
- ContentGroup::ContentItem ci = {tag, so };
- m_sequence.add_content( ci );
- }
+ const ContentSequence* get_content() const
+ {
+ return &m_sequence;
+ }
+
+ void add_content(const std::string& tag, SAXObject* so)
+ {
+ ContentGroup::ContentItem ci = { tag, so };
+ m_sequence.add_content(ci);
+ }
private:
- std::string m_name; - std::string m_length;
+ std::string m_name; + std::string m_length;
- ContentSequence m_sequence;
+ ContentSequence m_sequence;
}; #endif
diff -u -r1.4 -r1.5 --- IdVec.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ IdVec.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/IdVec.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/IdVec.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_IDVEC_HH #define LCDD_IDVEC_HH
@@ -9,52 +9,51 @@
#include <vector> /**
- @class IdVec - @brief A vector of ints representing an unpacked geometric identifier. - @note Inspired by ATLAS's ExpandedIdentifier:
+ @class IdVec + @brief A vector of ints representing an unpacked geometric identifier. + @note Inspired by ATLAS's ExpandedIdentifier:
- dist/current/DetectorDescription/Identifier/Identifier-00-06-10/Identifier/ExpandedIdentifier.h -*/
+ dist/current/DetectorDescription/Identifier/Identifier-00-06-10/Identifier/ExpandedIdentifier.h + */
class IdVec
{
public:
- typedef int ElementType; - typedef std::vector<ElementType> ElementVector; - typedef std::vector<ElementType>::size_type SizeType;
+ typedef int ElementType; + typedef std::vector<ElementType> ElementVector; + typedef std::vector<ElementType>::size_type SizeType;
public:
- IdVec(); - ~IdVec();
+ IdVec(); + ~IdVec();
- // clear fields - void clear();
+ // clear fields + void clear();
- // vec push_back - void push_back(ElementType et);
+ // vec push_back + void push_back(ElementType et);
- // get / set value by field
- ElementType getFieldValue(SizeType idx) const;
- void setFieldValue(SizeType idx,
- ElementType et);
-
- // get element at idx using [] operator
- ElementType operator [] (SizeType idx) const;
-
- // iterators
- ElementVector::const_iterator getFieldsBegin() const;
- ElementVector::const_iterator getFieldsEnd() const;
-
- // size
- SizeType size() const
- {
- return m_fields.size();
- }
+ // get / set value by field
+ ElementType getFieldValue(SizeType idx) const;
+ void setFieldValue(SizeType idx, ElementType et);
+
+ // get element at idx using [] operator
+ ElementType operator [](SizeType idx) const;
+
+ // iterators
+ ElementVector::const_iterator getFieldsBegin() const;
+ ElementVector::const_iterator getFieldsEnd() const;
+
+ // size
+ SizeType size() const
+ {
+ return m_fields.size();
+ }
private:
- ElementVector m_fields;
+ ElementVector m_fields;
}; #endif
diff -u -r1.5 -r1.6 --- LCDDDetectorConstruction.hh 16 Feb 2007 02:04:47 -0000 1.5 +++ LCDDDetectorConstruction.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/LCDDDetectorConstruction.hh,v 1.5 2007/02/16 02:04:47 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/LCDDDetectorConstruction.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDDDetectorConstruction_h #define LCDDDetectorConstruction_h 1
@@ -12,34 +12,34 @@
class LCDDObjectStoreInspector; /**
- @class LCDDDetectorConstruction - @brief Implementation of G4VUserDetectorConstruction for LCDD. - @note Minimal functionality; mostly just hands control to other classes. -*/ -class LCDDDetectorConstruction : public G4VUserDetectorConstruction
+ @class LCDDDetectorConstruction + @brief Implementation of G4VUserDetectorConstruction for LCDD. + @note Minimal functionality; mostly just hands control to other classes. + */ +class LCDDDetectorConstruction: public G4VUserDetectorConstruction
{
public:
- LCDDDetectorConstruction(); - ~LCDDDetectorConstruction();
+ LCDDDetectorConstruction(); + ~LCDDDetectorConstruction();
public:
- virtual G4VPhysicalVolume* Construct();
+ virtual G4VPhysicalVolume* Construct();
- void setWorldVolume(G4VPhysicalVolume *pv); - G4VPhysicalVolume* getWorldVolume();
+ void setWorldVolume(G4VPhysicalVolume *pv); + G4VPhysicalVolume* getWorldVolume();
private:
- G4UImessenger* m_messenger; - G4UImessenger* m_writerMessenger; - G4VPhysicalVolume* m_world; - LCDDObjectStoreInspector* m_inspector; - - std::string m_URI; - std::string m_setupName; - std::string m_version;
+ G4UImessenger* m_messenger; + G4UImessenger* m_writerMessenger; + G4VPhysicalVolume* m_world; + LCDDObjectStoreInspector* m_inspector; + + std::string m_URI; + std::string m_setupName; + std::string m_version;
}; #endif
diff -u -r1.3 -r1.4 --- LCDDFieldManager.hh 18 Dec 2006 22:49:02 -0000 1.3 +++ LCDDFieldManager.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -11,32 +11,32 @@
public:
- virtual ~LCDDFieldManager();
+ virtual ~LCDDFieldManager();
- static LCDDFieldManager* instance();
+ static LCDDFieldManager* instance();
- MagneticFieldOverlay* makeOverlay(std::vector<G4MagneticField*> fields);
+ MagneticFieldOverlay* makeOverlay(std::vector<G4MagneticField*> fields);
- void setup();
+ void setup();
- G4MagneticField* setup(std::vector<G4MagneticField*> fields);
+ G4MagneticField* setup(std::vector<G4MagneticField*> fields);
- void initialize(G4MagneticField* field);
+ void initialize(G4MagneticField* field);
- void addGlobalField(G4MagneticField* f);
+ void addGlobalField(G4MagneticField* f);
- void addField(G4MagneticField* f);
+ void addField(G4MagneticField* f);
private:
- LCDDFieldManager();
+ LCDDFieldManager();
private:
- std::vector<G4MagneticField*> m_globalfields; - std::vector<G4MagneticField*> m_allfields;
+ std::vector<G4MagneticField*> m_globalfields; + std::vector<G4MagneticField*> m_allfields;
- static LCDDFieldManager* m_instance;
+ static LCDDFieldManager* m_instance;
}; #endif
diff -u -r1.5 -r1.6 --- LCDDHeaderRecord.hh 18 Dec 2006 22:49:02 -0000 1.5 +++ LCDDHeaderRecord.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,155 +1,155 @@
-// $Header: /cvs/lcd/lcdd/include/LCDDHeaderRecord.hh,v 1.5 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/LCDDHeaderRecord.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_LCDDHEADERRECORD_HH #define LCDD_LCDDHEADERRECORD_HH 1 /**
- @class LCDDHeaderRecord - @brief Header record of detector info. -*/
+ @class LCDDHeaderRecord + @brief Header record of detector info. + */
class LCDDHeaderRecord
{
public:
- void setDetectorName(const std::string& dn)
- {
- m_detectorName = dn;
- }
-
- void setDetectorVersion(const std::string& dv)
- {
- m_detectorVersion = dv;
- }
-
- void setDetectorUrl(const std::string& u)
- {
- m_detectorUrl = u;
- }
-
- void setAuthorName(const std::string& an)
- {
- m_authorName = an;
- }
-
- void setGeneratorName(const std::string& gn)
- {
- m_generatorName = gn;
- }
-
- void setGeneratorVersion(const std::string& gv)
- {
- m_generatorVersion = gv;
- }
-
- void setGeneratorChecksum(const std::string& c)
- {
- m_generatorChecksum = c;
- }
-
- void setGeneratorFile(const std::string& gurl)
- {
- m_generatorFile = gurl;
- }
-
- void setAuthorEmail(const std::string& ae)
- {
- m_authorEmail = ae;
- }
-
- void setComment(const std::string& c)
- {
- m_comment = c;
- }
-
- void setChecksum(const std::string& c)
- {
- m_generatorChecksum = c;
- }
-
- const std::string& getDetectorName() const
- {
- return m_detectorName;
- }
-
- const std::string& getDetectorVersion() const
- {
- return m_detectorVersion;
- }
-
- const std::string& getDetectorUrl() const
- {
- return m_detectorUrl;
- }
-
- const std::string& getComment() const
- {
- return m_comment;
- }
-
- const std::string& getAuthorName() const
- {
- return m_authorName;
- }
-
- const std::string& getAuthorEmail() const
- {
- return m_authorEmail;
- }
-
- const std::string& getGeneratorName() const
- {
- return m_generatorName;
- }
-
- const std::string& getGeneratorVersion() const
- {
- return m_generatorVersion;
- }
-
- const std::string& getGeneratorFile() const
- {
- return m_generatorFile;
- }
-
- const std::string& getGeneratorChecksum() const
- {
- return m_generatorChecksum;
- }
-
- void printOut(std::ostream &os)
- {
- os << std::endl << "***** LCDD Header *****" << std::endl;
-
- os << "detectorName <" << m_detectorName << ">" << std::endl;
- os << "detectorVersion <" << m_detectorVersion << ">" << std::endl;
- os << "detectorUrl <" << m_detectorUrl << ">" << std::endl;
- os << "authorName <" << m_authorName << ">" << std::endl;
- os << "authorEmail <" << m_authorEmail << ">" << std::endl;
- os << "generatorName <" << m_generatorName << ">" << std::endl;
- os << "generatorVersion <" << m_generatorVersion << ">" << std::endl;
- os << "generatorFile <" << m_generatorFile << ">" << std::endl;
- os << "generatorChecksum <" << m_generatorChecksum << ">" << std::endl;
- os << "comment" << std::endl << m_comment << std::endl << "end comment" << std::endl;
+ void setDetectorName(const std::string& dn)
+ {
+ m_detectorName = dn;
+ }
+
+ void setDetectorVersion(const std::string& dv)
+ {
+ m_detectorVersion = dv;
+ }
+
+ void setDetectorUrl(const std::string& u)
+ {
+ m_detectorUrl = u;
+ }
+
+ void setAuthorName(const std::string& an)
+ {
+ m_authorName = an;
+ }
+
+ void setGeneratorName(const std::string& gn)
+ {
+ m_generatorName = gn;
+ }
+
+ void setGeneratorVersion(const std::string& gv)
+ {
+ m_generatorVersion = gv;
+ }
+
+ void setGeneratorChecksum(const std::string& c)
+ {
+ m_generatorChecksum = c;
+ }
+
+ void setGeneratorFile(const std::string& gurl)
+ {
+ m_generatorFile = gurl;
+ }
+
+ void setAuthorEmail(const std::string& ae)
+ {
+ m_authorEmail = ae;
+ }
+
+ void setComment(const std::string& c)
+ {
+ m_comment = c;
+ }
+
+ void setChecksum(const std::string& c)
+ {
+ m_generatorChecksum = c;
+ }
+
+ const std::string& getDetectorName() const
+ {
+ return m_detectorName;
+ }
+
+ const std::string& getDetectorVersion() const
+ {
+ return m_detectorVersion;
+ }
+
+ const std::string& getDetectorUrl() const
+ {
+ return m_detectorUrl;
+ }
+
+ const std::string& getComment() const
+ {
+ return m_comment;
+ }
+
+ const std::string& getAuthorName() const
+ {
+ return m_authorName;
+ }
+
+ const std::string& getAuthorEmail() const
+ {
+ return m_authorEmail;
+ }
+
+ const std::string& getGeneratorName() const
+ {
+ return m_generatorName;
+ }
+
+ const std::string& getGeneratorVersion() const
+ {
+ return m_generatorVersion;
+ }
+
+ const std::string& getGeneratorFile() const
+ {
+ return m_generatorFile;
+ }
+
+ const std::string& getGeneratorChecksum() const
+ {
+ return m_generatorChecksum;
+ }
+
+ void printOut(std::ostream &os)
+ {
+ os << std::endl << "***** LCDD Header *****" << std::endl;
+
+ os << "detectorName <" << m_detectorName << ">" << std::endl;
+ os << "detectorVersion <" << m_detectorVersion << ">" << std::endl;
+ os << "detectorUrl <" << m_detectorUrl << ">" << std::endl;
+ os << "authorName <" << m_authorName << ">" << std::endl;
+ os << "authorEmail <" << m_authorEmail << ">" << std::endl;
+ os << "generatorName <" << m_generatorName << ">" << std::endl;
+ os << "generatorVersion <" << m_generatorVersion << ">" << std::endl;
+ os << "generatorFile <" << m_generatorFile << ">" << std::endl;
+ os << "generatorChecksum <" << m_generatorChecksum << ">" << std::endl;
+ os << "comment" << std::endl << m_comment << std::endl << "end comment" << std::endl;
- os << "***********************" << std::endl << std::endl; - }
+ os << "***********************" << std::endl << std::endl; + }
private:
- std::string m_detectorName; - std::string m_detectorVersion; - std::string m_detectorUrl; - - std::string m_generatorName; - std::string m_generatorVersion; - std::string m_generatorFile; - std::string m_generatorChecksum;
+ std::string m_detectorName; + std::string m_detectorVersion; + std::string m_detectorUrl; + + std::string m_generatorName; + std::string m_generatorVersion; + std::string m_generatorFile; + std::string m_generatorChecksum;
- std::string m_authorName; - std::string m_authorEmail;
+ std::string m_authorName; + std::string m_authorEmail;
- std::string m_comment;
+ std::string m_comment;
}; #endif
diff -u -r1.7 -r1.8 --- LCDDMessenger.hh 2 Mar 2011 03:37:07 -0000 1.7 +++ LCDDMessenger.hh 24 Jun 2013 22:10:33 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/LCDDMessenger.hh,v 1.7 2011/03/02 03:37:07 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/LCDDMessenger.hh,v 1.8 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_LCDDMESSENGER_HH #define LCDD_LCDDMESSENGER_HH 1
@@ -11,36 +11,37 @@
class LCDDDetectorConstruction; /**
- @class LCDDMessenger - @brief G4UImessenger for LCDD commands. -*/ -class LCDDMessenger : public G4UImessenger
+ @class LCDDMessenger + @brief G4UImessenger for LCDD commands. + */ +class LCDDMessenger: public G4UImessenger
{
public:
- LCDDMessenger(); - virtual ~LCDDMessenger();
+ LCDDMessenger(); + virtual ~LCDDMessenger();
public:
- virtual void SetNewValue(G4UIcommand *cmd, G4String newVals); - virtual G4String GetCurrentValue(G4UIcommand *cmd);
+ virtual void SetNewValue(G4UIcommand *cmd, G4String newVals); + virtual G4String GetCurrentValue(G4UIcommand *cmd);
private:
- void defineCommands();
+ void defineCommands();
private:
- G4UIdirectory* m_lcddDir; - G4UIcommand* m_setupCmd; - G4UIcommand* m_setURICmd; - G4UIcommand* m_setSetupNameCmd; - G4UIcommand* m_setVersionCmd; - G4UIcommand* m_dumpCmd;
+ G4UIdirectory* m_lcddDir; + G4UIcommand* m_setupCmd; + G4UIcommand* m_setURICmd; + G4UIcommand* m_setSetupNameCmd; + G4UIcommand* m_setVersionCmd; + G4UIcommand* m_dumpCmd;
#ifdef HAVE_G4PVPLACEMENT_CHECKOVERLAPS
- G4UIcommand* m_checkOverlapsCmd; - G4UIcommand* m_checkOverlapsRecurseCmd;
+ G4UIcommand* m_checkOverlapsCmd; + G4UIcommand* m_checkOverlapsRecurseCmd;
#endif
-}; // class
+}; +// class
#endif
diff -u -r1.4 -r1.5 --- LCDDObjectStoreInspector.hh 16 Feb 2007 02:04:47 -0000 1.4 +++ LCDDObjectStoreInspector.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Id: LCDDObjectStoreInspector.hh,v 1.4 2007/02/16 02:04:47 jeremy Exp $
+// $Id: LCDDObjectStoreInspector.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_LCDDOBJECTSTOREINSPECTOR_HH #define LCDD_LCDDOBJECTSTOREINSPECTOR_HH 1
@@ -13,44 +13,44 @@
{
public:
- LCDDObjectStoreInspector()
- {
- m_materialInspector = new G4MaterialStoreInspector("G4Material", G4Material::GetMaterialTable());
- m_solidInspector = new G4SolidStoreInspector("G4VSolid", G4SolidStore::GetInstance());
- m_limitsetInspector = new G4LimitSetInspector("G4LimitSet", LCDDProcessor::instance()->getLimitSetStore());
- m_lvolumeInspector = new G4LogicalVolumeStoreInspector("G4LogicalVolume", G4LogicalVolumeStore::GetInstance());
- m_pvolumeInspector = new G4PhysicalVolumeStoreInspector("G4VPhysicalVolume", G4PhysicalVolumeStore::GetInstance());
- m_idspecInspector = new IdSpecInspector("IdSpec", IdManager::instance()->getIdSpecStore());
- m_sdInspector = new G4SensitiveDetectorInspector("G4SensitiveDetector", LCDDProcessor::instance()->getSensitiveDetectorStore());
- m_regionInspector = new G4RegionStoreInspector("G4Region", G4RegionStore::GetInstance());
- m_fieldInspector = new G4MagneticFieldInspector("G4MagneticField", LCDDProcessor::instance()->getMagneticFieldStore() );
- m_visInspector = new G4VisAttributeInspector("G4VisAttributes", LCDDProcessor::instance()->getVisAttributesStore() );
- }
-
- virtual ~LCDDObjectStoreInspector()
- {
- delete m_materialInspector;
- delete m_solidInspector;
- delete m_limitsetInspector;
- delete m_lvolumeInspector;
- delete m_idspecInspector;
- delete m_sdInspector;
- delete m_regionInspector;
- delete m_fieldInspector;
- delete m_visInspector;
- }
+ LCDDObjectStoreInspector()
+ {
+ m_materialInspector = new G4MaterialStoreInspector("G4Material", G4Material::GetMaterialTable());
+ m_solidInspector = new G4SolidStoreInspector("G4VSolid", G4SolidStore::GetInstance());
+ m_limitsetInspector = new G4LimitSetInspector("G4LimitSet", LCDDProcessor::instance()->getLimitSetStore());
+ m_lvolumeInspector = new G4LogicalVolumeStoreInspector("G4LogicalVolume", G4LogicalVolumeStore::GetInstance());
+ m_pvolumeInspector = new G4PhysicalVolumeStoreInspector("G4VPhysicalVolume", G4PhysicalVolumeStore::GetInstance());
+ m_idspecInspector = new IdSpecInspector("IdSpec", IdManager::instance()->getIdSpecStore());
+ m_sdInspector = new G4SensitiveDetectorInspector("G4SensitiveDetector", LCDDProcessor::instance()->getSensitiveDetectorStore());
+ m_regionInspector = new G4RegionStoreInspector("G4Region", G4RegionStore::GetInstance());
+ m_fieldInspector = new G4MagneticFieldInspector("G4MagneticField", LCDDProcessor::instance()->getMagneticFieldStore());
+ m_visInspector = new G4VisAttributeInspector("G4VisAttributes", LCDDProcessor::instance()->getVisAttributesStore());
+ }
+
+ virtual ~LCDDObjectStoreInspector()
+ {
+ delete m_materialInspector;
+ delete m_solidInspector;
+ delete m_limitsetInspector;
+ delete m_lvolumeInspector;
+ delete m_idspecInspector;
+ delete m_sdInspector;
+ delete m_regionInspector;
+ delete m_fieldInspector;
+ delete m_visInspector;
+ }
private:
- G4MaterialStoreInspector* m_materialInspector; - G4SolidStoreInspector* m_solidInspector; - G4LimitSetInspector* m_limitsetInspector; - G4LogicalVolumeStoreInspector* m_lvolumeInspector; - G4PhysicalVolumeStoreInspector* m_pvolumeInspector; - IdSpecInspector* m_idspecInspector; - G4SensitiveDetectorInspector* m_sdInspector; - G4RegionStoreInspector* m_regionInspector; - G4MagneticFieldInspector* m_fieldInspector; - G4VisAttributeInspector* m_visInspector;
+ G4MaterialStoreInspector* m_materialInspector; + G4SolidStoreInspector* m_solidInspector; + G4LimitSetInspector* m_limitsetInspector; + G4LogicalVolumeStoreInspector* m_lvolumeInspector; + G4PhysicalVolumeStoreInspector* m_pvolumeInspector; + IdSpecInspector* m_idspecInspector; + G4SensitiveDetectorInspector* m_sdInspector; + G4RegionStoreInspector* m_regionInspector; + G4MagneticFieldInspector* m_fieldInspector; + G4VisAttributeInspector* m_visInspector;
}; #endif
diff -u -r1.6 -r1.7 --- LCDDParser.hh 19 Jun 2007 23:55:04 -0000 1.6 +++ LCDDParser.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/LCDDParser.hh,v 1.6 2007/06/19 23:55:04 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/LCDDParser.hh,v 1.7 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDDParser_h #define LCDDParser_h 1
@@ -9,77 +9,76 @@
class G4VPhysicalVolume; /**
- @class LCDDParser - @brief Parser for LCDD format. -*/
+ @class LCDDParser + @brief Parser for LCDD format. + */
class LCDDParser
{
public:
- virtual ~LCDDParser();
+ virtual ~LCDDParser();
- static LCDDParser* instance();
+ static LCDDParser* instance();
protected:
- LCDDParser();
+ LCDDParser();
public:
- // initialize required XML machinery - void initialize(); - void initializeParser(); - - // call in G4 DetectorConstruction - G4VPhysicalVolume* construct(); - - // cleanup - void finalize(); - - // set all parms - void setupParserConfig(const std::string& URI, - const std::string& setupName, - const std::string& version); - - // set from instance vars - void setupParserConfig(); - - // set parms - void setURI(std::string URI); - void setSetupName(std::string setupName); - void setVersion(std::string version); - - // get parms - const std::string& URI(); - const std::string& setupName(); - const std::string& version();
+ // initialize required XML machinery + void initialize(); + void initializeParser();
- // set world volume ptr - void setWorld(G4VPhysicalVolume *world);
+ // call in G4 DetectorConstruction + G4VPhysicalVolume* construct();
- bool isValidSetup();
+ // cleanup + void finalize(); + + // set all parms + void setupParserConfig(const std::string& URI, const std::string& setupName, const std::string& version); + + // set from instance vars + void setupParserConfig(); + + // set parms + void setURI(std::string URI); + void setSetupName(std::string setupName); + void setVersion(std::string version); + + // get parms + const std::string& URI(); + const std::string& setupName(); + const std::string& version(); + + // set world volume ptr + void setWorld(G4VPhysicalVolume *world); + + bool isValidSetup();
private:
- void addVolumeExtendedSubscriber();
+ void addVolumeExtendedSubscriber();
private:
- SAXProcessor m_sxp; - ProcessingConfigurator m_config;
+ SAXProcessor m_sxp; + ProcessingConfigurator m_config;
- std::string m_URI; - std::string m_setupName; - std::string m_version;
+ std::string m_URI; + std::string m_setupName; + std::string m_version;
- bool m_initialized; - bool m_constructed; - bool m_setURI;
+ bool m_initialized; + bool m_constructed; + bool m_setURI;
- G4VPhysicalVolume* m_world;
+ G4VPhysicalVolume* m_world;
- static LCDDParser* m_instance;
+ static LCDDParser* m_instance;
-}; // class
+}; +// class
#endif // header
diff -u -r1.23 -r1.24 --- LCDDProcessor.hh 18 Dec 2006 22:49:02 -0000 1.23 +++ LCDDProcessor.hh 24 Jun 2013 22:10:33 -0000 1.24 @@ -17,101 +17,101 @@
class G4Run; /**
- @class LCDDProcessor - @brief Register and find LCDD elements, except idspecs which have own manager. - @note This is the LCDD equivalent of the GDMLProcessor class. -*/
+ @class LCDDProcessor + @brief Register and find LCDD elements, except idspecs which have own manager. + @note This is the LCDD equivalent of the GDMLProcessor class. + */
class LCDDProcessor
{
public:
- LCDDProcessor(); - virtual ~LCDDProcessor();
+ LCDDProcessor(); + virtual ~LCDDProcessor();
- static LCDDProcessor* instance();
+ static LCDDProcessor* instance();
public:
- typedef std::map<std::string, G4SensitiveDetector*> SensitiveDetectors; - typedef std::map<std::string, G4MagneticField*> MagneticFields; - typedef std::map<std::string, G4Region*> Regions; - typedef std::map<std::string, G4VisAttributes*> VisAttributes; - typedef std::map<std::string, G4LimitSet*> LimitSets;
+ typedef std::map<std::string, G4SensitiveDetector*> SensitiveDetectors; + typedef std::map<std::string, G4MagneticField*> MagneticFields; + typedef std::map<std::string, G4Region*> Regions; + typedef std::map<std::string, G4VisAttributes*> VisAttributes; + typedef std::map<std::string, G4LimitSet*> LimitSets;
public:
- // header - const LCDDHeaderRecord* getHeader() const; - void setHeader(LCDDHeaderRecord* h);
+ // header + const LCDDHeaderRecord* getHeader() const; + void setHeader(LCDDHeaderRecord* h);
- // detector name - std::string getDetectorName() const;
+ // detector name + std::string getDetectorName() const;
- // Sensitive Detectors - void addSensitiveDetector(std::string& name, G4SensitiveDetector* sd);
+ // Sensitive Detectors + void addSensitiveDetector(std::string& name, G4SensitiveDetector* sd);
- G4SensitiveDetector* getSensitiveDetector(const std::string& name); - G4SensitiveDetector* getSensitiveDetector(const char* name);
+ G4SensitiveDetector* getSensitiveDetector(const std::string& name); + G4SensitiveDetector* getSensitiveDetector(const char* name);
- LCDDProcessor::SensitiveDetectors::const_iterator getSensitiveDetectorsBegin(); - LCDDProcessor::SensitiveDetectors::const_iterator getSensitiveDetectorsEnd();
+ LCDDProcessor::SensitiveDetectors::const_iterator getSensitiveDetectorsBegin(); + LCDDProcessor::SensitiveDetectors::const_iterator getSensitiveDetectorsEnd();
- // Mag Field - void addMagneticField(std::string& name, G4MagneticField* mag); - G4MagneticField* getMagneticField(const std::string& name); - G4MagneticField* getMagneticField(const char* name);
+ // Mag Field + void addMagneticField(std::string& name, G4MagneticField* mag); + G4MagneticField* getMagneticField(const std::string& name); + G4MagneticField* getMagneticField(const char* name);
- LCDDProcessor::MagneticFields::const_iterator getMagneticFieldsBegin(); - LCDDProcessor::MagneticFields::const_iterator getMagneticFieldsEnd();
+ LCDDProcessor::MagneticFields::const_iterator getMagneticFieldsBegin(); + LCDDProcessor::MagneticFields::const_iterator getMagneticFieldsEnd();
- // Passes mag through to LCDDFieldManager. - void addGlobalField(G4MagneticField* mag);
+ // Passes mag through to LCDDFieldManager. + void addGlobalField(G4MagneticField* mag);
- // Regions - void addRegion(std::string& name, G4Region* reg);
+ // Regions + void addRegion(std::string& name, G4Region* reg);
- G4Region* getRegion(const std::string& name); - G4Region* getRegion(const char* name);
+ G4Region* getRegion(const std::string& name); + G4Region* getRegion(const char* name);
- LCDDProcessor::Regions::const_iterator getRegionsBegin(); - LCDDProcessor::Regions::const_iterator getRegionsEnd();
+ LCDDProcessor::Regions::const_iterator getRegionsBegin(); + LCDDProcessor::Regions::const_iterator getRegionsEnd();
- // user limit set - void addLimitSet(std::string& name, G4LimitSet* lim); - G4LimitSet* getLimitSet(const std::string& name); - G4LimitSet* getLimitSet(const char* name); - LCDDProcessor::LimitSets::const_iterator getLimitSetsBegin(); - LCDDProcessor::LimitSets::const_iterator getLimitSetsEnd();
+ // user limit set + void addLimitSet(std::string& name, G4LimitSet* lim); + G4LimitSet* getLimitSet(const std::string& name); + G4LimitSet* getLimitSet(const char* name); + LCDDProcessor::LimitSets::const_iterator getLimitSetsBegin(); + LCDDProcessor::LimitSets::const_iterator getLimitSetsEnd();
- // Vis Attributes - void addVisAttributes(std::string& name, G4VisAttributes* vis);
+ // Vis Attributes + void addVisAttributes(std::string& name, G4VisAttributes* vis);
- G4VisAttributes* getVisAttributes(const std::string& name); - G4VisAttributes* getVisAttributes(const char* name);
+ G4VisAttributes* getVisAttributes(const std::string& name); + G4VisAttributes* getVisAttributes(const char* name);
- LCDDProcessor::VisAttributes::const_iterator getVisAttributesBegin(); - LCDDProcessor::VisAttributes::const_iterator getVisAttributesEnd();
+ LCDDProcessor::VisAttributes::const_iterator getVisAttributesBegin(); + LCDDProcessor::VisAttributes::const_iterator getVisAttributesEnd();
- const LCDDProcessor::VisAttributes* getVisAttributesStore() const; - const LCDDProcessor::SensitiveDetectors* getSensitiveDetectorStore() const; - const LCDDProcessor::MagneticFields* getMagneticFieldStore() const; - const LCDDProcessor::Regions* getRegionStore() const; - const LCDDProcessor::LimitSets* getLimitSetStore() const;
+ const LCDDProcessor::VisAttributes* getVisAttributesStore() const; + const LCDDProcessor::SensitiveDetectors* getSensitiveDetectorStore() const; + const LCDDProcessor::MagneticFields* getMagneticFieldStore() const; + const LCDDProcessor::Regions* getRegionStore() const; + const LCDDProcessor::LimitSets* getLimitSetStore() const;
private:
- // header info for the lcdd file - LCDDHeaderRecord* m_header;
+ // header info for the lcdd file + LCDDHeaderRecord* m_header;
- // vectors of SD, mag, regions, visAttributes - LCDDProcessor::SensitiveDetectors m_sensitiveDetectors; - LCDDProcessor::MagneticFields m_magneticFields; - LCDDProcessor::Regions m_regions; - LCDDProcessor::VisAttributes m_visAttributes; - LCDDProcessor::LimitSets m_limitSets;
+ // vectors of SD, mag, regions, visAttributes + LCDDProcessor::SensitiveDetectors m_sensitiveDetectors; + LCDDProcessor::MagneticFields m_magneticFields; + LCDDProcessor::Regions m_regions; + LCDDProcessor::VisAttributes m_visAttributes; + LCDDProcessor::LimitSets m_limitSets;
- // static singleton instance var - static LCDDProcessor* sInstance;
+ // static singleton instance var + static LCDDProcessor* sInstance;
}; #endif
diff -u -r1.4 -r1.5 --- LimitParamType.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ LimitParamType.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/LimitParamType.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/LimitParamType.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_LIMITPARAMTYPE_HH #define LCDD_LIMITPARAMTYPE_HH 1
@@ -12,57 +12,59 @@
class LimitParamType
{
public:
- LimitParamType()
- {}
-
- virtual ~LimitParamType()
- {}
-
- void set_particles(const std::string& p)
- {
- m_particles = p;
- }
-
- const std::string& get_particles() const
- {
- return m_particles;
- }
-
- void set_name(const std::string& n)
- {
- m_name = n;
- }
-
- const std::string& get_name() const
- {
- return m_name;
- }
-
- void set_value(const std::string& v)
- {
- m_value = v;
- }
-
- const std::string& get_value() const
- {
- return m_value;
- }
-
- void set_unit(const std::string& u)
- {
- m_unit = u;
- }
-
- const std::string& get_unit() const
- {
- return m_unit;
- }
+ LimitParamType()
+ {
+ }
+
+ virtual ~LimitParamType()
+ {
+ }
+
+ void set_particles(const std::string& p)
+ {
+ m_particles = p;
+ }
+
+ const std::string& get_particles() const
+ {
+ return m_particles;
+ }
+
+ void set_name(const std::string& n)
+ {
+ m_name = n;
+ }
+
+ const std::string& get_name() const
+ {
+ return m_name;
+ }
+
+ void set_value(const std::string& v)
+ {
+ m_value = v;
+ }
+
+ const std::string& get_value() const
+ {
+ return m_value;
+ }
+
+ void set_unit(const std::string& u)
+ {
+ m_unit = u;
+ }
+
+ const std::string& get_unit() const
+ {
+ return m_unit;
+ }
public:
- std::string m_particles; - std::string m_value; - std::string m_name; - std::string m_unit;
+ std::string m_particles; + std::string m_value; + std::string m_name; + std::string m_unit;
}; #endif
diff -u -r1.4 -r1.5 --- LimitSetType.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ LimitSetType.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/LimitSetType.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/LimitSetType.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_LIMITSETTYPE_HH #define LCDD_LIMITSETTYPE_HH 1
@@ -17,54 +17,58 @@
{
public:
- class limitsetref : public SAXObject, public ReferenceType
- {
- public:
- limitsetref()
- {}
+ class limitsetref: public SAXObject, public ReferenceType
+ {
+ public:
+ limitsetref()
+ {
+ }
+
+ virtual ~limitsetref()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
+ };
- virtual ~limitsetref()
- {}
+public:
- virtual SAXObject::Type type()
+ LimitSetType()
{
- return SAXObject::element;
}
- };
-public:
+ virtual ~LimitSetType()
+ {
+ }
+
+ void set_name(const std::string& n)
+ {
+ m_name = n;
+ }
- LimitSetType()
- {}
+ const std::string& get_name() const
+ {
+ return m_name;
+ }
- virtual ~LimitSetType()
- {}
+ void add_content(const std::string& tag, SAXObject* so)
+ {
+ ContentGroup::ContentItem ci = { tag, so };
+ m_sequence.add_content(ci);
+ }
- void set_name(const std::string& n)
- {
- m_name = n;
- }
-
- const std::string& get_name() const
- {
- return m_name;
- }
-
- void add_content( const std::string& tag, SAXObject* so )
- {
- ContentGroup::ContentItem ci = {tag, so };
- m_sequence.add_content( ci );
- }
-
- const ContentSequence* get_content() const
- {
- return &m_sequence;
- }
+ const ContentSequence* get_content() const
+ {
+ return &m_sequence;
+ }
private:
- ContentSequence m_sequence; - std::string m_name;
+ ContentSequence m_sequence; + std::string m_name;
}; #endif
diff -u -r1.6 -r1.7 --- LimitType.hh 18 Dec 2006 22:49:02 -0000 1.6 +++ LimitType.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/LimitType.hh,v 1.6 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/LimitType.hh,v 1.7 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_LIMITTYPE_HH #define LCDD_LIMITTYPE_HH
@@ -11,139 +11,144 @@
/** * @class LimitType * @brief LimitType from schema.
-*/
+ */
class LimitType
{
public:
- /**
- * @class LimitType::limitref
- * @brief Reference to a limit element.
- */
- class limitref : public SAXObject, public ReferenceType {
- public:
- limitref()
- {}
+ /**
+ * @class LimitType::limitref
+ * @brief Reference to a limit element.
+ */
+ class limitref: public SAXObject, public ReferenceType
+ {
+ public:
+ limitref()
+ {
+ }
+
+ virtual ~limitref()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
+ };
- virtual ~limitref()
- {}
+public:
+ LimitType()
+ {
+ }
- virtual SAXObject::Type type()
+ virtual ~LimitType()
{
- return SAXObject::element;
}
- };
-public:
- LimitType()
- {}
+ const std::string& get_name() const
+ {
+ return m_name;
+ }
+
+ const std::string& get_step_length_max() const
+ {
+ return m_step_length_max;
+ }
+
+ const std::string& get_track_length_max() const
+ {
+ return m_track_length_max;
+ }
+
+ const std::string& get_time_max() const
+ {
+ return m_time_max;
+ }
+
+ const std::string& get_ekin_min() const
+ {
+ return m_ekin_min;
+ }
+
+ const std::string& get_range_min() const
+ {
+ return m_range_min;
+ }
+
+ const std::string& get_eunit() const
+ {
+ return m_eunit;
+ }
+
+ const std::string& get_lunit() const
+ {
+ return m_lunit;
+ }
- virtual ~LimitType()
- {}
+ const std::string& get_tunit() const
+ {
+ return m_tunit;
+ }
+
+ void set_name(const std::string& s)
+ {
+ m_name = s;
+ }
+
+ void set_step_length_max(const std::string& s)
+ {
+ m_step_length_max = s;
+ }
+
+ void set_track_length_max(const std::string& s)
+ {
+ m_track_length_max = s;
+ }
+
+ void set_time_max(const std::string& s)
+ {
+ m_time_max = s;
+ }
- const std::string& get_name() const
- {
- return m_name;
- }
-
- const std::string& get_step_length_max() const
- {
- return m_step_length_max;
- }
-
- const std::string& get_track_length_max() const
- {
- return m_track_length_max;
- }
-
- const std::string& get_time_max() const
- {
- return m_time_max;
- }
-
- const std::string& get_ekin_min() const
- {
- return m_ekin_min;
- }
-
- const std::string& get_range_min() const
- {
- return m_range_min;
- }
-
- const std::string& get_eunit() const
- {
- return m_eunit;
- }
-
- const std::string& get_lunit() const
- {
- return m_lunit;
- }
-
- const std::string& get_tunit() const
- {
- return m_tunit;
- }
-
- void set_name(const std::string& s)
- {
- m_name = s;
- }
-
- void set_step_length_max(const std::string& s)
- {
- m_step_length_max = s;
- }
-
- void set_track_length_max(const std::string& s)
- {
- m_track_length_max = s;
- }
-
- void set_time_max(const std::string& s)
- {
- m_time_max = s;
- }
-
- void set_ekin_min(const std::string& s)
- {
- m_ekin_min = s;
- }
-
- void set_range_min(const std::string& s)
- {
- m_range_min = s;
- }
-
- void set_eunit(const std::string& s)
- {
- m_eunit = s;
- }
-
- void set_lunit(const std::string& s)
- {
- m_lunit = s;
- }
-
- void set_tunit(const std::string& s)
- {
- m_tunit = s;
- }
+ void set_ekin_min(const std::string& s)
+ {
+ m_ekin_min = s;
+ }
+
+ void set_range_min(const std::string& s)
+ {
+ m_range_min = s;
+ }
+
+ void set_eunit(const std::string& s)
+ {
+ m_eunit = s;
+ }
+
+ void set_lunit(const std::string& s)
+ {
+ m_lunit = s;
+ }
+
+ void set_tunit(const std::string& s)
+ {
+ m_tunit = s;
+ }
private:
- std::string m_name;
+ std::string m_name;
- std::string m_step_length_max; - std::string m_track_length_max; - std::string m_time_max; - std::string m_ekin_min; - std::string m_range_min; - - std::string m_eunit; - std::string m_lunit; - std::string m_tunit;
+ std::string m_step_length_max; + std::string m_track_length_max; + std::string m_time_max; + std::string m_ekin_min; + std::string m_range_min; + + std::string m_eunit; + std::string m_lunit; + std::string m_tunit;
}; #endif
diff -u -r1.3 -r1.4 --- MagneticFieldOverlay.hh 18 Dec 2006 22:49:02 -0000 1.3 +++ MagneticFieldOverlay.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/MagneticFieldOverlay.hh,v 1.3 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/MagneticFieldOverlay.hh,v 1.4 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_MAGNETICFIELDOVERLAY_HH #define LCDD_MAGNETICFIELDOVERLAY_HH 1
@@ -10,23 +10,23 @@
* @class MagneticFieldOverlay * @brief Overlay multiple G4MagneticField objects by calling all their GetFieldValue functions. */
-class MagneticFieldOverlay : public G4MagneticField
+class MagneticFieldOverlay: public G4MagneticField
{
public:
- MagneticFieldOverlay(); - virtual ~MagneticFieldOverlay();
+ MagneticFieldOverlay(); + virtual ~MagneticFieldOverlay();
public:
- /** Add a G4MagneticField to the fields vector. */ - void addMagneticField(G4MagneticField* field);
+ /** Add a G4MagneticField to the fields vector. */ + void addMagneticField(G4MagneticField* field);
- /** Call GetFieldValue of each field in fields. */ - void GetFieldValue( const double Point[3], double *Bfield ) const;
+ /** Call GetFieldValue of each field in fields. */ + void GetFieldValue(const double Point[3], double *Bfield) const;
private:
- std::vector<G4MagneticField*> m_fields;
+ std::vector<G4MagneticField*> m_fields;
}; #endif
diff -u -r1.6 -r1.7 --- McpHitContrib.hh 23 Aug 2011 22:40:51 -0000 1.6 +++ McpHitContrib.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/McpHitContrib.hh,v 1.6 2011/08/23 22:40:51 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/McpHitContrib.hh,v 1.7 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_MCPHITCONTRIB_HH #define LCDD_MCPHITCONTRIB_HH 1
@@ -22,69 +22,68 @@
*/
class McpHitContrib
{
- public: - friend class G4CalorimeterHit;
+public: + friend class G4CalorimeterHit;
- public:
+public:
- // no parameters - McpHitContrib();
+ // no parameters + McpHitContrib();
- // all parameters - McpHitContrib(G4int trackID, G4double edep, G4int PDGID, G4double globalTime);
+ // all parameters + McpHitContrib(G4int trackID, G4double edep, G4int PDGID, G4double globalTime);
- // parameters from step - McpHitContrib(const G4Step* aStep);
+ // parameters from step + McpHitContrib(const G4Step* aStep);
- virtual ~McpHitContrib();
+ virtual ~McpHitContrib();
- inline G4int getTrackID() const
- {
- return m_trackID;
- }
+ inline G4int getTrackID() const
+ {
+ return m_trackID;
+ }
- inline G4double getEdep() const
- {
- return m_edep;
- }
+ inline G4double getEdep() const
+ {
+ return m_edep;
+ }
- inline void incrEdep(G4double incr)
- {
- m_edep += incr;
- }
+ inline void incrEdep(G4double incr)
+ {
+ m_edep += incr;
+ }
- inline G4int getPDGID() const
- {
- return m_PdgId;
- }
+ inline G4int getPDGID() const
+ {
+ return m_PdgId;
+ }
- inline G4double getGlobalTime() const
- {
- return m_globalTime;
- }
+ inline G4double getGlobalTime() const
+ {
+ return m_globalTime;
+ }
- inline void setMinTime(G4double new_time)
- {
- if (new_time < m_globalTime)
- {
- m_globalTime = new_time;
- }
+ inline void setMinTime(G4double new_time)
+ {
+ if (new_time < m_globalTime) {
+ m_globalTime = new_time;
}
+ }
- inline const float* getPosition() const
- {
- return m_position;
- }
+ inline const float* getPosition() const
+ {
+ return m_position;
+ }
- void printOut(std::ostream&);
+ void printOut(std::ostream&);
- private:
+private:
- G4int m_trackID; - G4double m_edep; - G4int m_PdgId; - G4double m_globalTime; - float m_position[3];
+ G4int m_trackID; + G4double m_edep; + G4int m_PdgId; + G4double m_globalTime; + float m_position[3];
}; typedef std::vector<McpHitContrib> McpHitContribList;
diff -u -r1.1 -r1.2 --- NistElementsDump.hh 2 Mar 2011 03:37:07 -0000 1.1 +++ NistElementsDump.hh 24 Jun 2013 22:10:33 -0000 1.2 @@ -1,4 +1,4 @@
-// $Id: NistElementsDump.hh,v 1.1 2011/03/02 03:37:07 jeremy Exp $
+// $Id: NistElementsDump.hh,v 1.2 2013/06/24 22:10:33 jeremy Exp $
#ifndef MATERIALPROPERTYDUMP_HH #define MATERIALPROPERTYDUMP_HH 1
@@ -7,17 +7,20 @@
class NistElementsDump
{
- private: - static std::string abbrevs[]; - static std::string names[]; - static int nelements;
+private: + static std::string abbrevs[]; + static std::string names[]; + static int nelements;
- private:
- NistElementsDump() {;}
+private:
+ NistElementsDump()
+ {
+ ;
+ }
- public: - static void writeXml(const std::string& filename); - static void printXml(std::ostream& out);
+public: + static void writeXml(const std::string& filename); + static void printXml(std::ostream& out);
}; #endif
diff -u -r1.4 -r1.5 --- NonprojectiveCylinderSegmentationType.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ NonprojectiveCylinderSegmentationType.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/NonprojectiveCylinderSegmentationType.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/NonprojectiveCylinderSegmentationType.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_NONPROJECTIVECYLINDERSEGMENTATIONTYPE_HH #define LCDD_NONPROJECTIVECYLINDERSEGMENTATIONTYPE_HH 1
@@ -8,56 +8,58 @@
#include <string> /**
- @class NonprojectiveCylinderSegmentationType - @brief NonprojectiveCylinderSegmentationType from schema.
+ @class NonprojectiveCylinderSegmentationType + @brief NonprojectiveCylinderSegmentationType from schema.
*/
-class NonprojectiveCylinderSegmentationType : public SegmentationType
+class NonprojectiveCylinderSegmentationType: public SegmentationType
{
public:
-
- NonprojectiveCylinderSegmentationType()
- {}
- virtual ~NonprojectiveCylinderSegmentationType()
- {}
+ NonprojectiveCylinderSegmentationType()
+ {
+ }
+
+ virtual ~NonprojectiveCylinderSegmentationType()
+ {
+ }
public:
- void set_gridSizeZ(const std::string& gsz)
- {
- m_gridSizeZ = gsz;
- }
-
- void set_gridSizePhi(const std::string& gsp)
- {
- m_gridSizePhi = gsp;
- }
-
- void set_lunit( const std::string& lunit)
- {
- m_lunit = lunit;
- }
-
- const std::string& get_gridSizeZ()
- {
- return m_gridSizeZ;
- }
-
- const std::string& get_gridSizePhi()
- {
- return m_gridSizePhi;
- }
-
- const std::string& get_lunit()
- {
- return m_lunit;
- }
+ void set_gridSizeZ(const std::string& gsz)
+ {
+ m_gridSizeZ = gsz;
+ }
+
+ void set_gridSizePhi(const std::string& gsp)
+ {
+ m_gridSizePhi = gsp;
+ }
+
+ void set_lunit(const std::string& lunit)
+ {
+ m_lunit = lunit;
+ }
+
+ const std::string& get_gridSizeZ()
+ {
+ return m_gridSizeZ;
+ }
+
+ const std::string& get_gridSizePhi()
+ {
+ return m_gridSizePhi;
+ }
+
+ const std::string& get_lunit()
+ {
+ return m_lunit;
+ }
protected:
- std::string m_gridSizeZ; - std::string m_gridSizePhi; - std::string m_lunit;
+ std::string m_gridSizeZ; + std::string m_gridSizePhi; + std::string m_lunit;
}; #endif
diff -u -r1.5 -r1.6 --- NonprojectiveSegmentationType.hh 18 Dec 2006 22:49:02 -0000 1.5 +++ NonprojectiveSegmentationType.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/NonprojectiveSegmentationType.hh,v 1.5 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/NonprojectiveSegmentationType.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_NONPROJECTIVESEGMENTATIONTYPE_HH #define LCDD_NONPROJECTIVESEGMENTATIONTYPE_HH 1
@@ -8,67 +8,69 @@
#include <string> /**
- @class NonprojectiveSegmentationType - @brief NonprojectiveSegmentationType from schema.
+ @class NonprojectiveSegmentationType + @brief NonprojectiveSegmentationType from schema.
*/
-class NonprojectiveSegmentationType : public SegmentationType
+class NonprojectiveSegmentationType: public SegmentationType
{
public:
- NonprojectiveSegmentationType()
- {}
-
- virtual ~NonprojectiveSegmentationType()
- {}
+ NonprojectiveSegmentationType()
+ {
+ }
+
+ virtual ~NonprojectiveSegmentationType()
+ {
+ }
public:
- void set_gridSizeX(const std::string& gsx)
- {
- m_gridSizeX = gsx;
- }
-
- void set_gridSizeY(const std::string& gsy)
- {
- m_gridSizeY = gsy;
- }
-
- void set_gridSizeZ(const std::string& gsz)
- {
- m_gridSizeZ = gsz;
- }
-
- void set_lunit( const std::string& lunit)
- {
- m_lunit = lunit;
- }
-
- const std::string& get_gridSizeX()
- {
- return m_gridSizeX;
- }
-
- const std::string& get_gridSizeY()
- {
- return m_gridSizeY;
- }
-
- const std::string& get_gridSizeZ()
- {
- return m_gridSizeZ;
- }
-
- const std::string& get_lunit()
- {
- return m_lunit;
- }
+ void set_gridSizeX(const std::string& gsx)
+ {
+ m_gridSizeX = gsx;
+ }
+
+ void set_gridSizeY(const std::string& gsy)
+ {
+ m_gridSizeY = gsy;
+ }
+
+ void set_gridSizeZ(const std::string& gsz)
+ {
+ m_gridSizeZ = gsz;
+ }
+
+ void set_lunit(const std::string& lunit)
+ {
+ m_lunit = lunit;
+ }
+
+ const std::string& get_gridSizeX()
+ {
+ return m_gridSizeX;
+ }
+
+ const std::string& get_gridSizeY()
+ {
+ return m_gridSizeY;
+ }
+
+ const std::string& get_gridSizeZ()
+ {
+ return m_gridSizeZ;
+ }
+
+ const std::string& get_lunit()
+ {
+ return m_lunit;
+ }
protected:
- std::string m_gridSizeX; - std::string m_gridSizeY; - std::string m_gridSizeZ; - std::string m_lunit;
+ std::string m_gridSizeX; + std::string m_gridSizeY; + std::string m_gridSizeZ; + std::string m_lunit;
}; #endif
diff -u -r1.1 -r1.2 --- OpticalCalorimeterType.hh 5 Jul 2007 22:27:35 -0000 1.1 +++ OpticalCalorimeterType.hh 24 Jun 2013 22:10:33 -0000 1.2 @@ -10,17 +10,19 @@
/** * @class CalorimeterType * @brief CalorimeterType from schema.
-*/ -class OpticalCalorimeterType : public CalorimeterType
+ */ +class OpticalCalorimeterType: public CalorimeterType
{
public:
- OpticalCalorimeterType()
- {}
+ OpticalCalorimeterType()
+ {
+ }
- virtual ~OpticalCalorimeterType()
- {}
+ virtual ~OpticalCalorimeterType()
+ {
+ }
}; #endif
diff -u -r1.5 -r1.6 --- PhysVolId.hh 18 Dec 2006 22:49:02 -0000 1.5 +++ PhysVolId.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/PhysVolId.hh,v 1.5 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/PhysVolId.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_PHYSVOLID_HH #define LCDD_PHYSVOLID_HH 1
@@ -6,63 +6,64 @@
#include <vector> /**
- @class PhysVolId - @brief Simulator class for physical volume IDs. -*/
+ @class PhysVolId + @brief Simulator class for physical volume IDs. + */
class PhysVolId
{
public:
- typedef int ValueType; - typedef std::vector<PhysVolId> PhysVolIds;
+ typedef int ValueType; + typedef std::vector<PhysVolId> PhysVolIds;
public:
- PhysVolId()
- {}
-
- PhysVolId(ValueType val,
- std::string fld)
- : m_value(val),
- m_fieldName(fld)
- {}
-
- virtual ~PhysVolId()
- {}
-
- ValueType getValue() const
- {
- return m_value;
- }
-
- const std::string& getFieldName() const
- {
- return m_fieldName;
- }
-
- void setFieldName(const std::string& fn)
- {
- m_fieldName = fn;
- }
-
- void setValue(ValueType vt)
- {
- m_value = vt;
- }
-
- bool operator==(const PhysVolId& right)
- {
- return ( m_value == right.m_value );
- }
-
- bool operator==(ValueType vt)
- {
- return ( m_value == vt );
- }
+ PhysVolId()
+ {
+ }
+
+ PhysVolId(ValueType val, std::string fld) :
+ m_value(val), m_fieldName(fld)
+ {
+ }
+
+ virtual ~PhysVolId()
+ {
+ }
+
+ ValueType getValue() const
+ {
+ return m_value;
+ }
+
+ const std::string& getFieldName() const
+ {
+ return m_fieldName;
+ }
+
+ void setFieldName(const std::string& fn)
+ {
+ m_fieldName = fn;
+ }
+
+ void setValue(ValueType vt)
+ {
+ m_value = vt;
+ }
+
+ bool operator==(const PhysVolId& right)
+ {
+ return (m_value == right.m_value);
+ }
+
+ bool operator==(ValueType vt)
+ {
+ return (m_value == vt);
+ }
private:
- - ValueType m_value; - std::string m_fieldName;
+ + ValueType m_value; + std::string m_fieldName;
}; #endif
diff -u -r1.4 -r1.5 --- PhysVolIdMap.hh 16 Feb 2007 02:04:47 -0000 1.4 +++ PhysVolIdMap.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/PhysVolIdMap.hh,v 1.4 2007/02/16 02:04:47 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/PhysVolIdMap.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_PHYSVOLTOIDMAP_HH #define LCDD_PHYSVOLTOIDMAP_HH 1
@@ -14,59 +14,59 @@
/**
- @class PhysVolIdMap
+ @class PhysVolIdMap
- @brief Maps G4 physical volume ptrs to a vector of associated - ints for IDing.
+ @brief Maps G4 physical volume ptrs to a vector of associated + ints for IDing.
-*/
+ */
typedef std::map<G4VPhysicalVolume*, PhysVolId::PhysVolIds> PhysVolIdMapType;
-class PhysVolIdMap : private PhysVolIdMapType
+class PhysVolIdMap: private PhysVolIdMapType
{
public:
- void addPhysVolId(G4VPhysicalVolume* pv, PhysVolId id)
- {
- if ( !hasPhysVolIds( pv ) ) {
- createPhysVolIds(pv);
+ void addPhysVolId(G4VPhysicalVolume* pv, PhysVolId id)
+ {
+ if (!hasPhysVolIds(pv)) {
+ createPhysVolIds(pv);
+ }
+
+ PhysVolId::PhysVolIds& idvec = getPhysVolIds(pv);
+ idvec.push_back(id);
+ }
+
+ void createPhysVolIds(G4VPhysicalVolume* pv)
+ {
+ PhysVolId::PhysVolIds pvid;
+ (*this)[pv] = pvid;
}
-
- PhysVolId::PhysVolIds& idvec = getPhysVolIds(pv);
- idvec.push_back(id);
- }
-
- void createPhysVolIds(G4VPhysicalVolume* pv)
- {
- PhysVolId::PhysVolIds pvid;
- (*this)[pv] = pvid;
- }
- /*
+ /*
Has vec has been pushed? Does not check whether it is empty,
which caller should check.
- */
- bool hasPhysVolIds(G4VPhysicalVolume* pv) const
- {
- return ( this->find(pv) != this->end() );
- }
-
- /*
- The returned ref is not const, because caller can add elements.
- Function is not const, because might need to create it on the fly.
- */
- PhysVolId::PhysVolIds& getPhysVolIds(G4VPhysicalVolume* pv)
- {
- // create an empty one if not exists
- if ( !hasPhysVolIds( pv ) ) {
- createPhysVolIds(pv);
+ */
+ bool hasPhysVolIds(G4VPhysicalVolume* pv) const
+ {
+ return (this->find(pv) != this->end());
}
- // return ptr to vec - return (*this)[pv]; - }
+ /*
+ The returned ref is not const, because caller can add elements.
+ Function is not const, because might need to create it on the fly.
+ */
+ PhysVolId::PhysVolIds& getPhysVolIds(G4VPhysicalVolume* pv)
+ {
+ // create an empty one if not exists
+ if (!hasPhysVolIds(pv)) {
+ createPhysVolIds(pv);
+ }
+
+ // return ptr to vec
+ return (*this)[pv];
+ }
}; #endif
diff -u -r1.5 -r1.6 --- PhysVolIdType.hh 18 Dec 2006 22:49:02 -0000 1.5 +++ PhysVolIdType.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/PhysVolIdType.hh,v 1.5 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/PhysVolIdType.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_PHYSVOLIDTYPE_HH #define LCDD_PHYSVOLIDTYPE_HH
@@ -6,43 +6,44 @@
#include <string> /**
- @class PhysVolIdType - @brief PhysVolIdType from schema.
+ @class PhysVolIdType + @brief PhysVolIdType from schema.
*/
class PhysVolIdType
{
public:
- PhysVolIdType()
- {}
-
- virtual ~PhysVolIdType()
- {}
-
-
- void set_value(const std::string& v)
- {
- m_value = v;
- }
-
- void set_field_name(const std::string& f)
- {
- m_field_name = f;
- }
-
- const std::string& get_value()
- {
- return m_value;
- }
-
- const std::string& get_field_name()
- {
- return m_field_name;
- }
+ PhysVolIdType()
+ {
+ }
+
+ virtual ~PhysVolIdType()
+ {
+ }
+
+ void set_value(const std::string& v)
+ {
+ m_value = v;
+ }
+
+ void set_field_name(const std::string& f)
+ {
+ m_field_name = f;
+ }
+
+ const std::string& get_value()
+ {
+ return m_value;
+ }
+
+ const std::string& get_field_name()
+ {
+ return m_field_name;
+ }
private:
- std::string m_value; - std::string m_field_name;
+ std::string m_value; + std::string m_field_name;
}; #endif
diff -u -r1.3 -r1.4 --- PositionComparator.hh 18 Dec 2006 22:49:02 -0000 1.3 +++ PositionComparator.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -1,21 +1,22 @@
-// $Header: /cvs/lcd/lcdd/include/PositionComparator.hh,v 1.3 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/PositionComparator.hh,v 1.4 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_POSITIONCOMPARATOR_HH #define LCDD_POSITIONCOMPARATOR_HH 1 #include "HitComparator.hh"
-class PositionComparator : public HitComparator
+class PositionComparator: public HitComparator
{
public:
- virtual ~PositionComparator()
- {}
+ virtual ~PositionComparator()
+ {
+ }
public:
- virtual bool compare(const G4CalorimeterHit& hit1, const G4CalorimeterHit& hit2)
- {
+ virtual bool compare(const G4CalorimeterHit& hit1, const G4CalorimeterHit& hit2)
+ {
// std::cout << "POS --> hit1 " << hit1.getPos() << " == hit2 " << hit2.getPos() << std::endl;
// if ( hit1.getPos() == hit2.getPos() ) {
// std::cout << "EQUAL" << std::endl;
@@ -24,8 +25,8 @@
// std::cout << "NOT EQUAL" << std::endl; // }
- return ( hit1.getPos() == hit2.getPos() ); - }
+ return (hit1.getPos() == hit2.getPos()); + }
}; #endif
diff -u -r1.4 -r1.5 --- ProjectiveCylinderSegmentationType.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ ProjectiveCylinderSegmentationType.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/ProjectiveCylinderSegmentationType.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/ProjectiveCylinderSegmentationType.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_PROJECTIVECYLINDERSEGMENTATIONTYPE_HH #define LCDD_PROJECTIVECYLINDERSEGMENTATIONTYPE_HH 1
@@ -8,44 +8,46 @@
#include <string> /**
- @class ProjectiveCylinderSegmentationType - @brief ProjectiveCylinderSegmentationType from schema. -*/ -class ProjectiveCylinderSegmentationType : public SegmentationType
+ @class ProjectiveCylinderSegmentationType + @brief ProjectiveCylinderSegmentationType from schema. + */ +class ProjectiveCylinderSegmentationType: public SegmentationType
{
public:
- ProjectiveCylinderSegmentationType()
- {}
-
- virtual ~ProjectiveCylinderSegmentationType()
- {}
+ ProjectiveCylinderSegmentationType()
+ {
+ }
+
+ virtual ~ProjectiveCylinderSegmentationType()
+ {
+ }
public:
- void set_ntheta( const std::string& ntheta )
- {
- m_ntheta = ntheta;
- }
-
- void set_nphi( const std::string& nphi )
- {
- m_nphi = nphi;
- }
-
- const std::string& get_ntheta() const
- {
- return m_ntheta;
- }
-
- const std::string& get_nphi() const
- {
- return m_nphi;
- }
+ void set_ntheta(const std::string& ntheta)
+ {
+ m_ntheta = ntheta;
+ }
+
+ void set_nphi(const std::string& nphi)
+ {
+ m_nphi = nphi;
+ }
+
+ const std::string& get_ntheta() const
+ {
+ return m_ntheta;
+ }
+
+ const std::string& get_nphi() const
+ {
+ return m_nphi;
+ }
protected:
- std::string m_ntheta, m_nphi;
+ std::string m_ntheta, m_nphi;
}; #endif
diff -u -r1.4 -r1.5 --- ProjectiveZPlaneSegmentationType.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ ProjectiveZPlaneSegmentationType.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/ProjectiveZPlaneSegmentationType.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/ProjectiveZPlaneSegmentationType.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_PROJECTIVEZPLANESEGMENTATIONTYPE_HH #define LCDD_PROJECTIVEZPLANESEGMENTATIONTYPE_HH 1
@@ -8,44 +8,46 @@
#include <string> /**
- @class ProjectiveZPlaneSegmentationType - @brief ProjectiveZPlaneSegmentationType from schema. -*/ -class ProjectiveZPlaneSegmentationType : public SegmentationType
+ @class ProjectiveZPlaneSegmentationType + @brief ProjectiveZPlaneSegmentationType from schema. + */ +class ProjectiveZPlaneSegmentationType: public SegmentationType
{
public:
- ProjectiveZPlaneSegmentationType()
- {}
-
- virtual ~ProjectiveZPlaneSegmentationType()
- {}
+ ProjectiveZPlaneSegmentationType()
+ {
+ }
+
+ virtual ~ProjectiveZPlaneSegmentationType()
+ {
+ }
public:
- void set_ntheta( const std::string& ntheta )
- {
- m_ntheta = ntheta;
- }
-
- void set_nphi( const std::string& nphi )
- {
- m_nphi = nphi;
- }
-
- const std::string& get_ntheta() const
- {
- return m_ntheta;
- }
-
- const std::string& get_nphi() const
- {
- return m_nphi;
- }
+ void set_ntheta(const std::string& ntheta)
+ {
+ m_ntheta = ntheta;
+ }
+
+ void set_nphi(const std::string& nphi)
+ {
+ m_nphi = nphi;
+ }
+
+ const std::string& get_ntheta() const
+ {
+ return m_ntheta;
+ }
+
+ const std::string& get_nphi() const
+ {
+ return m_nphi;
+ }
protected:
- std::string m_ntheta, m_nphi;
+ std::string m_ntheta, m_nphi;
}; #endif
diff -u -r1.3 -r1.4 --- RZBData.hh 18 Dec 2006 22:49:02 -0000 1.3 +++ RZBData.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/RZBData.hh,v 1.3 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/RZBData.hh,v 1.4 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_RZBDATA_HH #define LCDD_RZBDATA_HH 1
@@ -11,49 +11,48 @@
{
public:
- /*
- * @param r Radius
- * @param z Z dimension
- * @param Br Radial field strength
- * @param Bz Z dimension field strength
- */
- RZBData(double r, double z, double Br, double Bz)
- : _r(r),
- _z(z),
- _Br(Br),
- _Bz(Bz)
- {}
-
- virtual ~RZBData()
- {}
+ /*
+ * @param r Radius
+ * @param z Z dimension
+ * @param Br Radial field strength
+ * @param Bz Z dimension field strength
+ */
+ RZBData(double r, double z, double Br, double Bz) :
+ _r(r), _z(z), _Br(Br), _Bz(Bz)
+ {
+ }
+
+ virtual ~RZBData()
+ {
+ }
public:
- double r() const
- {
- return _r;
- }
-
- double z() const
- {
- return _z;
- }
-
- double Br() const
- {
- return _Br;
- }
-
- double Bz() const
- {
- return _Bz;
- }
+ double r() const
+ {
+ return _r;
+ }
+
+ double z() const
+ {
+ return _z;
+ }
+
+ double Br() const
+ {
+ return _Br;
+ }
+
+ double Bz() const
+ {
+ return _Bz;
+ }
private:
- double _r; - double _z; - double _Br; - double _Bz;
+ double _r; + double _z; + double _Br; + double _Bz;
}; #endif
diff -u -r1.3 -r1.4 --- RZBType.hh 18 Dec 2006 22:49:02 -0000 1.3 +++ RZBType.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/RZBType.hh,v 1.3 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/RZBType.hh,v 1.4 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_RZBTYPE_HH #define LCDD_RZBTYPE_HH 1
@@ -12,57 +12,59 @@
{
public:
- RZBType()
- {}
-
- virtual ~RZBType()
- {}
-
- void set_r(const std::string& r)
- {
- m_r = r;
- }
-
- void set_z(const std::string& z)
- {
- m_z = z;
- }
-
- void set_Br(const std::string& Br)
- {
- m_Br = Br;
- }
-
- void set_Bz(const std::string& Bz)
- {
- m_Bz = Bz;
- }
-
- const std::string& get_r() const
- {
- return m_r;
- }
-
- const std::string& get_z() const
- {
- return m_z;
- }
-
- const std::string& get_Br() const
- {
- return m_Br;
- }
-
- const std::string& get_Bz() const
- {
- return m_Bz;
- }
+ RZBType()
+ {
+ }
+
+ virtual ~RZBType()
+ {
+ }
+
+ void set_r(const std::string& r)
+ {
+ m_r = r;
+ }
+
+ void set_z(const std::string& z)
+ {
+ m_z = z;
+ }
+
+ void set_Br(const std::string& Br)
+ {
+ m_Br = Br;
+ }
+
+ void set_Bz(const std::string& Bz)
+ {
+ m_Bz = Bz;
+ }
+
+ const std::string& get_r() const
+ {
+ return m_r;
+ }
+
+ const std::string& get_z() const
+ {
+ return m_z;
+ }
+
+ const std::string& get_Br() const
+ {
+ return m_Br;
+ }
+
+ const std::string& get_Bz() const
+ {
+ return m_Bz;
+ }
public:
- std::string m_r; - std::string m_z; - std::string m_Br; - std::string m_Bz;
+ std::string m_r; + std::string m_z; + std::string m_Br; + std::string m_Bz;
}; #endif
diff -u -r1.6 -r1.7 --- RZFieldMapType.hh 18 Dec 2006 22:49:02 -0000 1.6 +++ RZFieldMapType.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/RZFieldMapType.hh,v 1.6 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/RZFieldMapType.hh,v 1.7 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_RZFIELDMAPTYPE_HH #define LCDD_RZFIELDMAPTYPE_HH 1
@@ -7,63 +7,65 @@
/** * @class RZFieldMapType * @brief The RZFieldMapType from the lcdd_fields.lcdd subschema.
-*/ -class RZFieldMapType : public FieldMapType
+ */ +class RZFieldMapType: public FieldMapType
{
public:
- RZFieldMapType()
- {}
-
- virtual ~RZFieldMapType()
- {}
-
- void set_num_bins_r(const std::string& num_bins_r)
- {
- m_num_bins_r = num_bins_r;
- }
-
- const std::string& get_num_bins_r() const
- {
- return m_num_bins_r;
- }
-
- void set_grid_size_r(const std::string& grid_size_r)
- {
- m_grid_size_r = grid_size_r;
- }
-
- const std::string& get_grid_size_r() const
- {
- return m_grid_size_r;
- }
-
- void set_num_bins_z(const std::string& num_bins_z)
- {
- m_num_bins_z = num_bins_z;
- }
-
- const std::string& get_num_bins_z() const
- {
- return m_num_bins_z;
- }
-
- void set_grid_size_z(const std::string& grid_size_z)
- {
- m_grid_size_z = grid_size_z;
- }
-
- const std::string& get_grid_size_z() const
- {
- return m_grid_size_z;
- }
+ RZFieldMapType()
+ {
+ }
+
+ virtual ~RZFieldMapType()
+ {
+ }
+
+ void set_num_bins_r(const std::string& num_bins_r)
+ {
+ m_num_bins_r = num_bins_r;
+ }
+
+ const std::string& get_num_bins_r() const
+ {
+ return m_num_bins_r;
+ }
+
+ void set_grid_size_r(const std::string& grid_size_r)
+ {
+ m_grid_size_r = grid_size_r;
+ }
+
+ const std::string& get_grid_size_r() const
+ {
+ return m_grid_size_r;
+ }
+
+ void set_num_bins_z(const std::string& num_bins_z)
+ {
+ m_num_bins_z = num_bins_z;
+ }
+
+ const std::string& get_num_bins_z() const
+ {
+ return m_num_bins_z;
+ }
+
+ void set_grid_size_z(const std::string& grid_size_z)
+ {
+ m_grid_size_z = grid_size_z;
+ }
+
+ const std::string& get_grid_size_z() const
+ {
+ return m_grid_size_z;
+ }
private:
- std::string m_num_bins_r; - std::string m_grid_size_r; - std::string m_num_bins_z; - std::string m_grid_size_z;
+ std::string m_num_bins_r; + std::string m_grid_size_r; + std::string m_num_bins_z; + std::string m_grid_size_z;
}; #endif
diff -u -r1.19 -r1.20 --- ReadoutUtil.hh 30 May 2013 00:04:12 -0000 1.19 +++ ReadoutUtil.hh 24 Jun 2013 22:10:33 -0000 1.20 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/ReadoutUtil.hh,v 1.19 2013/05/30 00:04:12 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/ReadoutUtil.hh,v 1.20 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_READOUTUTIL_HH #define LCDD_READOUTUTIL_HH 1
@@ -26,55 +26,56 @@
{
public:
- ReadoutUtil()
- {}
-
- virtual ~ReadoutUtil()
- {}
+ ReadoutUtil()
+ {
+ }
+
+ virtual ~ReadoutUtil()
+ {
+ }
public:
- static G4ThreeVector computeThreeVectorMean(const G4ThreeVector& vec1, const G4ThreeVector& vec2);
+ static G4ThreeVector computeThreeVectorMean(const G4ThreeVector& vec1, const G4ThreeVector& vec2);
+
+ static G4ThreeVector computeMidPos(const G4Step* aStep);
+
+ static G4double computeDistance(const G4ThreeVector& vec1, const G4ThreeVector& vec2);
- static G4ThreeVector computeMidPos(const G4Step* aStep);
+ static G4double computeDistance(const G4Step* aStep);
- static G4double computeDistance(const G4ThreeVector& vec1, const G4ThreeVector& vec2);
+ static G4VSolid* getSolidFromStepPoint(const G4StepPoint* aStepPoint);
- static G4double computeDistance(const G4Step* aStep);
+ static G4TouchableHandle getTouchableFromStep(const G4Step* aStep);
- static G4VSolid* getSolidFromStepPoint(const G4StepPoint* aStepPoint);
+ static G4ThreeVector getVolumeGlobalPosition(const G4StepPoint* aStepPoint, const G4ThreeVector& pnt);
- static G4TouchableHandle getTouchableFromStep(const G4Step* aStep);
+ static G4ThreeVector getVolumeGlobalPosition(const G4StepPoint* aStepPoint);
+ static const G4Tubs* getTubs(const G4Step* aStep); + static const G4Tubs* getTubs(const G4StepPoint* aStepPoint);
- static G4ThreeVector getVolumeGlobalPosition(const G4StepPoint* aStepPoint, const G4ThreeVector& pnt );
+ static double computeTubsMidRadius(const G4Tubs* tubs);
- static G4ThreeVector getVolumeGlobalPosition(const G4StepPoint* aStepPoint);
+ static double computeTubsMidRadius(const G4Step* aStep); + static double computeTubsMidRadius(const G4StepPoint* aStepPoint);
- static const G4Tubs* getTubs(const G4Step* aStep); - static const G4Tubs* getTubs(const G4StepPoint* aStepPoint); - - static double computeTubsMidRadius(const G4Tubs* tubs);
+ static double getTubsThickness(const G4Tubs* tubs);
- static double computeTubsMidRadius(const G4Step* aStep); - static double computeTubsMidRadius(const G4StepPoint* aStepPoint); - - static double getTubsThickness(const G4Tubs* tubs);
+ static G4ThreeVector transformLocalToGlobal(const G4Step* aStep, const G4ThreeVector& localPos); + static G4ThreeVector transformLocalToGlobal(const G4StepPoint* aPreStepPoint, const G4ThreeVector& localPos); + static G4ThreeVector transformGlobalToLocal(const G4Step* aStep, const G4ThreeVector& globalPos); + static G4ThreeVector transformGlobalToLocal(const G4StepPoint* aPreStepPoint, const G4ThreeVector& globalPos);
- static G4ThreeVector transformLocalToGlobal(const G4Step* aStep, const G4ThreeVector& localPos); - static G4ThreeVector transformLocalToGlobal(const G4StepPoint* aPreStepPoint, const G4ThreeVector& localPos); - static G4ThreeVector transformGlobalToLocal(const G4Step* aStep, const G4ThreeVector& globalPos); - static G4ThreeVector transformGlobalToLocal(const G4StepPoint* aPreStepPoint, const G4ThreeVector& globalPos); - - static int getVolumeNumber(G4TouchableHandle theTouchable, int historyDepth = -1);
+ static int getVolumeNumber(G4TouchableHandle theTouchable, int historyDepth = -1);
- static std::vector<G4VPhysicalVolume*> getPhysVolList( G4Step* aStep );
+ static std::vector<G4VPhysicalVolume*> getPhysVolList(G4Step* aStep);
- static bool isGeantino(G4Step* aStep);
+ static bool isGeantino(G4Step* aStep);
public:
- static const double PI;
+ static const double PI;
}; #endif
diff -u -r1.10 -r1.11 --- RegionType.hh 30 Apr 2013 23:04:44 -0000 1.10 +++ RegionType.hh 24 Jun 2013 22:10:33 -0000 1.11 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/RegionType.hh,v 1.10 2013/04/30 23:04:44 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/RegionType.hh,v 1.11 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_REGIONTYPE_HH #define LCDD_REGIONTYPE_HH 1
@@ -13,114 +13,137 @@
@class RegionType @brief RegionType from schema. */
-class RegionType {
+class RegionType
+{
public:
- /**
- * @class RegionType::regionref
- * @brief Reference to a region element.
- */
- class regionref: public SAXObject, public ReferenceType {
-
- public:
- regionref() {
- }
-
- virtual ~regionref() {
- }
-
- virtual SAXObject::Type type() {
- return SAXObject::element;
- }
- };
+ /**
+ * @class RegionType::regionref
+ * @brief Reference to a region element.
+ */
+ class regionref: public SAXObject, public ReferenceType
+ {
+
+ public:
+ regionref()
+ {
+ }
+
+ virtual ~regionref()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
+ };
public:
- RegionType() {
- }
-
- virtual ~RegionType() {
- }
-
- void set_name(const std::string& s) {
- m_name = s;
- }
-
- void set_storeSecondaries(const std::string& s) {
- m_storeSecondaries = s;
- }
-
- void set_killTracks(const std::string& killTracks) {
- m_killTracks = killTracks;
- }
-
- void set_cut(const std::string& s) {
- m_cut = s;
- }
-
- void set_lunit(const std::string& s) {
- m_lunit = s;
- }
-
- void set_threshold(const std::string& s) {
- m_threshold = s;
- }
-
- void set_eunit(const std::string& s) {
- m_eunit = s;
- }
-
- const std::string& get_name() const {
- return m_name;
- }
-
- const std::string& get_storeSecondaries() const {
- return m_storeSecondaries;
- }
-
- const std::string& get_killTracks() const {
- return m_killTracks;
- }
-
- const std::string& get_cut() const {
- return m_cut;
- }
-
- const std::string& get_lunit() const {
- return m_lunit;
- }
-
- const std::string& get_threshold() const {
- return m_threshold;
- }
-
- const std::string& get_eunit() const {
- return m_eunit;
- }
-
- void add_content(const std::string& tag, SAXObject* so) {
- ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content(ci);
- }
-
- const ContentSequence* get_content() const {
- return &m_sequence;
- }
+ RegionType()
+ {
+ }
+
+ virtual ~RegionType()
+ {
+ }
+
+ void set_name(const std::string& s)
+ {
+ m_name = s;
+ }
+
+ void set_storeSecondaries(const std::string& s)
+ {
+ m_storeSecondaries = s;
+ }
+
+ void set_killTracks(const std::string& killTracks)
+ {
+ m_killTracks = killTracks;
+ }
+
+ void set_cut(const std::string& s)
+ {
+ m_cut = s;
+ }
+
+ void set_lunit(const std::string& s)
+ {
+ m_lunit = s;
+ }
+
+ void set_threshold(const std::string& s)
+ {
+ m_threshold = s;
+ }
+
+ void set_eunit(const std::string& s)
+ {
+ m_eunit = s;
+ }
+
+ const std::string& get_name() const
+ {
+ return m_name;
+ }
+
+ const std::string& get_storeSecondaries() const
+ {
+ return m_storeSecondaries;
+ }
+
+ const std::string& get_killTracks() const
+ {
+ return m_killTracks;
+ }
+
+ const std::string& get_cut() const
+ {
+ return m_cut;
+ }
+
+ const std::string& get_lunit() const
+ {
+ return m_lunit;
+ }
+
+ const std::string& get_threshold() const
+ {
+ return m_threshold;
+ }
+
+ const std::string& get_eunit() const
+ {
+ return m_eunit;
+ }
+
+ void add_content(const std::string& tag, SAXObject* so)
+ {
+ ContentGroup::ContentItem ci = { tag, so };
+ m_sequence.add_content(ci);
+ }
+
+ const ContentSequence* get_content() const
+ {
+ return &m_sequence;
+ }
private:
- ContentSequence m_sequence;
+ ContentSequence m_sequence;
- std::string m_name;
+ std::string m_name;
- std::string m_storeSecondaries; - std::string m_killTracks;
+ std::string m_storeSecondaries; + std::string m_killTracks;
- std::string m_cut; - std::string m_lunit;
+ std::string m_cut; + std::string m_lunit;
- std::string m_threshold; - std::string m_eunit;
+ std::string m_threshold; + std::string m_eunit;
}; #endif
diff -u -r1.3 -r1.4 --- ScorerType.hh 18 Dec 2006 22:49:02 -0000 1.3 +++ ScorerType.hh 24 Jun 2013 22:10:33 -0000 1.4 @@ -7,30 +7,32 @@
* @class ScorerType * @brief ScorerType from schema. */
-class ScorerType : public SensitiveDetectorType
+class ScorerType: public SensitiveDetectorType
{
public:
- ScorerType()
- {}
-
- virtual ~ScorerType()
- {}
-
- /*
- void set_kill_tracks(const std::string& k)
+ ScorerType()
{
- m_kill_tracks = k;
}
- const std::string& get_kill_tracks()
+ virtual ~ScorerType()
{
- return m_kill_tracks;
}
- private: - std::string m_kill_tracks; - */
+ /*
+ void set_kill_tracks(const std::string& k)
+ {
+ m_kill_tracks = k;
+ }
+
+ const std::string& get_kill_tracks()
+ {
+ return m_kill_tracks;
+ }
+
+ private:
+ std::string m_kill_tracks;
+ */
};
diff -u -r1.4 -r1.5 --- SegmentationType.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ SegmentationType.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/SegmentationType.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/SegmentationType.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_SEGMENTATIONTYPE_HH #define LCDD_SEGMENTATIONTYPE_HH 1
@@ -6,17 +6,19 @@
#include <string> /**
- @class SegmentationType - @brief SegmentationType from schema.
+ @class SegmentationType + @brief SegmentationType from schema.
*/
class SegmentationType
{
public:
- SegmentationType()
- {}
+ SegmentationType()
+ {
+ }
- virtual ~SegmentationType()
- {}
+ virtual ~SegmentationType()
+ {
+ }
}; #endif
diff -u -r1.8 -r1.9 --- SensitiveDetectorFactory.hh 7 Feb 2007 05:18:02 -0000 1.8 +++ SensitiveDetectorFactory.hh 24 Jun 2013 22:10:33 -0000 1.9 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/SensitiveDetectorFactory.hh,v 1.8 2007/02/07 05:18:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/SensitiveDetectorFactory.hh,v 1.9 2013/06/24 22:10:33 jeremy Exp $
// LCDD #include "LCDDProcessor.hh"
@@ -26,46 +26,50 @@
class G4CalorimeterSD; /**
- @class SensitiveDetectorFactory - @brief Creates SDs based on XML tag data. -*/
+ @class SensitiveDetectorFactory + @brief Creates SDs based on XML tag data. + */
class SensitiveDetectorFactory
{
private:
- // shouldn't be instantiated
- SensitiveDetectorFactory() {}
+ // shouldn't be instantiated
+ SensitiveDetectorFactory()
+ {
+ }
public:
- virtual ~SensitiveDetectorFactory() {}
+ virtual ~SensitiveDetectorFactory()
+ {
+ }
- // all static functions
+ // all static functions
public:
- static G4SensitiveDetector* createSensitiveDetector(const SAXObject* object);
+ static G4SensitiveDetector* createSensitiveDetector(const SAXObject* object);
private:
- static G4CalorimeterSD* createCalorimeterSD(const SAXObject* object);
+ static G4CalorimeterSD* createCalorimeterSD(const SAXObject* object);
- static G4TrackerSD* createTrackerSD(const SAXObject* object);
+ static G4TrackerSD* createTrackerSD(const SAXObject* object);
- static G4ScorerSD* createScorerSD(const SAXObject* object);
+ static G4ScorerSD* createScorerSD(const SAXObject* object);
- /** - * Lookup the IdSpec of a detector SAX object based on the idspecref. - * @throw G4Exception if the idspecref has a bad reference value. - * @return The IdSpec of this detector, or null if one does not exist. - */ - static IdSpec* findIdSpec(const SensitiveDetectorType* sdt);
+ /** + * Lookup the IdSpec of a detector SAX object based on the idspecref. + * @throw G4Exception if the idspecref has a bad reference value. + * @return The IdSpec of this detector, or null if one does not exist. + */ + static IdSpec* findIdSpec(const SensitiveDetectorType* sdt);
- static void setBaseSensitiveDetectorAttributes(G4SensitiveDetector* sd, const SensitiveDetectorType* sdt);
+ static void setBaseSensitiveDetectorAttributes(G4SensitiveDetector* sd, const SensitiveDetectorType* sdt);
- static double computeEcut(const SensitiveDetectorType* sdt);
+ static double computeEcut(const SensitiveDetectorType* sdt);
- static int convertVerbose(const SensitiveDetectorType* sdt);
+ static int convertVerbose(const SensitiveDetectorType* sdt);
- static bool isSegmentationTag(const std::string& s);
+ static bool isSegmentationTag(const std::string& s);
- static bool checkHCName(const std::string& s);
+ static bool checkHCName(const std::string& s);
};
diff -u -r1.2 -r1.3 --- SensitiveDetectorMessenger.hh 18 Dec 2006 22:49:02 -0000 1.2 +++ SensitiveDetectorMessenger.hh 24 Jun 2013 22:10:33 -0000 1.3 @@ -18,37 +18,37 @@
* that provides a macro command interface for each * G4VSensitiveDetector registered by LCDD. */
-class SensitiveDetectorMessenger : public G4UImessenger
+class SensitiveDetectorMessenger: public G4UImessenger
{
public:
- SensitiveDetectorMessenger(G4SensitiveDetector* detector);
+ SensitiveDetectorMessenger(G4SensitiveDetector* detector);
- virtual ~SensitiveDetectorMessenger();
+ virtual ~SensitiveDetectorMessenger();
public:
- virtual void SetNewValue(G4UIcommand* cmd, G4String newVals);
+ virtual void SetNewValue(G4UIcommand* cmd, G4String newVals);
- static void makeDetectorsDir();
+ static void makeDetectorsDir();
+
+ void defineCommands(G4VSensitiveDetector* sd);
- void defineCommands(G4VSensitiveDetector* sd); -
private:
- static G4UIdirectory* m_detectorsDir; - - G4SensitiveDetector* m_detector; - - G4UIdirectory* m_detectorDir; - - G4UIcommand* m_printInfoCmd; - G4UIcommand* m_printHitsCmd; - G4UIcommand* m_printVolumesCmd; - G4UIcommand* m_printTotalEdepCmd; - G4UIcommand* m_printNHitsCmd; - G4UIcmdWithAnInteger* m_verboseCmd; - G4UIcmdWithABool* m_activateCmd; - G4UIcmdWithADoubleAndUnit* m_ecutCmd;
+ static G4UIdirectory* m_detectorsDir; + + G4SensitiveDetector* m_detector; + + G4UIdirectory* m_detectorDir; + + G4UIcommand* m_printInfoCmd; + G4UIcommand* m_printHitsCmd; + G4UIcommand* m_printVolumesCmd; + G4UIcommand* m_printTotalEdepCmd; + G4UIcommand* m_printNHitsCmd; + G4UIcmdWithAnInteger* m_verboseCmd; + G4UIcmdWithABool* m_activateCmd; + G4UIcmdWithADoubleAndUnit* m_ecutCmd;
}; #endif
diff -u -r1.10 -r1.11 --- SensitiveDetectorType.hh 18 Dec 2006 22:49:02 -0000 1.10 +++ SensitiveDetectorType.hh 24 Jun 2013 22:10:33 -0000 1.11 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/SensitiveDetectorType.hh,v 1.10 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/SensitiveDetectorType.hh,v 1.11 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_SENSITIVEDETECTORTYPE_HH #define LCDD_SENSITIVEDETECTORTYPE_HH 1
@@ -13,129 +13,135 @@
/** * @class SensitiveDetectorType * @brief SensitiveDetectorType from schema.
-*/
+ */
class SensitiveDetectorType
{
public:
- /**
- * @class SensitiveDetectorType::sdref
- * @brief Reference to sd element.
- */
- class sdref : public SAXObject, public ReferenceType {
- public:
-
- sdref()
- {}
-
- virtual ~sdref()
- {}
-
- virtual SAXObject::Type type()
+ /** + * @class SensitiveDetectorType::sdref + * @brief Reference to sd element. + */ + class sdref: public SAXObject, public ReferenceType
{
- return SAXObject::element; - } - };
+ public:
+
+ sdref()
+ {
+ }
+
+ virtual ~sdref()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
+ };
public:
- SensitiveDetectorType()
- {}
+ SensitiveDetectorType()
+ {
+ }
+
+ virtual ~SensitiveDetectorType()
+ {
+ }
- virtual ~SensitiveDetectorType()
- {}
+ void set_name(const std::string& n)
+ {
+ m_name = n;
+ }
+
+ void set_hitsCollectionName(const std::string& hcn)
+ {
+ m_hitsCollectionName = hcn;
+ }
+
+ const std::string& get_hitsCollectionName() const
+ {
+ return m_hitsCollectionName;
+ }
+
+ void set_eunit(const std::string& eu)
+ {
+ m_eunit = eu;
+ }
+
+ void set_ecut(const std::string& ec)
+ {
+ m_ecut = ec;
+ }
+
+ void set_verbose(const std::string& v)
+ {
+ m_verbose = v;
+ }
+
+ void set_type(const std::string& t)
+ {
+ m_type = t;
+ }
- void set_name(const std::string& n)
- {
- m_name = n;
- }
-
- void set_hitsCollectionName(const std::string& hcn)
- {
- m_hitsCollectionName = hcn;
- }
-
- const std::string& get_hitsCollectionName() const
- {
- return m_hitsCollectionName;
- }
-
- void set_eunit(const std::string& eu)
- {
- m_eunit = eu;
- }
-
- void set_ecut(const std::string& ec)
- {
- m_ecut = ec;
- }
-
- void set_verbose(const std::string& v)
- {
- m_verbose = v;
- }
-
- void set_type(const std::string& t)
- {
- m_type = t;
- }
-
- void set_endcap_flag(const std::string& e)
- {
- m_endcap_flag = e;
- }
-
- const std::string& get_name() const
- {
- return m_name;
- }
-
- const std::string& get_eunit() const
- {
- return m_eunit;
- }
-
- const std::string& get_ecut() const
- {
- return m_ecut;
- }
-
- const std::string& get_verbose() const
- {
- return m_verbose;
- }
-
- const std::string& get_type() const
- {
- return m_type;
- }
-
- const std::string& get_endcap_flag() const
- {
- return m_endcap_flag;
- }
-
- const ContentSequence* get_content() const {
- return &m_sequence;
- }
-
- // add content
- void add_content( const std::string& tag, SAXObject* so )
- {
- ContentGroup::ContentItem ci = {tag, so };
- m_sequence.add_content( ci );
- }
+ void set_endcap_flag(const std::string& e)
+ {
+ m_endcap_flag = e;
+ }
+
+ const std::string& get_name() const
+ {
+ return m_name;
+ }
+
+ const std::string& get_eunit() const
+ {
+ return m_eunit;
+ }
+
+ const std::string& get_ecut() const
+ {
+ return m_ecut;
+ }
+
+ const std::string& get_verbose() const
+ {
+ return m_verbose;
+ }
+
+ const std::string& get_type() const
+ {
+ return m_type;
+ }
+
+ const std::string& get_endcap_flag() const
+ {
+ return m_endcap_flag;
+ }
+
+ const ContentSequence* get_content() const
+ {
+ return &m_sequence;
+ }
+
+ // add content
+ void add_content(const std::string& tag, SAXObject* so)
+ {
+ ContentGroup::ContentItem ci = { tag, so };
+ m_sequence.add_content(ci);
+ }
private:
- ContentSequence m_sequence;
+ ContentSequence m_sequence;
- std::string m_name; - std::string m_hitsCollectionName; - std::string m_endcap_flag; - std::string m_eunit; - std::string m_ecut; - std::string m_verbose; - std::string m_type;
+ std::string m_name; + std::string m_hitsCollectionName; + std::string m_endcap_flag; + std::string m_eunit; + std::string m_ecut; + std::string m_verbose; + std::string m_type;
}; #endif
diff -u -r1.12 -r1.13 --- SensitiveDetectorTypeProcess.hh 18 Dec 2006 22:49:02 -0000 1.12 +++ SensitiveDetectorTypeProcess.hh 24 Jun 2013 22:10:33 -0000 1.13 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/SensitiveDetectorTypeProcess.hh,v 1.12 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/SensitiveDetectorTypeProcess.hh,v 1.13 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_SENSITIVEDETECTORTYPEPROCESS_HH #define LCDD_SENSITIVEDETECTORTYPEPROCESS_HH 1
@@ -22,64 +22,66 @@
#include <iostream> /**
- @class SensitiveDetectorTypeProcess - @brief SAX process for elements based on abstract SensitiveDetectorType. -*/ -class SensitiveDetectorTypeProcess : public SAXStateProcess
+ @class SensitiveDetectorTypeProcess + @brief SAX process for elements based on abstract SensitiveDetectorType. + */ +class SensitiveDetectorTypeProcess: public SAXStateProcess
{
public:
- SensitiveDetectorTypeProcess( const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~SensitiveDetectorTypeProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
- //std::cout << "SensitiveDetectorTypeProcess::StartElement: " << name << std::endl;
-
- SensitiveDetectorType* sdt = dynamic_cast<SensitiveDetectorType*>(m_obj);
-
- if (sdt) {
- sdt->set_name( attrs.getValue( "name" ) );
- sdt->set_hitsCollectionName( attrs.getValue( "hits_collection" ) );
- sdt->set_ecut( attrs.getValue( "ecut" ) );
- sdt->set_eunit( attrs.getValue( "eunit" ) );
- sdt->set_verbose( attrs.getValue( "verbose" ) );
- sdt->set_endcap_flag( attrs.getValue( "endcap_flag" ) );
-
- // set the type str for factory build
- sdt->set_type( name );
- }
- else {
- std::cerr << "SensitiveDetectorTypeProcess::StartElement - cast to SensitiveDetectorType failed!" << std::endl;
- }
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string& name)
- {
- SAXObject** so = Context()->GetTopObject();
- SensitiveDetectorType* sdt = dynamic_cast<SensitiveDetectorType*>( m_obj );
-
- // just push all content; could be idspecref or segmentation (for cal)
- sdt->add_content( name, *so);
- }
+ SensitiveDetectorTypeProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~SensitiveDetectorTypeProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "SensitiveDetectorTypeProcess::StartElement: " << name << std::endl;
+
+ SensitiveDetectorType* sdt = dynamic_cast<SensitiveDetectorType*>(m_obj);
+
+ if (sdt) {
+ sdt->set_name(attrs.getValue("name"));
+ sdt->set_hitsCollectionName(attrs.getValue("hits_collection"));
+ sdt->set_ecut(attrs.getValue("ecut"));
+ sdt->set_eunit(attrs.getValue("eunit"));
+ sdt->set_verbose(attrs.getValue("verbose"));
+ sdt->set_endcap_flag(attrs.getValue("endcap_flag"));
+
+ // set the type str for factory build
+ sdt->set_type(name);
+ } else {
+ std::cerr << "SensitiveDetectorTypeProcess::StartElement - cast to SensitiveDetectorType failed!" << std::endl;
+ }
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string& name)
+ {
+ SAXObject** so = Context()->GetTopObject();
+ SensitiveDetectorType* sdt = dynamic_cast<SensitiveDetectorType*>(m_obj);
+
+ // just push all content; could be idspecref or segmentation (for cal)
+ sdt->add_content(name, *so);
+ }
protected:
- SAXObject* m_obj;
+ SAXObject* m_obj;
};
diff -u -r1.5 -r1.6 --- SolenoidType.hh 18 Dec 2006 22:49:02 -0000 1.5 +++ SolenoidType.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -4,90 +4,92 @@
#include "FieldType.hh" /**
- @class SolenoidType - @brief SolenoidType from schema. -*/ -class SolenoidType : public FieldType
+ @class SolenoidType + @brief SolenoidType from schema. + */ +class SolenoidType: public FieldType
{
public:
- SolenoidType()
- {}
-
- virtual ~SolenoidType()
- {}
+ SolenoidType()
+ {
+ }
+
+ virtual ~SolenoidType()
+ {
+ }
public:
- void set_innerField(const std::string& s)
- {
- _innerField = s;
- }
-
- void set_outerField(const std::string& s)
- {
- _outerField = s;
- }
-
- void set_zmin(const std::string& s)
- {
- _zmin = s;
- }
-
- void set_zmax(const std::string& s)
- {
- _zmax = s;
- }
-
- void set_innerRadius(const std::string& s)
- {
- _innerRadius = s;
- }
-
- void set_outerRadius(const std::string& s)
- {
- _outerRadius = s;
- }
-
- const std::string& get_innerField() const
- {
- return _innerField;
- }
-
- const std::string& get_outerField() const
- {
- return _outerField;
- }
-
- const std::string& get_zmin() const
- {
- return _zmin;
- }
-
- const std::string& get_zmax() const
- {
- return _zmax;
- }
-
- const std::string& get_innerRadius() const
- {
- return _innerRadius;
- }
-
- const std::string& get_outerRadius() const
- {
- return _outerRadius;
- }
+ void set_innerField(const std::string& s)
+ {
+ _innerField = s;
+ }
+
+ void set_outerField(const std::string& s)
+ {
+ _outerField = s;
+ }
+
+ void set_zmin(const std::string& s)
+ {
+ _zmin = s;
+ }
+
+ void set_zmax(const std::string& s)
+ {
+ _zmax = s;
+ }
+
+ void set_innerRadius(const std::string& s)
+ {
+ _innerRadius = s;
+ }
+
+ void set_outerRadius(const std::string& s)
+ {
+ _outerRadius = s;
+ }
+
+ const std::string& get_innerField() const
+ {
+ return _innerField;
+ }
+
+ const std::string& get_outerField() const
+ {
+ return _outerField;
+ }
+
+ const std::string& get_zmin() const
+ {
+ return _zmin;
+ }
+
+ const std::string& get_zmax() const
+ {
+ return _zmax;
+ }
+
+ const std::string& get_innerRadius() const
+ {
+ return _innerRadius;
+ }
+
+ const std::string& get_outerRadius() const
+ {
+ return _outerRadius;
+ }
private:
- std::string _innerField; - std::string _outerField; - std::string _zmin; - std::string _zmax; - std::string _innerRadius; - std::string _outerRadius;
+ std::string _innerField; + std::string _outerField; + std::string _zmin; + std::string _zmax; + std::string _innerRadius; + std::string _outerRadius;
}; #endif
diff -u -r1.4 -r1.5 --- StepReadout.hh 10 Oct 2007 22:38:09 -0000 1.4 +++ StepReadout.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/StepReadout.hh,v 1.4 2007/10/10 22:38:09 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/StepReadout.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_LCDD_STEPREADOUT_HH #define LCDD_LCDD_STEPREADOUT_HH 1
@@ -28,93 +28,93 @@
* @class StepReadout * @brief Utility functions to return information about a G4Step object. * @note The only cached data member is the step pointer.
-*/
+ */
class StepReadout
{
public:
- StepReadout(); - virtual ~StepReadout();
+ StepReadout(); + virtual ~StepReadout();
public:
- // step - void setStep(G4Step* s); - G4Step* step() const; - bool hasStep() const; - - // step points - G4StepPoint* pre() const; - G4StepPoint* post() const; - - // PV from pre and post - G4VPhysicalVolume* prePV() const; - G4VPhysicalVolume* postPV() const; - - // solid from pre and post - G4VSolid* preSolid() const; - G4VSolid* postSolid() const; - - // LV from pre and post - G4LogicalVolume* preLV() const; - G4LogicalVolume* postLV() const; - - // material from pre and post - G4Material* preMaterial() const; - G4Material* postMaterial() const; - - // region from pre and post - G4Region* preRegion() const; - G4Region* postRegion() const; - - // pre and post position of PV - G4ThreeVector volumePosition(G4TouchableHandle theTouchable) const; - G4ThreeVector preVolumePosition() const; - G4ThreeVector postVolumePosition() const; - - // SD from pre and post - G4VSensitiveDetector* preSD() const; - G4VSensitiveDetector* postSD() const; - G4VSensitiveDetector* getSD(G4StepPoint*) const; - - // are pre and post SD the same? - bool hasSameSD() const; - - // edep from step - double edep() const; - - // track - G4Track* track() const; - - // data from track - double globalTime() const; - int trackID() const; - G4ThreeVector momentum() const; - TrackInformation* trackInformation() const; - - // pre, mid and post positions - G4ThreeVector prePosition() const; - G4ThreeVector midPosition() const; - G4ThreeVector postPosition() const; - - // pre, post and mean momentum - G4ThreeVector preMomentum() const; - G4ThreeVector postMomentum() const; - G4ThreeVector meanMomentum() const; - - // pre and post handles - G4TouchableHandle preTouchableHandle() const; - G4TouchableHandle postTouchableHandle() const; - - // current step is a geantino or chargedgeantino? - bool isGeantino(); -
+ // step + void setStep(G4Step* s); + G4Step* step() const; + bool hasStep() const; + + // step points + G4StepPoint* pre() const; + G4StepPoint* post() const; + + // PV from pre and post + G4VPhysicalVolume* prePV() const; + G4VPhysicalVolume* postPV() const; + + // solid from pre and post + G4VSolid* preSolid() const; + G4VSolid* postSolid() const; + + // LV from pre and post + G4LogicalVolume* preLV() const; + G4LogicalVolume* postLV() const; + + // material from pre and post + G4Material* preMaterial() const; + G4Material* postMaterial() const; + + // region from pre and post + G4Region* preRegion() const; + G4Region* postRegion() const; + + // pre and post position of PV + G4ThreeVector volumePosition(G4TouchableHandle theTouchable) const; + G4ThreeVector preVolumePosition() const; + G4ThreeVector postVolumePosition() const; + + // SD from pre and post + G4VSensitiveDetector* preSD() const; + G4VSensitiveDetector* postSD() const; + G4VSensitiveDetector* getSD(G4StepPoint*) const; + + // are pre and post SD the same? + bool hasSameSD() const; + + // edep from step + double edep() const; + + // track + G4Track* track() const; + + // data from track + double globalTime() const; + int trackID() const; + G4ThreeVector momentum() const; + TrackInformation* trackInformation() const; + + // pre, mid and post positions + G4ThreeVector prePosition() const; + G4ThreeVector midPosition() const; + G4ThreeVector postPosition() const; + + // pre, post and mean momentum + G4ThreeVector preMomentum() const; + G4ThreeVector postMomentum() const; + G4ThreeVector meanMomentum() const; + + // pre and post handles + G4TouchableHandle preTouchableHandle() const; + G4TouchableHandle postTouchableHandle() const; + + // current step is a geantino or chargedgeantino? + bool isGeantino(); +
protected:
- // cached step - G4Step* m_step;
+ // cached step + G4Step* m_step;
- // vector = [0,0,0] - const G4ThreeVector m_origin;
+ // vector = [0,0,0] + const G4ThreeVector m_origin;
}; #endif
diff -u -r1.10 -r1.11 --- StoreInspector.hh 12 Jul 2007 18:09:00 -0000 1.10 +++ StoreInspector.hh 24 Jun 2013 22:10:33 -0000 1.11 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/StoreInspector.hh,v 1.10 2007/07/12 18:09:00 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/StoreInspector.hh,v 1.11 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_STOREINSPECTOR_HH #define LCDD_STOREINSPECTOR_HH 1
@@ -22,149 +22,142 @@
* StoreInspector is a templated class for printing the contents * of a vector or map-based object store using a G4UIcommand. */
-template < class Object, class ObjectContainer > -class StoreInspector : public G4UImessenger
+template<class Object, class ObjectContainer> +class StoreInspector: public G4UImessenger
{
public:
- typedef typename ObjectContainer::iterator iterator; - typedef typename ObjectContainer::const_iterator const_iterator;
+ typedef typename ObjectContainer::iterator iterator; + typedef typename ObjectContainer::const_iterator const_iterator;
public:
- /** ctor */
- StoreInspector(const std::string& name, const ObjectContainer* container)
- : G4UImessenger()
- {
- assert(container != 0 );
- _name = name;
- _container = container;
- defineCommands();
- }
-
- /* Overloaded find for vector. */
- 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 ) ) {
- obj = (*it);
- break;
- }
- }
- return obj;
- }
-
- /* Overloaded find for map. */
- 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];
- }
-
- /* Simple name comparison returning true if the strings match. */
- bool sameName(Object* obj, const std::string& name)
- {
- return ( ((std::string)obj->GetName()) == name );
- }
-
- /* Find an object by name. */
- Object* find(const std::string& name)
- {
- return findByName(name, const_cast< const ObjectContainer* > ( _container ) );
- }
-
- /* Object from iterator for maps. */
- Object* getObject( typename std::map<std::string, Object*>::const_iterator it )
- {
- return it->second;
- }
-
- /* Object from iterator for vectors. */
- Object* getObject( typename std::vector<Object*>::const_iterator it )
- {
- return (*it);
- }
-
- /* Name from iterator for maps. */
- const std::string& getObjectName( typename std::map<std::string, Object*>::const_iterator it )
- {
- return it->first;
- }
-
- /* Name from iterator for vectors. */
- const std::string& getObjectName( typename std::vector<Object*>::const_iterator it )
- {
- return (*it)->GetName();
- }
-
- /**
- * Print out the objects in the store using the stream.
- */
- 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 ) );
- os << "-------------------------------------" << endl;
+ /** ctor */
+ StoreInspector(const std::string& name, const ObjectContainer* container) :
+ G4UImessenger()
+ {
+ assert(container != 0);
+ _name = name;
+ _container = container;
+ defineCommands();
+ }
+
+ /* Overloaded find for vector. */
+ 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)) {
+ obj = (*it);
+ break;
+ }
+ }
+ return obj;
+ }
+
+ /* Overloaded find for map. */
+ 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];
+ }
+
+ /* Simple name comparison returning true if the strings match. */
+ bool sameName(Object* obj, const std::string& name)
+ {
+ return (((std::string) obj->GetName()) == name);
+ }
+
+ /* Find an object by name. */
+ Object* find(const std::string& name)
+ {
+ return findByName(name, const_cast<const ObjectContainer*>(_container));
+ }
+
+ /* Object from iterator for maps. */
+ Object* getObject(typename std::map<std::string, Object*>::const_iterator it)
+ {
+ return it->second;
+ }
+
+ /* Object from iterator for vectors. */
+ Object* getObject(typename std::vector<Object*>::const_iterator it)
+ {
+ return (*it);
+ }
+
+ /* Name from iterator for maps. */
+ const std::string& getObjectName(typename std::map<std::string, Object*>::const_iterator it)
+ {
+ return it->first;
+ }
+
+ /* Name from iterator for vectors. */
+ const std::string& getObjectName(typename std::vector<Object*>::const_iterator it)
+ {
+ return (*it)->GetName();
+ }
+
+ /**
+ * Print out the objects in the store using the stream.
+ */
+ 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));
+ os << "-------------------------------------" << endl;
+ }
+ return os;
+ os << "*************************************" << endl << endl;
+ }
+
+ /**
+ * Print a single object's name and data using the stream operator.
+ */
+ std::ostream& printObject(std::ostream& os, const std::string& name, Object* obj)
+ {
+ os << _name << " - " << name << endl;
+ os << (*obj) << endl;
+ return os;
+ }
+
+ /* Defines G4UIcommand to be used with this inspector. */
+ void defineCommands()
+ {
+ _dir = new G4UIdirectory(std::string("/stores/" + _name + "/").c_str());
+ _dir->SetGuidance(std::string("Commands for inspecting the " + _name + " store.").c_str());
+
+ _printCmd = new G4UIcmdWithAString(std::string("/stores/" + _name + "/print").c_str(), this);
+ _printCmd->SetGuidance(std::string("Print single " + _name + " object or the entire store.").c_str());
+ _printCmd->SetParameterName("name", true);
+ _printCmd->SetDefaultValue("");
+ _printCmd->AvailableForStates(G4State_Idle);
+ }
+
+ /**
+ * Hook for the G4UIcommand 'print' on this inspector.
+ */
+ virtual void SetNewValue(G4UIcommand*, G4String newVals)
+ {
+ std::string name = (std::string) newVals;
+ if (name != std::string("")) {
+ Object* obj = find(name);
+ if (obj != 0) {
+ printObject(std::cout, name, obj);
+ } else {
+ std::cerr << "ERROR: Object named " + name + " was not found in the " + _name + " store!" << endl;
+ }
+ } else {
+ printStore(std::cout);
+ }
}
- return os;
- os << "*************************************" << endl << endl;
- }
-
- /**
- * Print a single object's name and data using the stream operator.
- */
- std::ostream& printObject(std::ostream& os, const std::string& name, Object* obj)
- {
- os << _name << " - " << name << endl;
- os << (*obj) << endl;
- return os;
- }
-
- /* Defines G4UIcommand to be used with this inspector. */
- void defineCommands()
- {
- _dir = new G4UIdirectory(std::string("/stores/" + _name + "/").c_str());
- _dir->SetGuidance( std::string("Commands for inspecting the " + _name + " store.").c_str() );
-
- _printCmd = new G4UIcmdWithAString(std::string("/stores/"+_name+"/print").c_str(), this);
- _printCmd->SetGuidance( std::string("Print single " +_name+ " object or the entire store.").c_str());
- _printCmd->SetParameterName("name", true);
- _printCmd->SetDefaultValue("");
- _printCmd->AvailableForStates(G4State_Idle);
- }
-
- /**
- * Hook for the G4UIcommand 'print' on this inspector.
- */
- virtual void SetNewValue(G4UIcommand*, G4String newVals)
- {
- std::string name = (std::string)newVals;
- if ( name != std::string("") ) {
- Object* obj = find(name);
- if ( obj != 0 ) {
- printObject( std::cout, name, obj );
- }
- else {
- std::cerr << "ERROR: Object named " + name + " was not found in the " + _name + " store!" << endl;
- }
- }
- else {
- printStore( std::cout );
- }
- }
private:
- std::string _name; - const ObjectContainer* _container; - G4UIcmdWithAString* _printCmd; - G4UIdirectory* _dir;
+ std::string _name; + const ObjectContainer* _container; + G4UIcmdWithAString* _printCmd; + G4UIdirectory* _dir;
}; // FIXME: None of these inspectors should be declared globally. Put in G4StoreManager.
@@ -174,13 +167,13 @@
/* material */ #include "G4MaterialTable.hh"
-typedef StoreInspector< G4Material, G4MaterialTable > G4MaterialStoreInspector;
+typedef StoreInspector<G4Material, G4MaterialTable> G4MaterialStoreInspector;
/* solid */ #include "G4VSolid.hh" #include "G4SolidStore.hh"
-typedef StoreInspector< G4VSolid, G4SolidStore > G4SolidStoreInspector;
+typedef StoreInspector<G4VSolid, G4SolidStore> G4SolidStoreInspector;
/* limit set */ #include "G4LimitSet.hh"
@@ -188,49 +181,39 @@
std::ostream& operator<<(std::ostream& os, G4LimitSet& limset)
{
- os << endl;
- for ( G4LimitSet::LimitSetMap::const_iterator it = limset.getLimitSetMap().begin();
- it != limset.getLimitSetMap().end();
- it++ ) {
+ os << endl;
+ for (G4LimitSet::LimitSetMap::const_iterator it = limset.getLimitSetMap().begin(); it != limset.getLimitSetMap().end(); it++) {
- const G4LimitSet::LimitNameType& name = it->first; - os << name << endl;
+ const G4LimitSet::LimitNameType& name = it->first; + os << name << endl;
- std::string unit = "";
- if ( name == "ekin_min" ) {
- unit = "Energy";
- }
- else if ( name == "range_min" ) {
- unit = "Length";
- }
- else if ( name == "step_length_max" ) {
- unit = "Length";
+ std::string unit = "";
+ if (name == "ekin_min") {
+ unit = "Energy";
+ } else if (name == "range_min") {
+ unit = "Length";
+ } else if (name == "step_length_max") {
+ unit = "Length";
+ } else if (name == "time_max") {
+ unit = "Time";
+ } else if (name == "track_length_max") {
+ unit = "Length";
+ }
+
+ if (unit != "") {
+ const G4LimitSet::LimitMap& limmap = it->second;
+ for (G4LimitSet::LimitMap::const_iterator iit = limmap.begin(); iit != limmap.end(); iit++) {
+
+ os << '\t' << iit->first << '\t' << G4BestUnit(iit->second, unit) << endl;
+ }
+ } else {
+ os << "Unknown limit type " << name << endl;
+ }
}
- else if ( name == "time_max" ) {
- unit = "Time";
- }
- else if ( name == "track_length_max" ) {
- unit = "Length";
- }
-
- if ( unit != "" ) {
- const G4LimitSet::LimitMap& limmap = it->second;
- for ( G4LimitSet::LimitMap::const_iterator iit = limmap.begin();
- iit != limmap.end();
- iit++ ) {
-
- os << '\t' << iit->first << '\t' << G4BestUnit(iit->second, unit) << endl;
- }
- }
- else {
- os << "Unknown limit type " << name << endl;
- }
- }
- return os;
+ return os;
}
- -typedef StoreInspector< G4LimitSet, LCDDProcessor::LimitSets > G4LimitSetInspector;
+typedef StoreInspector<G4LimitSet, LCDDProcessor::LimitSets> G4LimitSetInspector;
/* lvolume */ #include "G4LogicalVolume.hh"
@@ -240,59 +223,55 @@
/* G4LogicalVolume stream operator */
std::ostream& operator<<(std::ostream &os, G4LogicalVolume &lv)
{
- os << "solid: " << lv.GetSolid()->GetName() << endl; - os << "material: " << lv.GetMaterial()->GetName() << endl;
+ os << "solid: " << lv.GetSolid()->GetName() << endl; + os << "material: " << lv.GetMaterial()->GetName() << endl;
#ifdef HAVE_G4LOGICALVOLUME_GETMASS
- os << "mass: " << G4BestUnit(lv.GetMass(), "Mass") << endl;
+ os << "mass: " << G4BestUnit(lv.GetMass(), "Mass") << endl;
#endif
- os << "daughters: " << lv.GetNoDaughters() << endl;
+ os << "daughters: " << lv.GetNoDaughters() << endl;
- G4UserLimits* lim = lv.GetUserLimits();
- os << "limits: ";
- if ( 0 != lim ) {
- os << lim->GetType();
- }
- else {
- os << "NONE";
- }
- os << endl;
-
- G4VSensitiveDetector* sd = lv.GetSensitiveDetector();
- os << "SD: ";
- if ( 0 != sd ) {
- os << sd->GetName();
- }
- else {
- os << "NONE";
- }
- os << endl;
-
- G4Region* reg = lv.GetRegion();
- os << "region: ";
- if ( 0 != reg ) {
- os << reg->GetName();
- }
- else {
- os << "NONE";
- }
- os << endl;
-
- const G4VisAttributes* vis = lv.GetVisAttributes();
- os << "visattributes: ";
- if ( 0 != vis ) {
- os << "yes";
- }
- else {
- os << "NONE";
- }
- os << endl;
+ G4UserLimits* lim = lv.GetUserLimits();
+ os << "limits: ";
+ if (0 != lim) {
+ os << lim->GetType();
+ } else {
+ os << "NONE";
+ }
+ os << endl;
+
+ G4VSensitiveDetector* sd = lv.GetSensitiveDetector();
+ os << "SD: ";
+ if (0 != sd) {
+ os << sd->GetName();
+ } else {
+ os << "NONE";
+ }
+ os << endl;
+
+ G4Region* reg = lv.GetRegion();
+ os << "region: ";
+ if (0 != reg) {
+ os << reg->GetName();
+ } else {
+ os << "NONE";
+ }
+ os << endl;
+
+ const G4VisAttributes* vis = lv.GetVisAttributes();
+ os << "visattributes: ";
+ if (0 != vis) {
+ os << "yes";
+ } else {
+ os << "NONE";
+ }
+ os << endl;
- return os;
+ return os;
}
-typedef StoreInspector< G4LogicalVolume, G4LogicalVolumeStore > G4LogicalVolumeStoreInspector;
+typedef StoreInspector<G4LogicalVolume, G4LogicalVolumeStore> G4LogicalVolumeStoreInspector;
/* pvolume */ #include "G4VPhysicalVolume.hh"
@@ -300,59 +279,55 @@
std::ostream& operator<<(std::ostream &os, G4VPhysicalVolume &pv)
{
- os << "lvolume: " << pv.GetLogicalVolume()->GetName() << endl;
- os << "pos: " << pv.GetTranslation() << endl;
- const G4RotationMatrix* rot = pv.GetRotation();
- os << "rot: ";
- if ( 0 != rot ) {
- rot->print(os);
- }
- else {
- os << "NONE" << endl;
- }
- os << "copyNo: " << pv.GetCopyNo() << endl;
- os << "# copies: " << pv.GetMultiplicity() << endl;
- return os;
+ os << "lvolume: " << pv.GetLogicalVolume()->GetName() << endl;
+ os << "pos: " << pv.GetTranslation() << endl;
+ const G4RotationMatrix* rot = pv.GetRotation();
+ os << "rot: ";
+ if (0 != rot) {
+ rot->print(os);
+ } else {
+ os << "NONE" << endl;
+ }
+ os << "copyNo: " << pv.GetCopyNo() << endl;
+ os << "# copies: " << pv.GetMultiplicity() << endl;
+ return os;
}
-typedef StoreInspector< G4VPhysicalVolume, G4PhysicalVolumeStore > G4PhysicalVolumeStoreInspector;
+typedef StoreInspector<G4VPhysicalVolume, G4PhysicalVolumeStore> G4PhysicalVolumeStoreInspector;
/* idspec */
#include "IdManager.hh"
std::ostream& operator<<(std::ostream& os, IdSpec& id)
{
- os << "# fields: " << id.getNumFields() << endl;
- os << endl;
- os << "label\tstart\tlength\tsigned" << endl;
- for ( IdSpec::IdFields::const_iterator it = id.IdFieldsBegin();
- it != id.IdFieldsEnd();
- it++ ) {
- IdField* field = *it;
- os << field->getLabel() << '\t' << field->getStart() << '\t' << field->getLength() << '\t' << field->getSigned() << endl;
- }
- return os;
+ os << "# fields: " << id.getNumFields() << endl;
+ os << endl;
+ os << "label\tstart\tlength\tsigned" << endl;
+ for (IdSpec::IdFields::const_iterator it = id.IdFieldsBegin(); it != id.IdFieldsEnd(); it++) {
+ IdField* field = *it;
+ os << field->getLabel() << '\t' << field->getStart() << '\t' << field->getLength() << '\t' << field->getSigned() << endl;
+ }
+ return os;
}
-typedef StoreInspector< IdSpec, IdManager::IdSpecs > IdSpecInspector;
+typedef StoreInspector<IdSpec, IdManager::IdSpecs> IdSpecInspector;
/* SD */ #include "G4SensitiveDetector.hh" // use LCDD's concrete SD class
-
std::ostream& operator<<(std::ostream& os, G4SensitiveDetector& sd)
{
- os << "fullPath: " << sd.GetFullPathName() << endl; - os << "HC: " << sd.getHCName() << endl; - os << "HCID: " << sd.getHCID() << endl; - os << "verbose: " << sd.getVerbose() << endl; - os << "ecut: " << sd.getEcut() << endl; - os << "hasIdSpec: " << sd.hasIdSpec() << endl; - os << "isEndcap: " << sd.getEndcapFlag() << endl; - os << "isActive: " << sd.isActive() << endl; - return os;
+ os << "fullPath: " << sd.GetFullPathName() << endl; + os << "HC: " << sd.getHCName() << endl; + os << "HCID: " << sd.getHCID() << endl; + os << "verbose: " << sd.getVerbose() << endl; + os << "ecut: " << sd.getEcut() << endl; + os << "hasIdSpec: " << sd.hasIdSpec() << endl; + os << "isEndcap: " << sd.getEndcapFlag() << endl; + os << "isActive: " << sd.isActive() << endl; + return os;
}
-typedef StoreInspector< G4SensitiveDetector, LCDDProcessor::SensitiveDetectors > G4SensitiveDetectorInspector;
+typedef StoreInspector<G4SensitiveDetector, LCDDProcessor::SensitiveDetectors> G4SensitiveDetectorInspector;
/* region */ #include "G4Region.hh"
@@ -364,31 +339,29 @@
/* G4Region stream operator */
std::ostream& operator<<(std::ostream &os, G4Region ®)
{
- os << "prod cut: " << reg.GetProductionCuts()->GetProductionCut(0) << endl;
- G4UserRegionInformation* regInfo
- = static_cast<G4UserRegionInformation*> ( reg.GetUserInformation() );
- if ( 0 != regInfo ) {
- os << "store secondaries: " << regInfo->getStoreSecondaries() << endl;
- os << "energy threshold: " << regInfo->getThreshold() << endl;
- }
- else {
- os << "NO G4UserRegionInformation" << endl;
- }
- return os;
+ os << "prod cut: " << reg.GetProductionCuts()->GetProductionCut(0) << endl;
+ G4UserRegionInformation* regInfo = static_cast<G4UserRegionInformation*>(reg.GetUserInformation());
+ if (0 != regInfo) {
+ os << "store secondaries: " << regInfo->getStoreSecondaries() << endl;
+ os << "energy threshold: " << regInfo->getThreshold() << endl;
+ } else {
+ os << "NO G4UserRegionInformation" << endl;
+ }
+ return os;
}
-typedef StoreInspector< G4Region, G4RegionStore > G4RegionStoreInspector;
+typedef StoreInspector<G4Region, G4RegionStore> G4RegionStoreInspector;
/* mag field */
#include "G4MagneticField.hh"
std::ostream& operator<<(std::ostream& os, G4MagneticField&)
{
- /* Generic fields have no displayable data attributes! */ - return os;
+ /* Generic fields have no displayable data attributes! */ + return os;
}
-typedef StoreInspector< G4MagneticField, LCDDProcessor::MagneticFields > G4MagneticFieldInspector;
+typedef StoreInspector<G4MagneticField, LCDDProcessor::MagneticFields> G4MagneticFieldInspector;
/* vis attrib */ #include "G4VisAttributes.hh"
@@ -396,37 +369,31 @@
/* G4VisAttributes stream operator */
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;
- os << "visible: " << vis.IsVisible() << endl;
- os << "show daughters: " << !vis.IsDaughtersInvisible() << endl;
-
- os << "forced drawing style: ";
- if ( vis.IsForceDrawingStyle() ) {
- G4VisAttributes::ForcedDrawingStyle force = vis.GetForcedDrawingStyle();
- if ( force == G4VisAttributes::wireframe ) {
- os << "wireframe";
- }
- else if ( force == G4VisAttributes::solid ) {
- os << "solid";
- }
- }
- else {
- os << "NONE";
- }
- os << endl;
+ const G4Color& color = vis.GetColor();
+ os << "RGB: " << color.GetRed() << " " << color.GetGreen() << " " << color.GetBlue() << endl;
+ os << "Alpha: " << color.GetAlpha() << endl;
+ os << "visible: " << vis.IsVisible() << endl;
+ os << "show daughters: " << !vis.IsDaughtersInvisible() << endl;
+
+ os << "forced drawing style: ";
+ if (vis.IsForceDrawingStyle()) {
+ G4VisAttributes::ForcedDrawingStyle force = vis.GetForcedDrawingStyle();
+ if (force == G4VisAttributes::wireframe) {
+ os << "wireframe";
+ } else if (force == G4VisAttributes::solid) {
+ os << "solid";
+ }
+ } else {
+ os << "NONE";
+ }
+ os << endl;
- return os;
+ return os;
}
-typedef StoreInspector< G4VisAttributes, LCDDProcessor::VisAttributes > G4VisAttributeInspector; -G4VisAttributeInspector visInspector( "G4VisAttributes", LCDDProcessor::instance()->getVisAttributesStore() );
+typedef StoreInspector<G4VisAttributes, LCDDProcessor::VisAttributes> G4VisAttributeInspector;
+G4VisAttributeInspector visInspector("G4VisAttributes", LCDDProcessor::instance()->getVisAttributesStore());
/* defines, positions, rotations */ // FIXME: need accessible maps from GDML???
-
#endif
diff -u -r1.10 -r1.11 --- StringUtil.hh 18 Dec 2006 22:49:02 -0000 1.10 +++ StringUtil.hh 24 Jun 2013 22:10:33 -0000 1.11 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/StringUtil.hh,v 1.10 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/StringUtil.hh,v 1.11 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_STRINGUTIL_HH #define LCDD_STRINGUTIL_HH 1
@@ -8,56 +8,56 @@
#include <vector> /**
- @class StringUtil - @brief String utilities. - @note Used by both LCDD and SLIC. -*/
+ @class StringUtil + @brief String utilities. + @note Used by both LCDD and SLIC. + */
class StringUtil
{
private:
- // should not be instantiated
- virtual ~StringUtil()
- {}
+ // should not be instantiated
+ virtual ~StringUtil()
+ {
+ }
public:
- // a-zA-Z - static const std::string ALPHA_STR;
+ // a-zA-Z + static const std::string ALPHA_STR;
- // 0-9 - static const std::string NUM_STR;
+ // 0-9 + static const std::string NUM_STR;
- // std. whitespace; 0x09-0D and 20 - static const std::string WS_STR;
+ // std. whitespace; 0x09-0D and 20 + static const std::string WS_STR;
- // null string - static const std::string NULL_STR;
+ // null string + static const std::string NULL_STR;
public:
- static std::string toString(double d); - static std::string toString(float f); - static std::string toString(int i); - static std::string toString(bool b);
+ static std::string toString(double d); + static std::string toString(float f); + static std::string toString(int i); + static std::string toString(bool b);
- static std::string& toLower(std::string&); - static std::string& toLower(const std::string&);
+ static std::string& toLower(std::string&); + static std::string& toLower(const std::string&);
- static double toDouble(std::string& s); - static double toDouble(const std::string& s);
+ static double toDouble(std::string& s); + static double toDouble(const std::string& s);
- static int toInt(std::string& s);
+ static int toInt(std::string& s);
- static bool toBool(std::string& s); - static bool toBool(const std::string& s);
+ static bool toBool(std::string& s); + static bool toBool(const std::string& s);
- static void trim(std::string& str);
+ static void trim(std::string& str);
- static std::string concatStrVec(const std::vector<std::string>& s_vec, - const std::string& sep = " ");
+ static std::string concatStrVec(const std::vector<std::string>& s_vec, const std::string& sep = " ");
- 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.12 -r1.13 --- TrackInformation.hh 18 Dec 2006 22:49:02 -0000 1.12 +++ TrackInformation.hh 24 Jun 2013 22:10:33 -0000 1.13 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/TrackInformation.hh,v 1.12 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/TrackInformation.hh,v 1.13 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_TRACKINFORMATION_HH #define LCDD_TRACKINFORMATION_HH 1
@@ -7,160 +7,159 @@
#include "G4Allocator.hh" /**
- @class TrackInformation - @brief Implements G4VUserTrackInformation. - @note In LCDD package, because used by SDs. -*/ -class TrackInformation : public G4VUserTrackInformation
+ @class TrackInformation + @brief Implements G4VUserTrackInformation. + @note In LCDD package, because used by SDs. + */ +class TrackInformation: public G4VUserTrackInformation
{
public:
- enum ETrackingStatus {
- eNone,
- eInTrackingRegion,
- eInNontrackingRegion
- };
+ enum ETrackingStatus
+ {
+ eNone, eInTrackingRegion, eInNontrackingRegion
+ };
public:
- TrackInformation();
- TrackInformation(const G4Track* aTrack);
- TrackInformation(const TrackInformation* aTrackInfo);
- virtual ~TrackInformation();
-
- void setDefaults();
-
- static void setFromTrackInformation(const TrackInformation* srcTrkInfo,
- TrackInformation* trgtTrkInfo);
-
- static inline TrackInformation* getTrackInformation(const G4Track* aTrack)
- {
- return static_cast<TrackInformation*>
- ( aTrack->GetUserInformation() );
- }
-
- static inline TrackInformation* getTrackInformation(const G4Step* aStep)
- {
- return getTrackInformation( aStep->GetTrack() );
- }
-
- inline void *operator new(size_t);
- inline void operator delete(void *aTrackInfo);
- inline int operator ==(const TrackInformation& right) const
- {
- return (this==&right);
- }
-
- TrackInformation& operator =(const TrackInformation& right);
-
- // from G4
- virtual void Print() const {}
-
- // get str of tracking status from enum
- static const std::string& getTrackingStatusString(ETrackingStatus ts);
- const std::string& getTrackingStatusString() const
- {
- return TrackInformation::getTrackingStatusString( getTrackingStatus() );
- }
+ TrackInformation();
+ TrackInformation(const G4Track* aTrack);
+ TrackInformation(const TrackInformation* aTrackInfo);
+ virtual ~TrackInformation();
+
+ void setDefaults();
+
+ static void setFromTrackInformation(const TrackInformation* srcTrkInfo, TrackInformation* trgtTrkInfo);
+
+ static inline TrackInformation* getTrackInformation(const G4Track* aTrack)
+ {
+ return static_cast<TrackInformation*>(aTrack->GetUserInformation());
+ }
+
+ static inline TrackInformation* getTrackInformation(const G4Step* aStep)
+ {
+ return getTrackInformation(aStep->GetTrack());
+ }
+
+ inline void *operator new(size_t);
+ inline void operator delete(void *aTrackInfo);
+ inline int operator ==(const TrackInformation& right) const
+ {
+ return (this == &right);
+ }
+
+ TrackInformation& operator =(const TrackInformation& right);
+
+ // from G4
+ virtual void Print() const
+ {
+ }
+
+ // get str of tracking status from enum
+ static const std::string& getTrackingStatusString(ETrackingStatus ts);
+ const std::string& getTrackingStatusString() const
+ {
+ return TrackInformation::getTrackingStatusString(getTrackingStatus());
+ }
public:
- inline G4int getOriginalTrackID() const
- {
- return m_originalTrackID;
- }
-
- inline ETrackingStatus getOriginalTrackingStatus() const
- {
- return m_originalTrackingStatus;
- }
-
- inline ETrackingStatus getTrackingStatus() const
- {
- return m_trackingStatus;
- }
-
- inline bool hasTrackerHit() const
- {
- return m_hasTrackerHit;
- }
-
- inline void setHasTrackerHit(bool hasHit = true)
- {
- m_hasTrackerHit = hasHit;
- }
-
- inline void setTrackID(G4int id)
- {
- m_originalTrackID = id;
- }
-
- inline void setTrackingStatus(ETrackingStatus st)
- {
- m_trackingStatus = st;
- }
-
- inline void setOriginalTrackingStatus(ETrackingStatus st)
- {
- m_originalTrackingStatus = st;
- }
-
- inline void setVertexIsNotEndpointOfParent(bool val = true)
- {
- m_vertexIsNotEndpointOfParent = val;
- }
-
- inline bool getVertexIsNotEndpointOfParent() const
- {
- return m_vertexIsNotEndpointOfParent;
- }
-
- inline void setBackscatter(bool val = true)
- {
- m_backscatter = val;
- }
-
- inline bool getBackscatter() const
- {
- return m_backscatter;
- }
-
- inline void setBelowThreshold(bool val = true)
- {
- m_belowThreshold = val;
- }
-
- inline bool getBelowThreshold() const
- {
- return m_belowThreshold;
- }
+ inline G4int getOriginalTrackID() const
+ {
+ return m_originalTrackID;
+ }
+
+ inline ETrackingStatus getOriginalTrackingStatus() const
+ {
+ return m_originalTrackingStatus;
+ }
+
+ inline ETrackingStatus getTrackingStatus() const
+ {
+ return m_trackingStatus;
+ }
+
+ inline bool hasTrackerHit() const
+ {
+ return m_hasTrackerHit;
+ }
+
+ inline void setHasTrackerHit(bool hasHit = true)
+ {
+ m_hasTrackerHit = hasHit;
+ }
+
+ inline void setTrackID(G4int id)
+ {
+ m_originalTrackID = id;
+ }
+
+ inline void setTrackingStatus(ETrackingStatus st)
+ {
+ m_trackingStatus = st;
+ }
+
+ inline void setOriginalTrackingStatus(ETrackingStatus st)
+ {
+ m_originalTrackingStatus = st;
+ }
+
+ inline void setVertexIsNotEndpointOfParent(bool val = true)
+ {
+ m_vertexIsNotEndpointOfParent = val;
+ }
+
+ inline bool getVertexIsNotEndpointOfParent() const
+ {
+ return m_vertexIsNotEndpointOfParent;
+ }
+
+ inline void setBackscatter(bool val = true)
+ {
+ m_backscatter = val;
+ }
+
+ inline bool getBackscatter() const
+ {
+ return m_backscatter;
+ }
+
+ inline void setBelowThreshold(bool val = true)
+ {
+ m_belowThreshold = val;
+ }
+
+ inline bool getBelowThreshold() const
+ {
+ return m_belowThreshold;
+ }
private:
- G4int m_originalTrackID;
+ G4int m_originalTrackID;
- ETrackingStatus m_trackingStatus; - ETrackingStatus m_originalTrackingStatus;
+ ETrackingStatus m_trackingStatus; + ETrackingStatus m_originalTrackingStatus;
- G4bool m_hasTrackerHit;
+ G4bool m_hasTrackerHit;
- G4bool m_vertexIsNotEndpointOfParent; - G4bool m_backscatter; - G4bool m_belowThreshold;
+ G4bool m_vertexIsNotEndpointOfParent; + G4bool m_backscatter; + G4bool m_belowThreshold;
};
extern G4Allocator<TrackInformation> TrackInformationAllocator;
inline void* TrackInformation::operator new(size_t)
{
- void* aTrackInfo; - aTrackInfo = (void*) TrackInformationAllocator.MallocSingle(); - return aTrackInfo;
+ void* aTrackInfo; + aTrackInfo = (void*) TrackInformationAllocator.MallocSingle(); + return aTrackInfo;
}
inline void TrackInformation::operator delete(void *aTrackInfo)
{
- TrackInformationAllocator.FreeSingle( ( TrackInformation* ) aTrackInfo );
+ TrackInformationAllocator.FreeSingle((TrackInformation*) aTrackInfo);
} #endif
diff -u -r1.6 -r1.7 --- TrackerType.hh 18 Dec 2006 22:49:02 -0000 1.6 +++ TrackerType.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -6,32 +6,34 @@
#include <iostream> /**
- @class TrackerType - @brief TrackerType from schema. -*/ -class TrackerType : public SensitiveDetectorType
+ @class TrackerType + @brief TrackerType from schema. + */ +class TrackerType: public SensitiveDetectorType
{
public:
- TrackerType()
- {}
-
- virtual ~TrackerType()
- {}
-
- void set_combine_hits(const std::string& c)
- {
- m_combine_hits = c;
- }
-
- const std::string& get_combine_hits() const
- {
- return m_combine_hits;
- }
+ TrackerType()
+ {
+ }
+
+ virtual ~TrackerType()
+ {
+ }
+
+ void set_combine_hits(const std::string& c)
+ {
+ m_combine_hits = c;
+ }
+
+ const std::string& get_combine_hits() const
+ {
+ return m_combine_hits;
+ }
private:
- std::string m_combine_hits;
+ std::string m_combine_hits;
}; #endif
diff -u -r1.1 -r1.2 --- UnsegmentedCalorimeterType.hh 7 Dec 2010 00:52:00 -0000 1.1 +++ UnsegmentedCalorimeterType.hh 24 Jun 2013 22:10:33 -0000 1.2 @@ -13,17 +13,19 @@
/** * @class UnsegmentedCalorimeterType * @brief UnsegmentedCalorimeterType from schema.
-*/ -class UnsegmentedCalorimeterType : public CalorimeterType
+ */ +class UnsegmentedCalorimeterType: public CalorimeterType
{
public:
- UnsegmentedCalorimeterType()
- {}
+ UnsegmentedCalorimeterType()
+ {
+ }
- virtual ~UnsegmentedCalorimeterType()
- {}
+ virtual ~UnsegmentedCalorimeterType()
+ {
+ }
}; #endif
diff -u -r1.4 -r1.5 --- Verbose.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ Verbose.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,40 +1,41 @@
-// $Header: /cvs/lcd/lcdd/include/Verbose.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/Verbose.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_VERBOSE_HH #define LCDD_VERBOSE_HH 1 /** * @class Verbose * @brief Mixin class for setting and retrieving verbosity level.
-*/
+ */
class Verbose
{
public:
- typedef unsigned int LevelType;
+ typedef unsigned int LevelType;
public:
- Verbose(LevelType lt = m_defaultLevel)
- {
- m_level = lt;
- }
-
- virtual ~Verbose()
- {}
+ Verbose(LevelType lt = m_defaultLevel)
+ {
+ m_level = lt;
+ }
+
+ virtual ~Verbose()
+ {
+ }
public:
- virtual inline LevelType verbose() const
- {
- return m_level;
- }
-
- virtual inline void setVerbose(LevelType lt)
- {
- m_level = lt;
- }
+ virtual inline LevelType verbose() const
+ {
+ return m_level;
+ }
+
+ virtual inline void setVerbose(LevelType lt)
+ {
+ m_level = lt;
+ }
protected:
- LevelType m_level; - static const LevelType m_defaultLevel;
+ LevelType m_level; + static const LevelType m_defaultLevel;
}; #endif
diff -u -r1.5 -r1.6 --- VisType.hh 18 Dec 2006 22:49:02 -0000 1.5 +++ VisType.hh 24 Jun 2013 22:10:33 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/VisType.hh,v 1.5 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/VisType.hh,v 1.6 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_VISTYPE_HH #define LCDD_VISTYPE_HH 1
@@ -13,109 +13,112 @@
/** * @class VisType * @brief VisType from schema.
-*/
+ */
class VisType
{
public:
- /**
- * @class VisType::visref
- * @brief Reference to a vis element.
- */
- class visref : public SAXObject, public ReferenceType
- {
- public:
- visref()
- {}
+ /**
+ * @class VisType::visref
+ * @brief Reference to a vis element.
+ */
+ class visref: public SAXObject, public ReferenceType
+ {
+ public:
+ visref()
+ {
+ }
+
+ virtual ~visref()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
+ };
- virtual ~visref()
- {}
+public:
+ VisType()
+ {
+ }
- virtual SAXObject::Type type()
+ virtual ~VisType()
{
- return SAXObject::element;
}
- };
public:
- VisType()
- {}
- virtual ~VisType()
- {}
+ void set_name(const std::string& n)
+ {
+ m_name = n;
+ }
+
+ void set_visible(const std::string& v)
+ {
+ m_visible = v;
+ }
-public:
+ void set_show_daughters(const std::string& d)
+ {
+ m_show_daughters = d;
+ }
+
+ void set_line_style(const std::string& l)
+ {
+ m_line_style = l;
+ }
- void set_name(const std::string& n)
- {
- m_name = n;
- }
-
- void set_visible(const std::string& v)
- {
- m_visible = v;
- }
-
- void set_show_daughters(const std::string& d)
- {
- m_show_daughters = d;
- }
-
- void set_line_style(const std::string& l)
- {
- m_line_style = l;
- }
-
- void set_drawing_style(const std::string& d)
- {
- m_drawing_style = d;
- }
-
- const std::string& get_name() const
- {
- return m_name;
- }
-
- const std::string& get_visible() const
- {
- return m_visible;
- }
-
- const std::string& get_show_daughters() const
- {
- return m_show_daughters;
- }
-
- const std::string& get_line_style() const
- {
- return m_line_style;
- }
-
- const std::string& get_drawing_style() const
- {
- return m_drawing_style;
- }
-
- const ContentSequence* get_content() const
- {
- return &m_sequence;
- }
-
- void add_content(const std::string& tag, SAXObject* so)
- {
- ContentGroup::ContentItem ci = {tag, so};
- m_sequence.add_content(ci);
- }
+ void set_drawing_style(const std::string& d)
+ {
+ m_drawing_style = d;
+ }
+
+ const std::string& get_name() const
+ {
+ return m_name;
+ }
+
+ const std::string& get_visible() const
+ {
+ return m_visible;
+ }
+
+ const std::string& get_show_daughters() const
+ {
+ return m_show_daughters;
+ }
+
+ const std::string& get_line_style() const
+ {
+ return m_line_style;
+ }
+
+ const std::string& get_drawing_style() const
+ {
+ return m_drawing_style;
+ }
+
+ const ContentSequence* get_content() const
+ {
+ return &m_sequence;
+ }
+
+ void add_content(const std::string& tag, SAXObject* so)
+ {
+ ContentGroup::ContentItem ci = { tag, so };
+ m_sequence.add_content(ci);
+ }
private:
- ContentSequence m_sequence;
+ ContentSequence m_sequence;
- std::string m_name; - std::string m_visible; - std::string m_show_daughters; - std::string m_line_style; - std::string m_drawing_style;
+ std::string m_name; + std::string m_visible; + std::string m_show_daughters; + std::string m_line_style; + std::string m_drawing_style;
};
-
#endif
diff -u -r1.4 -r1.5 --- author.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ author.hh 24 Jun 2013 22:10:33 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/author.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/author.hh,v 1.5 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_AUTHOR_HH #define LCDD_AUTHOR_HH 1
@@ -8,22 +8,24 @@
#include "AuthorType.hh" /**
- @class author - @brief author element from schema. -*/ -class author : public SAXObject, public AuthorType
+ @class author + @brief author element from schema. + */ +class author: public SAXObject, public AuthorType
{
public:
- author()
- {}
-
- virtual ~author()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ author()
+ {
+ }
+
+ virtual ~author()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.1 -r1.2 --- box_dipole.hh 23 Jun 2011 21:04:10 -0000 1.1 +++ box_dipole.hh 24 Jun 2013 22:10:33 -0000 1.2 @@ -1,4 +1,4 @@
-// $Id: box_dipole.hh,v 1.1 2011/06/23 21:04:10 jeremy Exp $
+// $Id: box_dipole.hh,v 1.2 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_BOX_DIPOLE_HH #define LCDD_BOX_DIPOLE_HH 1
@@ -12,21 +12,23 @@
* @class box_dipole * @brief A representation of the box_dipole class from the LCDD schema. */
-class box_dipole : public SAXObject, public BoxDipoleType
+class box_dipole: public SAXObject, public BoxDipoleType
{
- public:
+public:
- box_dipole()
- {}
-
- virtual ~box_dipole()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ box_dipole()
+ {
+ }
+
+ virtual ~box_dipole()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.6 -r1.7 --- calorimeter.hh 18 Dec 2006 22:49:02 -0000 1.6 +++ calorimeter.hh 24 Jun 2013 22:10:33 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/calorimeter.hh,v 1.6 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/calorimeter.hh,v 1.7 2013/06/24 22:10:33 jeremy Exp $
#ifndef LCDD_CALORIMETER_HH #define LCDD_CALORIMETER_HH 1
@@ -7,22 +7,24 @@
#include "CalorimeterType.hh" /**
- @class calorimeter - @brief calorimeter element from schema.
+ @class calorimeter + @brief calorimeter element from schema.
*/
-class calorimeter : public SAXObject, public CalorimeterType
+class calorimeter: public SAXObject, public CalorimeterType
{
public:
- calorimeter()
- {}
-
- virtual ~calorimeter()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ calorimeter()
+ {
+ }
+
+ virtual ~calorimeter()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.1 -r1.2 --- calorimeterProcess.hh 5 Jul 2007 22:27:35 -0000 1.1 +++ calorimeterProcess.hh 24 Jun 2013 22:10:34 -0000 1.2 @@ -1,7 +1,7 @@
#ifndef LCDD_CALORIMETERPROCESS_HH #define LCDD_CALORIMETERPROCESS_HH 1
-// $Header: /cvs/lcd/lcdd/include/calorimeterProcess.hh,v 1.1 2007/07/05 22:27:35 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/calorimeterProcess.hh,v 1.2 2013/06/24 22:10:34 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -17,26 +17,26 @@
#include <iostream> /**
- @class calorimeterProcess - @brief SAX process for calorimeter element. - @note Calls SAX processor for SensitiveDetectorTypeProcess parent class. -*/ -class calorimeterProcess : public SensitiveDetectorTypeProcess
+ @class calorimeterProcess + @brief SAX process for calorimeter element. + @note Calls SAX processor for SensitiveDetectorTypeProcess parent class. + */ +class calorimeterProcess: public SensitiveDetectorTypeProcess
{
public:
- calorimeterProcess(const ProcessingContext* context = 0);
+ calorimeterProcess(const ProcessingContext* context = 0);
- virtual ~calorimeterProcess();
+ virtual ~calorimeterProcess();
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs);
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs);
- 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);
- virtual const std::string& State() const;
+ virtual const std::string& State() const;
}; #endif
diff -u -r1.4 -r1.5 --- color.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ color.hh 24 Jun 2013 22:10:34 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/color.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/color.hh,v 1.5 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_COLOR_HH #define LCDD_COLOR_HH 1
@@ -9,22 +9,24 @@
#include "ColorType.hh" /**
- @class color - @brief color element from schema. -*/ -class color : public SAXObject, public ColorType
+ @class color + @brief color element from schema. + */ +class color: public SAXObject, public ColorType
{
public:
- color()
- {}
-
- virtual ~color()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ color()
+ {
+ }
+
+ virtual ~color()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.4 -r1.5 --- comment.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ comment.hh 24 Jun 2013 22:10:34 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/comment.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/comment.hh,v 1.5 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_COMMENT_HH #define LCDD_COMMENT_HH 1
@@ -8,22 +8,24 @@
#include "CommentType.hh" /**
- @class comment - @brief comment element from schema. -*/ -class comment : public SAXObject, public CommentType
+ @class comment + @brief comment element from schema. + */ +class comment: public SAXObject, public CommentType
{
public:
- comment()
- {}
-
- virtual ~comment()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ comment()
+ {
+ }
+
+ virtual ~comment()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.4 -r1.5 --- detector.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ detector.hh 24 Jun 2013 22:10:34 -0000 1.5 @@ -8,22 +8,24 @@
#include "DetectorType.hh" /**
- @class detector - @brief detector element from schema (in header). -*/ -class detector : public SAXObject, public DetectorType
+ @class detector + @brief detector element from schema (in header). + */ +class detector: public SAXObject, public DetectorType
{
public:
- detector()
- {}
+ detector()
+ {
+ }
- virtual ~detector()
- {}
+ virtual ~detector()
+ {
+ }
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.3 -r1.4 --- dipole.hh 18 Dec 2006 22:49:02 -0000 1.3 +++ dipole.hh 24 Jun 2013 22:10:34 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/dipole.hh,v 1.3 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/dipole.hh,v 1.4 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_DIPOLE_HH #define LCDD_DIPOLE_HH
@@ -10,19 +10,21 @@
* @class dipole * @class The dipole element from the lcdd_fields.xsd schema. */
-class dipole : public SAXObject, public DipoleType
+class dipole: public SAXObject, public DipoleType
{
public:
- dipole()
- {}
-
- virtual ~dipole()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ dipole()
+ {
+ }
+
+ virtual ~dipole()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.3 -r1.4 --- dipole_coeff.hh 18 Dec 2006 22:49:02 -0000 1.3 +++ dipole_coeff.hh 24 Jun 2013 22:10:34 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/dipole_coeff.hh,v 1.3 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/dipole_coeff.hh,v 1.4 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_DIPOLE_COEFF_HH #define LCDD_DIPOLE_COEFF_HH 1
@@ -8,19 +8,21 @@
* @class dipole_coeff * @brief The dipole_coeff element from the lcdd_fields.xsd schema. */
-class dipole_coeff : public SAXObject, public DipoleCoeffType
+class dipole_coeff: public SAXObject, public DipoleCoeffType
{
public:
- dipole_coeff()
- {}
+ dipole_coeff()
+ {
+ }
- virtual ~dipole_coeff()
- {}
+ virtual ~dipole_coeff()
+ {
+ }
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.4 -r1.5 --- field.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ field.hh 24 Jun 2013 22:10:34 -0000 1.5 @@ -6,23 +6,25 @@
#include "FieldType.hh" /**
- @class field - @brief field element from schema. -*/ -class field : public SAXObject, public FieldType
+ @class field + @brief field element from schema. + */ +class field: public SAXObject, public FieldType
{
public:
- field()
- {}
+ field()
+ {
+ }
- virtual ~field()
- {}
+ virtual ~field()
+ {
+ }
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.2 -r1.3 --- field_map_3d.hh 3 Oct 2012 17:23:40 -0000 1.2 +++ field_map_3d.hh 24 Jun 2013 22:10:34 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/field_map_3d.hh,v 1.2 2012/10/03 17:23:40 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/field_map_3d.hh,v 1.3 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_FIELD_MAP_3D_HH #define LCDD_FIELD_MAP_3D_HH 1
@@ -8,19 +8,23 @@
* @class * @brief */
-class field_map_3d: public SAXObject, public FieldMap3DType {
+class field_map_3d: public SAXObject, public FieldMap3DType
+{
public:
- field_map_3d() {
- }
-
- virtual ~field_map_3d() {
- }
-
- virtual SAXObject::Type type() {
- return SAXObject::element;
- }
+ field_map_3d()
+ {
+ }
+
+ virtual ~field_map_3d()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.4 -r1.5 --- generator.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ generator.hh 24 Jun 2013 22:10:34 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/generator.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/generator.hh,v 1.5 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_GENERATOR_HH #define LCDD_GENERATOR_HH 1
@@ -8,22 +8,24 @@
#include "GeneratorType.hh" /**
- @class generator - @brief generator element from schema. -*/ -class generator : public SAXObject, public GeneratorType
+ @class generator + @brief generator element from schema. + */ +class generator: public SAXObject, public GeneratorType
{
public:
- generator()
- {}
-
- virtual ~generator()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ generator()
+ {
+ }
+
+ virtual ~generator()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.5 -r1.6 --- global_field.hh 18 Dec 2006 22:49:02 -0000 1.5 +++ global_field.hh 24 Jun 2013 22:10:34 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/global_field.hh,v 1.5 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/global_field.hh,v 1.6 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_GLOBAL_FIELD_HH #define LCDD_GLOBAL_FIELD_HH 1
@@ -8,22 +8,24 @@
#include "GlobalFieldType.hh" /**
- @class global_field - @brief global_field element from schema.
+ @class global_field + @brief global_field element from schema.
*/
-class global_field : public SAXObject, public GlobalFieldType
+class global_field: public SAXObject, public GlobalFieldType
{
public:
- global_field()
- {}
-
- virtual ~global_field()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ global_field()
+ {
+ }
+
+ virtual ~global_field()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.1 -r1.2 --- global_grid_xy.hh 30 Oct 2009 23:16:59 -0000 1.1 +++ global_grid_xy.hh 24 Jun 2013 22:10:34 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/global_grid_xy.hh,v 1.1 2009/10/30 23:16:59 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/global_grid_xy.hh,v 1.2 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_GLOBAL_GRID_XY_HH #define LCDD_GLOBAL_GRID_XY_HH 1
@@ -9,25 +9,27 @@
#include "Saxana/SAXObject.h" /**
- @class GlobalGridXYSegmentationType - @brief GlobalGridXYSegmentation from schema.
+ @class GlobalGridXYSegmentationType + @brief GlobalGridXYSegmentation from schema.
*/
-class global_grid_xy : public SAXObject, public GlobalGridXYSegmentationType
+class global_grid_xy: public SAXObject, public GlobalGridXYSegmentationType
{
- public:
+public:
- global_grid_xy()
- {}
-
- virtual ~global_grid_xy()
- {}
-
- public:
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ global_grid_xy()
+ {
+ }
+
+ virtual ~global_grid_xy()
+ {
+ }
+
+public:
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.4 -r1.5 --- grid_xyz.hh 3 Nov 2009 00:48:12 -0000 1.4 +++ grid_xyz.hh 24 Jun 2013 22:10:34 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/grid_xyz.hh,v 1.4 2009/11/03 00:48:12 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/grid_xyz.hh,v 1.5 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_GRID_XYZ_HH #define LCDD_GRID_XYZ_HH 1
@@ -8,23 +8,25 @@
#include "Saxana/SAXObject.h" /**
- @class grid_xyz - @brief grid_xyz element from schema.
+ @class grid_xyz + @brief grid_xyz element from schema.
*/
-class grid_xyz : public SAXObject, public NonprojectiveSegmentationType
+class grid_xyz: public SAXObject, public NonprojectiveSegmentationType
{
-
- public:
- grid_xyz()
- {}
-
- virtual ~grid_xyz()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+
+public:
+ grid_xyz()
+ {
+ }
+
+ virtual ~grid_xyz()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.4 -r1.5 --- header.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ header.hh 24 Jun 2013 22:10:34 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/header.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/header.hh,v 1.5 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_HEADER_HH #define LCDD_HEADER_HH 1
@@ -8,22 +8,24 @@
#include "HeaderType.hh" /**
- @class header - @brief header element from schema. -*/ -class header : public SAXObject, public HeaderType
+ @class header + @brief header element from schema. + */ +class header: public SAXObject, public HeaderType
{
public:
- header()
- {}
-
- virtual ~header()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ header()
+ {
+ }
+
+ virtual ~header()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.4 -r1.5 --- idfieldElem.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ idfieldElem.hh 24 Jun 2013 22:10:34 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/idfieldElem.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/idfieldElem.hh,v 1.5 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_IDFIELDELEM_HH #define LCDD_IDFIELDELEM_HH 1
@@ -7,22 +7,24 @@
#include "IdFieldType.hh" /**
- @class idfieldElem - @brief idfield element from schema.
+ @class idfieldElem + @brief idfield element from schema.
*/
-class idfieldElem : public SAXObject, public IdFieldType
+class idfieldElem: public SAXObject, public IdFieldType
{
public:
- idfieldElem()
- {}
-
- virtual ~idfieldElem()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ idfieldElem()
+ {
+ }
+
+ virtual ~idfieldElem()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.3 -r1.4 --- idspecElem.hh 18 Dec 2006 22:49:02 -0000 1.3 +++ idspecElem.hh 24 Jun 2013 22:10:34 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/idspecElem.hh,v 1.3 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/idspecElem.hh,v 1.4 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_IDSPECELEM_HH #define LCDD_IDSPECELEM_HH
@@ -7,23 +7,25 @@
#include "IdSpecType.hh" /**
- @class idspecElem - @brief idspec element class. -*/ -class idspecElem : public SAXObject, public IdSpecType
+ @class idspecElem + @brief idspec element class. + */ +class idspecElem: public SAXObject, public IdSpecType
{
public:
- idspecElem()
- {}
-
- virtual ~idspecElem()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ idspecElem()
+ {
+ }
+
+ virtual ~idspecElem()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.5 -r1.6 --- limit.hh 18 Dec 2006 22:49:02 -0000 1.5 +++ limit.hh 24 Jun 2013 22:10:34 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/limit.hh,v 1.5 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/limit.hh,v 1.6 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_LIMIT_HH #define LCDD_LIMIT_HH 1
@@ -10,19 +10,21 @@
* @class limit * @brief Element limit from the lcdd_limits.lcdd subschema. */
-class limit : public SAXObject, public LimitParamType
+class limit: public SAXObject, public LimitParamType
{
public:
- limit()
- {}
-
- virtual ~limit()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ limit()
+ {
+ }
+
+ virtual ~limit()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.4 -r1.5 --- limitset.hh 18 Dec 2006 22:49:02 -0000 1.4 +++ limitset.hh 24 Jun 2013 22:10:34 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/limitset.hh,v 1.4 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/limitset.hh,v 1.5 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_LIMITSET_HH #define LCDD_LIMITSET_HH 1
@@ -10,20 +10,22 @@
* @class limitset * @brief Element limitset from the lcdd_limits.lcdd subschema. */
-class limitset : public SAXObject, public LimitSetType
+class limitset: public SAXObject, public LimitSetType
{
public:
- limitset()
- {}
-
- virtual ~limitset()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ limitset()
+ {
+ }
+
+ virtual ~limitset()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.3 -r1.4 --- nonprojective_cylinder.hh 18 Dec 2006 22:49:02 -0000 1.3 +++ nonprojective_cylinder.hh 24 Jun 2013 22:10:34 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/nonprojective_cylinder.hh,v 1.3 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/nonprojective_cylinder.hh,v 1.4 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_NONPROJECTIVE_CYLINDER_HH #define LCDD_NONPROJECTIVE_CYLINDER_HH 1
@@ -8,23 +8,25 @@
#include "Saxana/SAXObject.h" /**
- @class nonprojective_cylinder - @brief nonprojective_cylinder element from schema. -*/ -class nonprojective_cylinder : public SAXObject, public NonprojectiveCylinderSegmentationType
+ @class nonprojective_cylinder + @brief nonprojective_cylinder element from schema. + */ +class nonprojective_cylinder: public SAXObject, public NonprojectiveCylinderSegmentationType
{
public:
- nonprojective_cylinder()
- {}
-
- virtual ~nonprojective_cylinder()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ nonprojective_cylinder()
+ {
+ }
+
+ virtual ~nonprojective_cylinder()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.1 -r1.2 --- optical_calorimeter.hh 5 Jul 2007 22:27:35 -0000 1.1 +++ optical_calorimeter.hh 24 Jun 2013 22:10:34 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/optical_calorimeter.hh,v 1.1 2007/07/05 22:27:35 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/optical_calorimeter.hh,v 1.2 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_OPTICAL_CALORIMETER_HH #define LCDD_OPTICAL_CALORIMETER_HH 1
@@ -8,22 +8,24 @@
/**
- @class optical_calorimeter - @brief optical_calorimeter element from schema.
+ @class optical_calorimeter + @brief optical_calorimeter element from schema.
*/
-class optical_calorimeter : public SAXObject, public OpticalCalorimeterType
+class optical_calorimeter: public SAXObject, public OpticalCalorimeterType
{
public:
- optical_calorimeter()
- {}
-
- virtual ~optical_calorimeter()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
-};
+ optical_calorimeter()
+ {
+ }
+
+ virtual ~optical_calorimeter()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
+};
#endif
diff -u -r1.2 -r1.3 --- physvolidElem.hh 4 Mar 2005 22:51:04 -0000 1.2 +++ physvolidElem.hh 24 Jun 2013 22:10:34 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/physvolidElem.hh,v 1.2 2005/03/04 22:51:04 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/physvolidElem.hh,v 1.3 2013/06/24 22:10:34 jeremy Exp $
#ifndef physvolid_hh #define physvolid_hh 1
@@ -7,24 +7,25 @@
#include "PhysVolIdType.hh" /**
- @class physvolidElem - @brief physvolid element from schema.
+ @class physvolidElem + @brief physvolid element from schema.
*/
-class physvolidElem : public SAXObject, public PhysVolIdType
+class physvolidElem: public SAXObject, public PhysVolIdType
{
public:
- physvolidElem()
- {}
-
- virtual ~physvolidElem()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ physvolidElem()
+ {
+ }
+
+ virtual ~physvolidElem()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
};
-
#endif
diff -u -r1.3 -r1.4 --- projective_cylinder.hh 18 Dec 2006 22:49:02 -0000 1.3 +++ projective_cylinder.hh 24 Jun 2013 22:10:34 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/projective_cylinder.hh,v 1.3 2006/12/18 22:49:02 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/projective_cylinder.hh,v 1.4 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_PROJECTIVE_CYLINDER_HH #define LCDD_PROJECTIVE_CYLINDER_HH 1
@@ -8,23 +8,25 @@
#include "Saxana/SAXObject.h" /**
- @class projective_cylinder - @brief projective_cylinder element from schema. -*/ -class projective_cylinder : public SAXObject, public ProjectiveCylinderSegmentationType
+ @class projective_cylinder + @brief projective_cylinder element from schema. + */ +class projective_cylinder: public SAXObject, public ProjectiveCylinderSegmentationType
{
public:
- projective_cylinder()
- {}
-
- virtual ~projective_cylinder()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ projective_cylinder()
+ {
+ }
+
+ virtual ~projective_cylinder()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.3 -r1.4 --- projective_zplane.hh 18 Dec 2006 22:49:03 -0000 1.3 +++ projective_zplane.hh 24 Jun 2013 22:10:34 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/projective_zplane.hh,v 1.3 2006/12/18 22:49:03 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/projective_zplane.hh,v 1.4 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_PROJECTIVE_ZPLANE_HH #define LCDD_PROJECTIVE_ZPLANE_HH 1
@@ -8,23 +8,25 @@
#include "Saxana/SAXObject.h" /**
- @class projective_zplane - @brief projective_zplane element from schema. -*/ -class projective_zplane : public SAXObject, public ProjectiveZPlaneSegmentationType
+ @class projective_zplane + @brief projective_zplane element from schema. + */ +class projective_zplane: public SAXObject, public ProjectiveZPlaneSegmentationType
{
-
-public:
- projective_zplane()
- {}
-
- virtual ~projective_zplane()
- {}
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+public:
+ projective_zplane()
+ {
+ }
+
+ virtual ~projective_zplane()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.4 -r1.5 --- region.hh 18 Dec 2006 22:49:03 -0000 1.4 +++ region.hh 24 Jun 2013 22:10:34 -0000 1.5 @@ -6,22 +6,24 @@
#include "RegionType.hh" /**
- @class region - @brief region element from schema. -*/ -class region : public SAXObject, public RegionType
+ @class region + @brief region element from schema. + */ +class region: public SAXObject, public RegionType
{
public:
- region()
- {}
+ region()
+ {
+ }
- virtual ~region()
- {}
+ virtual ~region()
+ {
+ }
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.4 -r1.5 --- rz_field_map.hh 18 Dec 2006 22:49:03 -0000 1.4 +++ rz_field_map.hh 24 Jun 2013 22:10:34 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/rz_field_map.hh,v 1.4 2006/12/18 22:49:03 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/rz_field_map.hh,v 1.5 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_RZ_FIELD_MAP_HH #define LCDD_RZ_FIELD_MAP_HH 1
@@ -8,19 +8,21 @@
* @class rz_field_map * @brief The rz_field_map element from lcdd_fields.xsd subschema. */
-class rz_field_map : public SAXObject, public RZFieldMapType
+class rz_field_map: public SAXObject, public RZFieldMapType
{
public:
- rz_field_map()
- {}
+ rz_field_map()
+ {
+ }
- virtual ~rz_field_map()
- {}
+ virtual ~rz_field_map()
+ {
+ }
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.3 -r1.4 --- rzb.hh 18 Dec 2006 22:49:03 -0000 1.3 +++ rzb.hh 24 Jun 2013 22:10:34 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/rzb.hh,v 1.3 2006/12/18 22:49:03 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/rzb.hh,v 1.4 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_RZB_HH #define LCDD_RZB_HH 1
@@ -10,19 +10,21 @@
* @class rzb * @brief The rzB element from lcdd_fields.xsd subschema. */
-class rzb : public SAXObject, public RZBType
+class rzb: public SAXObject, public RZBType
{
public:
- rzb()
- {}
-
- virtual ~rzb()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ rzb()
+ {
+ }
+
+ virtual ~rzb()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.3 -r1.4 --- scorer.hh 18 Dec 2006 22:49:03 -0000 1.3 +++ scorer.hh 24 Jun 2013 22:10:34 -0000 1.4 @@ -10,19 +10,21 @@
* @class scorer * @brief scorer element from schema. */
-class scorer : public SAXObject, public ScorerType
+class scorer: public SAXObject, public ScorerType
{
public:
- scorer()
- {}
+ scorer()
+ {
+ }
- virtual ~scorer()
- {}
+ virtual ~scorer()
+ {
+ }
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.3 -r1.4 --- sensitive_detector.hh 18 Dec 2006 22:49:03 -0000 1.3 +++ sensitive_detector.hh 24 Jun 2013 22:10:34 -0000 1.4 @@ -6,22 +6,24 @@
#include "SensitiveDetectorType.hh" /**
- @class sensitive_detector - @brief sensitive_detector element from schema. -*/ -class sensitive_detector : public SAXObject, public SensitiveDetectorType
+ @class sensitive_detector + @brief sensitive_detector element from schema. + */ +class sensitive_detector: public SAXObject, public SensitiveDetectorType
{
public:
- sensitive_detector()
- {}
+ sensitive_detector()
+ {
+ }
- virtual ~sensitive_detector()
- {}
+ virtual ~sensitive_detector()
+ {
+ }
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.5 -r1.6 --- solenoid.hh 22 Jun 2011 23:54:25 -0000 1.5 +++ solenoid.hh 24 Jun 2013 22:10:34 -0000 1.6 @@ -1,4 +1,4 @@
-// $Id: solenoid.hh,v 1.5 2011/06/22 23:54:25 jeremy Exp $
+// $Id: solenoid.hh,v 1.6 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_SOLENOID_HH #define LCDD_SOLENOID_HH
@@ -7,23 +7,25 @@
#include "Saxana/SAXObject.h" /**
- @class solenoid - @brief solenoid element from schema. -*/
+ @class solenoid + @brief solenoid element from schema. + */
-class solenoid : public SAXObject, public SolenoidType
+class solenoid: public SAXObject, public SolenoidType
{
public:
- solenoid()
- {}
-
- virtual ~solenoid()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ solenoid()
+ {
+ }
+
+ virtual ~solenoid()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.6 -r1.7 --- tracker.hh 18 Dec 2006 22:49:03 -0000 1.6 +++ tracker.hh 24 Jun 2013 22:10:34 -0000 1.7 @@ -10,20 +10,22 @@
* @class tracker * @brief tracker element from schema. */
-class tracker : public SAXObject, public TrackerType
+class tracker: public SAXObject, public TrackerType
{
public:
- tracker()
- {}
+ tracker()
+ {
+ }
- virtual ~tracker()
- {}
+ virtual ~tracker()
+ {
+ }
- virtual SAXObject::Type type()
- {
- //std::cout << "tracker::type()" << std::endl;
- return SAXObject::element;
- }
+ virtual SAXObject::Type type()
+ {
+ //std::cout << "tracker::type()" << std::endl;
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.1 -r1.2 --- unsegmented_calorimeter.hh 7 Dec 2010 00:52:00 -0000 1.1 +++ unsegmented_calorimeter.hh 24 Jun 2013 22:10:34 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/unsegmented_calorimeter.hh,v 1.1 2010/12/07 00:52:00 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/unsegmented_calorimeter.hh,v 1.2 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_UNSEGMENTEDCALORIMETER_HH #define LCDD_UNSEGMENTEDCALORIMETER_HH
@@ -8,22 +8,24 @@
/**
- @class unsegmented_calorimeter - @brief unsegmented_calorimeter element from LCDD schema.
+ @class unsegmented_calorimeter + @brief unsegmented_calorimeter element from LCDD schema.
*/
-class unsegmented_calorimeter : public SAXObject, public UnsegmentedCalorimeterType
+class unsegmented_calorimeter: public SAXObject, public UnsegmentedCalorimeterType
{
public:
- unsegmented_calorimeter()
- {}
-
- virtual ~unsegmented_calorimeter()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ unsegmented_calorimeter()
+ {
+ }
+
+ virtual ~unsegmented_calorimeter()
+ {
+ }
+
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.3 -r1.4 --- vis.hh 18 Dec 2006 22:49:03 -0000 1.3 +++ vis.hh 24 Jun 2013 22:10:34 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/vis.hh,v 1.3 2006/12/18 22:49:03 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/vis.hh,v 1.4 2013/06/24 22:10:34 jeremy Exp $
#ifndef LCDD_VIS_HH #define LCDD_VIS_HH 1
@@ -8,22 +8,24 @@
// LCDD #include "VisType.hh" /**
- @class vis - @brief vis element from schema. -*/ -class vis : public SAXObject, public VisType
+ @class vis + @brief vis element from schema. + */ +class vis: public SAXObject, public VisType
{
public:
- vis()
- {}
+ vis()
+ {
+ }
- virtual ~vis()
- {}
+ virtual ~vis()
+ {
+ }
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
+ virtual SAXObject::Type type()
+ {
+ return SAXObject::element;
+ }
}; #endif
diff -u -r1.1 -r1.2 --- volumeExtendedSubscriber.hh 19 Jun 2007 23:55:04 -0000 1.1 +++ volumeExtendedSubscriber.hh 24 Jun 2013 22:10:34 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/volumeExtendedSubscriber.hh,v 1.1 2007/06/19 23:55:04 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/volumeExtendedSubscriber.hh,v 1.2 2013/06/24 22:10:34 jeremy Exp $
// GDML #include "Saxana/SAXSubscriber.h"
@@ -30,21 +30,21 @@
#include <iostream> /**
- @class volumeExtendedSubscriber - @brief SAX subscriber to handle extra LCDD tags on volume element. - @note This is the major subscriber extension class for the LCDD package. -*/ -class volumeExtendedSubscriber : virtual public SAXSubscriber
+ @class volumeExtendedSubscriber + @brief SAX subscriber to handle extra LCDD tags on volume element. + @note This is the major subscriber extension class for the LCDD package. + */ +class volumeExtendedSubscriber: virtual public SAXSubscriber
{
public:
- virtual const SAXComponentObject* Build() const;
+ virtual const SAXComponentObject* Build() const;
public:
- volumeExtendedSubscriber();
+ volumeExtendedSubscriber();
- virtual ~volumeExtendedSubscriber();
+ virtual ~volumeExtendedSubscriber();
- virtual void Activate( const SAXObject* object);
+ virtual void Activate(const SAXObject* object);
}; //DECLARE_SUBSCRIBER_FACTORY(volumeExtendedSubscriber)
diff -u -r1.1 -r1.2 --- CalorimeterHitProcessor.cc 18 Jun 2013 19:56:18 -0000 1.1 +++ CalorimeterHitProcessor.cc 24 Jun 2013 22:10:36 -0000 1.2 @@ -6,8 +6,8 @@
// Geant4 #include "G4NavigationHistory.hh"
-CalorimeterHitProcessor::CalorimeterHitProcessor(CellReadout* readout) - : m_readout(readout)
+CalorimeterHitProcessor::CalorimeterHitProcessor(CellReadout* readout) : + m_readout(readout)
{
}
diff -u -r1.3 -r1.4 --- CellReadout2D.cc 18 Jun 2013 19:59:34 -0000 1.3 +++ CellReadout2D.cc 24 Jun 2013 22:10:36 -0000 1.4 @@ -84,14 +84,14 @@
iy = cellId[1] - 1;
if (iy == 0)
iy = -1;
- neighbors.push_back(createCell(ix-1, iy-1));
+ neighbors.push_back(createCell(ix - 1, iy - 1));
// bottom middle
ix = cellId[0];
iy = cellId[1] - 1;
if (iy == 0)
iy = -1;
- neighbors.push_back(createCell(ix, iy-1));
+ neighbors.push_back(createCell(ix, iy - 1));
// bottom right
ix = cellId[0] + 1;
@@ -100,7 +100,7 @@
iy = cellId[1] - 1;
if (iy == 0)
iy = -1;
- neighbors.push_back(createCell(ix, iy-1));
+ neighbors.push_back(createCell(ix, iy - 1));
return neighbors;
diff -u -r1.3 -r1.4 --- CellReadout2DSegmentation.cc 18 Jun 2013 20:00:10 -0000 1.3 +++ CellReadout2DSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.4 @@ -10,13 +10,15 @@
// STL #include <cmath>
-CellReadout2DSegmentation::CellReadout2DSegmentation(double cellSizeX, double cellSizeY)
- : G4Segmentation(G4Segmentation::eNonprojective, 2) {
+CellReadout2DSegmentation::CellReadout2DSegmentation(double cellSizeX, double cellSizeY) :
+ G4Segmentation(G4Segmentation::eNonprojective, 2)
+{
m_readout = new CellReadout2D(cellSizeX, cellSizeY);
setBinNames();
}
-CellReadout2DSegmentation::~CellReadout2DSegmentation() {
+CellReadout2DSegmentation::~CellReadout2DSegmentation()
+{
delete m_readout; }
diff -u -r1.1 -r1.2 --- Cerenkov.cc 17 Jun 2013 22:07:33 -0000 1.1 +++ Cerenkov.cc 24 Jun 2013 22:10:36 -0000 1.2 @@ -13,18 +13,21 @@
#include "G4ThreeVector.hh" #include<iomanip>
-Cerenkov::Cerenkov() {
+Cerenkov::Cerenkov()
+{
Initialize(); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-Cerenkov::~Cerenkov() {
+Cerenkov::~Cerenkov()
+{
} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void Cerenkov::Initialize() {
+void Cerenkov::Initialize()
+{
//
// now get the Cerenkov Angle Integrals for all materials that have the refraction index defined
//
@@ -46,7 +49,7 @@
// Create first (photon energy, Cerenkov Integral) pair
G4double currentPM = theRefractionIndexVector->Energy(0);
G4double currentCAI = 0.0;
- CerAngleIntegrals-> InsertValues(currentPM, currentCAI);
+ CerAngleIntegrals->InsertValues(currentPM, currentCAI);
// Set previous values to current ones prior to loop
G4double prevPM = currentPM;
G4double prevCAI = currentCAI;
@@ -58,7 +61,7 @@
currentPM = theRefractionIndexVector->Energy(ii);
currentCAI = 0.5 * (1.0 / (prevRI * prevRI) + 1.0 / (currentRI * currentRI));
currentCAI = prevCAI + (currentPM - prevPM) * currentCAI;
- CerAngleIntegrals ->InsertValues(currentPM, currentCAI);
+ CerAngleIntegrals->InsertValues(currentPM, currentCAI);
prevPM = currentPM;
prevCAI = currentCAI;
prevRI = currentRI;
@@ -70,7 +73,7 @@
theRefractionIndexVector->DumpValues();
G4cout << "Cerenkov angle Integrals: " << G4endl;
G4cout << "=========================" << G4endl;
- CerAngleIntegrals ->DumpValues();
+ CerAngleIntegrals->DumpValues();
CAI.push_back(aMaterial->GetName());
CerenkovAngleIntegrals.push_back(CerAngleIntegrals);
RefractionIndeces.push_back(theRefractionIndexVector);
@@ -84,7 +87,8 @@
// GEANT-unit (millimeter) in the current medium. // ^^^^^^^^^^
-G4double Cerenkov::GetAverageNumberOfPhotons(const G4double charge, const G4double beta, const G4String Material) const {
+G4double Cerenkov::GetAverageNumberOfPhotons(const G4double charge, const G4double beta, const G4String Material) const
+{
G4bool Ceren = false;
G4int MaterialIndex = -1;
//
@@ -97,10 +101,13 @@
break;
}
}
- if (!Ceren)return 0.0;
+ if (!Ceren) + return 0.0;
const G4double Rfact = 369.81 / (eV * cm);
- if (beta <= 0.0)return 0.0; - if (abs(charge) == 0.0) return 0.0;
+ if (beta <= 0.0) + return 0.0; + if (abs(charge) == 0.0) + return 0.0;
G4double BetaInverse = 1. / beta;
// Min and Max photon energies
@@ -120,16 +127,16 @@
if (nMax < BetaInverse) {
dp = 0;
ge = 0;
- }// otherwise if n(Pmin) >= 1/Beta -- photons generated
+ } // otherwise if n(Pmin) >= 1/Beta -- photons generated
else if (nMin > BetaInverse) {
dp = Pmax - Pmin;
ge = CAImax;
- }// If n(Pmin) < 1/Beta, and n(Pmax) >= 1/Beta, then - // we need to find a P such that the value of n(P) == 1/Beta. - // Interpolation is performed by the GetEnergy() and - // Value() methods of the G4MaterialPropertiesTable and - // the GetValue() method of G4PhysicsVector.
+ } // If n(Pmin) < 1/Beta, and n(Pmax) >= 1/Beta, then + // we need to find a P such that the value of n(P) == 1/Beta. + // Interpolation is performed by the GetEnergy() and + // Value() methods of the G4MaterialPropertiesTable and + // the GetValue() method of G4PhysicsVector.
else {
Pmin = RefractionIndeces[MaterialIndex]->GetEnergy(BetaInverse);
@@ -143,8 +150,7 @@
}
// Calculate number of photons
- G4double NumPhotons = Rfact * charge / eplus * charge / eplus * - (dp - ge * BetaInverse * BetaInverse);
+ G4double NumPhotons = Rfact * charge / eplus * charge / eplus * (dp - ge * BetaInverse * BetaInverse);
return NumPhotons; }
diff -u -r1.1 -r1.2 --- G4BoxDipole.cc 23 Jun 2011 21:04:10 -0000 1.1 +++ G4BoxDipole.cc 24 Jun 2013 22:10:36 -0000 1.2 @@ -1,24 +1,16 @@
-// $Id: G4BoxDipole.cc,v 1.1 2011/06/23 21:04:10 jeremy Exp $
+// $Id: G4BoxDipole.cc,v 1.2 2013/06/24 22:10:36 jeremy Exp $
#include "G4BoxDipole.hh" //#include <iostream>
-G4BoxDipole::G4BoxDipole(double x, - double y, - double z, - double dx, - double dy, - double dz, - double bx, - double by, - double bz) - : _x(x), _y(y), _z(z), _dx(dx), _dy(dy), _dz(dz), _bx(bx), _by(by), _bz(bz)
+G4BoxDipole::G4BoxDipole(double x, double y, double z, double dx, double dy, double dz, double bx, double by, double bz) : + _x(x), _y(y), _z(z), _dx(dx), _dy(dy), _dz(dz), _bx(bx), _by(by), _bz(bz)
{
_maxx = x + dx;
_maxy = y + dy;
_maxz = z + dz;
-
+
_minx = x - dx;
_miny = y - dy;
_minz = z - dz;
diff -u -r1.13 -r1.14 --- G4CalorimeterHit.cc 23 Aug 2011 22:40:52 -0000 1.13 +++ G4CalorimeterHit.cc 24 Jun 2013 22:10:36 -0000 1.14 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4CalorimeterHit.cc,v 1.13 2011/08/23 22:40:52 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4CalorimeterHit.cc,v 1.14 2013/06/24 22:10:36 jeremy Exp $
// LCDD #include "G4CalorimeterHit.hh"
@@ -15,18 +15,24 @@
G4Allocator<G4CalorimeterHit> G4CalorimeterHitAllocator; G4CalorimeterHit::G4CalorimeterHit() :
- G4VHit(), m_edep(0)
-{;}
+ G4VHit(), m_edep(0)
+{
+ ;
+}
G4CalorimeterHit::G4CalorimeterHit(G4double edep, G4ThreeVector globalCellPos) :
- G4VHit(), m_edep(edep), m_pos(globalCellPos)
-{;}
+ G4VHit(), m_edep(edep), m_pos(globalCellPos)
+{
+ ;
+}
G4CalorimeterHit::~G4CalorimeterHit()
-{;}
+{
+ ;
+}
G4CalorimeterHit::G4CalorimeterHit(const G4CalorimeterHit &right) :
- G4VHit()
+ G4VHit()
{
m_edep = right.m_edep;
m_pos = right.m_pos;
@@ -69,8 +75,7 @@
{
printMcpHitContribsHeader(os);
- for (McpHitContribList::iterator iter = m_particleList.begin(); iter != m_particleList.end(); iter++)
- {
+ for (McpHitContribList::iterator iter = m_particleList.begin(); iter != m_particleList.end(); iter++) {
(*iter).printOut(os);
}
}
diff -u -r1.40 -r1.41 --- G4CalorimeterSD.cc 30 May 2013 00:04:12 -0000 1.40 +++ G4CalorimeterSD.cc 24 Jun 2013 22:10:36 -0000 1.41 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4CalorimeterSD.cc,v 1.40 2013/05/30 00:04:12 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4CalorimeterSD.cc,v 1.41 2013/06/24 22:10:36 jeremy Exp $
#include "G4CalorimeterSD.hh" // lcdd
@@ -22,96 +22,77 @@
using std::vector;
-G4CalorimeterSD::G4CalorimeterSD(G4String sdName, - G4String hcName, - G4Segmentation* sdSeg, - HitComparator* compare) - : G4SensitiveDetector(sdName, - hcName, - G4SensitiveDetector::eCalorimeter), - m_segmentation(sdSeg)
+G4CalorimeterSD::G4CalorimeterSD(G4String sdName, G4String hcName, G4Segmentation* sdSeg, HitComparator* compare) : + G4SensitiveDetector(sdName, hcName, G4SensitiveDetector::eCalorimeter), m_segmentation(sdSeg)
{
m_hitsCollections.push_back(m_collection);
m_hits.clear();
hits_vector.clear();
hits_vector.push_back(m_hits);
- if (compare == 0)
+ if (compare == 0)
m_hitCompare = new PositionComparator();
- else
+ else
m_hitCompare = compare; }
-G4CalorimeterSD::G4CalorimeterSD(G4String sdName, - const vector<G4String>& hcNames, - G4Segmentation* sdSeg, - HitComparator* compare) - : G4SensitiveDetector(sdName, - hcNames, - G4SensitiveDetector::eCalorimeter), - m_segmentation(sdSeg)
+G4CalorimeterSD::G4CalorimeterSD(G4String sdName, const vector<G4String>& hcNames, G4Segmentation* sdSeg, HitComparator* compare) : + G4SensitiveDetector(sdName, hcNames, G4SensitiveDetector::eCalorimeter), m_segmentation(sdSeg)
{
m_hits.clear();
hits_vector.clear();
hits_vector.push_back(m_hits);
- for (int i = 0; i < (int)hcNames.size(); i++)
- {
+ for (int i = 0; i < (int) hcNames.size(); i++) {
hits_vector.push_back(m_hits);
hits_vector[i].clear();
m_hitsCollections.push_back(m_collection);
}
-
- if (compare == 0)
- {
+
+ if (compare == 0) {
m_hitCompare = new PositionComparator();
- }
- else
- {
+ } else {
m_hitCompare = compare;
}
}
-
G4CalorimeterSD::~G4CalorimeterSD()
-{}
+{
+}
-bool G4CalorimeterSD::isValidVolume(G4LogicalVolume* lv)
+bool G4CalorimeterSD::isValidVolume(G4LogicalVolume* lv)
{
bool valid = G4SensitiveDetector::isValidVolume(lv);
-
- if (valid && m_segmentation != 0)
- {
+
+ if (valid && m_segmentation != 0) {
valid = m_segmentation->isValidSolid(lv->GetSolid());
}
-
+
return valid; }
-void G4CalorimeterSD::Initialize(G4HCofThisEvent *HCE)
-{
+void G4CalorimeterSD::Initialize(G4HCofThisEvent *HCE)
+{
clearHits();
// new cal hits collection
- for(int i=0; i<getNumberOfHitsCollections(); i++)
- {
+ for (int i = 0; i < getNumberOfHitsCollections(); i++) {
m_hitsCollections[i] = new G4CalorimeterHitsCollection(GetName(), collectionName[i]);
// set HCID
- if (getHCID(i) < 0)
- {
+ if (getHCID(i) < 0) {
setHCID(GetCollectionID(i), i);
}
-
+
// add collection to HC of event
HCE->AddHitsCollection(getHCID(i), m_hitsCollections[i]);
}
}
-G4Segmentation* G4CalorimeterSD::getSegmentation() const
+G4Segmentation* G4CalorimeterSD::getSegmentation() const
{
return m_segmentation;
}
-G4bool G4CalorimeterSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
+G4bool G4CalorimeterSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
{
#ifdef G4VERBOSE
if (getVerbose() > 0)
@@ -122,10 +103,10 @@
// set cached step
G4SensitiveDetector::ProcessHits(aStep, 0);
-
+
// get the edep
G4double theEdep = edep();
-
+
// This needs to be a <= comparison for cutting on 0,
// Geantinos, which always have 0 edep, are allowed.
if (theEdep <= getEcut() && !isGeantino()) {
@@ -136,19 +117,19 @@
#endif
return false;
}
-
+
// Get global cell pos from segmentation.
G4ThreeVector globalCellPos = m_segmentation->getGlobalHitPos(aStep);
-
+
// Reset the segmentation bin values.
m_segmentation->resetBins();
-
+
// Set the segmentation bin values from the step.
m_segmentation->setBins(aStep);
-
+
// Create a 64-bit ID.
Id64bit id64 = makeId();
-
+
// DEBUG: Compute step midpoint and compare to the cell pos
#ifdef G4VERBOSE
if ( getVerbose() > 2 ) {
@@ -157,15 +138,15 @@
std::cout << "globalCellPos - globalMidPos = " << globalCellPos - globalMidPos << std::endl;
}
#endif
-
+
// find hit by simple lkp of new hit with above info
G4CalorimeterHit* thisHit = new G4CalorimeterHit(theEdep, globalCellPos);
thisHit->setId64bit(id64.getId0(), id64.getId1());
- G4CalorimeterHit* fndHit = 0; -
+ G4CalorimeterHit* fndHit = 0; +
// hit is not found?
- if (!( fndHit = findHit(thisHit))) {
-
+ if (!(fndHit = findHit(thisHit))) {
+
#ifdef G4VERBOSE
if (getVerbose() > 1) {
std::cout << "G4CalorimeterSD::ProcessHits - new hit" << std::endl;
@@ -173,43 +154,41 @@
#endif
// add it to lkp map
hits_vector[0].push_back(thisHit);
-
+
// add to the HC
m_hitsCollections[0]->insert(thisHit);
}
// found a hit
else {
-
+
#ifdef G4VERBOSE
if ( getVerbose() > 2 ) {
std::cout << "G4CalorimeterSD::ProcessHits - existing hit" << std::endl;
}
#endif
-
+
// don't need to insert thisHit, so delete it
delete thisHit;
thisHit = 0;
-
+
// incr total edep of the hit
fndHit->incrEdep(theEdep);
-
+
// for setting contrib
thisHit = fndHit;
}
-
+
// add McpHitContrib to this hit, setting info from step info
thisHit->addMcpHitContrib(McpHitContrib(aStep));
-
+
return true; }
-G4CalorimeterHit* G4CalorimeterSD::findHit(G4CalorimeterHit* aHit) const
+G4CalorimeterHit* G4CalorimeterSD::findHit(G4CalorimeterHit* aHit) const
{
G4CalorimeterHit* fndHit = 0;
- for (G4CalorimeterHitList::const_iterator iter = hits_vector[0].begin();
- iter != hits_vector[0].end();
- iter++) {
- if ( m_hitCompare->compare(**iter, *aHit) ) {
+ for (G4CalorimeterHitList::const_iterator iter = hits_vector[0].begin(); iter != hits_vector[0].end(); iter++) {
+ if (m_hitCompare->compare(**iter, *aHit)) {
fndHit = *iter;
break;
}
@@ -217,13 +196,11 @@
return fndHit; }
-G4CalorimeterHit* G4CalorimeterSD::findHit(G4CalorimeterHit* aHit, G4int nHC) const
+G4CalorimeterHit* G4CalorimeterSD::findHit(G4CalorimeterHit* aHit, G4int nHC) const
{
G4CalorimeterHit* fndHit = 0;
- for (G4CalorimeterHitList::const_iterator iter = hits_vector[nHC].begin();
- iter != hits_vector[nHC].end();
- iter++) {
- if ( m_hitCompare->compare(**iter, *aHit) ) {
+ for (G4CalorimeterHitList::const_iterator iter = hits_vector[nHC].begin(); iter != hits_vector[nHC].end(); iter++) {
+ if (m_hitCompare->compare(**iter, *aHit)) {
fndHit = *iter;
break;
}
@@ -231,13 +208,11 @@
return fndHit; }
-std::ostream& G4CalorimeterSD::printHits(std::ostream& os)
+std::ostream& G4CalorimeterSD::printHits(std::ostream& os)
{
- for(int i= 0; i < getNumberOfHitsCollections(); i++) {
+ for (int i = 0; i < getNumberOfHitsCollections(); i++) {
os << getHitsCollection(i)->GetName() << std::endl;
- for (G4CalorimeterHitList::const_iterator iter = hits_vector[i].begin();
- iter != hits_vector[i].end();
- iter++ ) {
+ for (G4CalorimeterHitList::const_iterator iter = hits_vector[i].begin(); iter != hits_vector[i].end(); iter++) {
os << " " << **iter;
}
}
@@ -245,8 +220,8 @@
return os; }
-void G4CalorimeterSD::EndOfEvent(G4HCofThisEvent *)
-{
+void G4CalorimeterSD::EndOfEvent(G4HCofThisEvent *)
+{
#ifdef G4VERBOSE
if ( getVerbose() > 1 ) {
printHits( std::cout );
@@ -254,56 +229,49 @@
#endif }
-std::ostream& G4CalorimeterSD::printBasicInfo(std::ostream& os)
+std::ostream& G4CalorimeterSD::printBasicInfo(std::ostream& os)
{
- G4SensitiveDetector::printBasicInfo( os );
- os << "segmentation type: " << m_segmentation->getTypeString() << std::endl;
- os << "segmentation bins:";
- for ( std::vector<std::string>::const_iterator it = m_segmentation->getBinNames().begin();
- it != m_segmentation->getBinNames().end();
- it++ ) {
+ G4SensitiveDetector::printBasicInfo(os);
+ os << "segmentation type: " << m_segmentation->getTypeString() << std::endl;
+ os << "segmentation bins:";
+ for (std::vector<std::string>::const_iterator it = m_segmentation->getBinNames().begin(); it != m_segmentation->getBinNames().end(); it++) {
os << " " << *it;
- } - os << std::endl;
+ } + os << std::endl;
return os; }
-double G4CalorimeterSD::getEdep() const
+double G4CalorimeterSD::getEdep() const
{
- double edep=0.0;
- for ( G4CalorimeterHitList::const_iterator it = hits_vector[0].begin();
- it != hits_vector[0].end();
- it++ ) {
+ double edep = 0.0;
+ for (G4CalorimeterHitList::const_iterator it = hits_vector[0].begin(); it != hits_vector[0].end(); it++) {
edep += (*it)->getEdep();
}
return edep;
}
-double G4CalorimeterSD::getEdep(G4int nHC) const
+double G4CalorimeterSD::getEdep(G4int nHC) const
{
- double edep=0.0;
- for ( G4CalorimeterHitList::const_iterator it = hits_vector[nHC].begin();
- it != hits_vector[nHC].end();
- it++ ) {
+ double edep = 0.0;
+ for (G4CalorimeterHitList::const_iterator it = hits_vector[nHC].begin(); it != hits_vector[nHC].end(); it++) {
edep += (*it)->getEdep();
}
return edep;
}
-void G4CalorimeterSD::clearHits()
+void G4CalorimeterSD::clearHits()
{
- for(int i= 0; i < getNumberOfHitsCollections(); i++)
- {
+ for (int i = 0; i < getNumberOfHitsCollections(); i++) {
hits_vector[i].clear();
}
}
-G4CalorimeterSD::G4CalorimeterHitList G4CalorimeterSD::getCalorimeterHitList()
+G4CalorimeterSD::G4CalorimeterHitList G4CalorimeterSD::getCalorimeterHitList()
{
return hits_vector[0];
}
-G4CalorimeterSD::G4CalorimeterHitList G4CalorimeterSD::getCalorimeterHitList(G4int nHC)
+G4CalorimeterSD::G4CalorimeterHitList G4CalorimeterSD::getCalorimeterHitList(G4int nHC)
{
return hits_vector[nHC];
}
diff -u -r1.5 -r1.6 --- G4Dipole.cc 3 Aug 2006 23:59:31 -0000 1.5 +++ G4Dipole.cc 24 Jun 2013 22:10:36 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4Dipole.cc,v 1.5 2006/08/03 23:59:31 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4Dipole.cc,v 1.6 2013/06/24 22:10:36 jeremy Exp $
#include "G4Dipole.hh"
@@ -9,104 +9,104 @@
* Apply polynomial fit of dipole field, with variable number of coefficients * read from the input XML file. */
-void G4Dipole::GetFieldValue( const double Point[3], double* Bfield ) const
+void G4Dipole::GetFieldValue(const double Point[3], double* Bfield) const
{
- //std::cout << "G4Dipole::GetFieldValue" << std::endl;
+ //std::cout << "G4Dipole::GetFieldValue" << std::endl;
- //std::cout << "point = " << Point[0] << " " << Point[1] << " " << Point[2] << std::endl; - //std::cout << "BEFORE --> bfield = " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl;
+ //std::cout << "point = " << Point[0] << " " << Point[1] << " " << Point[2] << std::endl; + //std::cout << "BEFORE --> bfield = " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl;
- double bx = 0; - double z = Point[2]; - double r = sqrt(Point[0] * Point[0] + Point[1] * Point[1]);
+ double bx = 0; + double z = Point[2]; + double r = sqrt(Point[0] * Point[0] + Point[1] * Point[1]);
- // Check if z coordinate is within dipole z bounds.
- if (z > m_zmin && z < m_zmax && r < m_rmax) {
+ // Check if z coordinate is within dipole z bounds.
+ if (z > m_zmin && z < m_zmax && r < m_rmax) {
- // Convert to absolute value z and apply specified length unit. - double zc = fabs(z) / m_lunit;
+ // Convert to absolute value z and apply specified length unit. + double zc = fabs(z) / m_lunit;
- //std::cout << "zc = " << zc << std::endl;
+ //std::cout << "zc = " << zc << std::endl;
- // Apply all coefficients to this z coordinate.
- for (size_t i=0; i<m_coeffs.size(); ++i) {
- bx += m_coeffs[i] * pow(zc,i) ;
- }
+ // Apply all coefficients to this z coordinate.
+ for (size_t i = 0; i < m_coeffs.size(); ++i) {
+ bx += m_coeffs[i] * pow(zc, i);
+ }
- // Convert to specified field unit. - bx *= m_funit;
+ // Convert to specified field unit. + bx *= m_funit;
- // Flip sign for negative z.
- if (z < 0) {
- bx = -bx;
- }
+ // Flip sign for negative z.
+ if (z < 0) {
+ bx = -bx;
+ }
- // Add Bx to the input Bfield. - Bfield[0] += bx; - }
+ // Add Bx to the input Bfield. + Bfield[0] += bx; + }
- //std::cout << "AFTER --> bfield = " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl << std::endl; - //std::cout << Point[2] << " " << Bfield[0] << std::endl;
+ //std::cout << "AFTER --> bfield = " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl << std::endl; + //std::cout << Point[2] << " " << Bfield[0] << std::endl;
- return;
+ return;
}
void G4Dipole::setZMax(double zmax)
{
- m_zmax = zmax;
+ m_zmax = zmax;
}
double G4Dipole::getZMax()
{
- return m_zmax;
+ return m_zmax;
}
void G4Dipole::setZMin(double zmin)
{
- m_zmin = zmin;
+ m_zmin = zmin;
}
double G4Dipole::getZMin()
{
- return m_zmin;
+ return m_zmin;
}
void G4Dipole::setRMax(double rmax)
{
- m_rmax = rmax;
+ m_rmax = rmax;
}
double G4Dipole::getRMax()
{
- return m_rmax;
+ return m_rmax;
}
void G4Dipole::addCoeff(double coeff)
{
- m_coeffs.push_back(coeff);
+ m_coeffs.push_back(coeff);
}
const std::vector<double>& G4Dipole::getCoeffs()
{
- return m_coeffs;
+ return m_coeffs;
}
void G4Dipole::setFieldUnit(double unit)
{
- m_funit = unit;
+ m_funit = unit;
}
double G4Dipole::getFieldUnit()
{
- return m_funit;
+ return m_funit;
}
void G4Dipole::setLengthUnit(double unit)
{
- m_lunit = unit;
+ m_lunit = unit;
}
double G4Dipole::getLengthUnit()
{
- return m_lunit;
+ return m_lunit;
}
diff -u -r1.1 -r1.2 --- G4GlobalGridXYSegmentation.cc 30 Oct 2009 23:16:59 -0000 1.1 +++ G4GlobalGridXYSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.2 @@ -1,25 +1,22 @@
-// $Header: /cvs/lcd/lcdd/src/G4GlobalGridXYSegmentation.cc,v 1.1 2009/10/30 23:16:59 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4GlobalGridXYSegmentation.cc,v 1.2 2013/06/24 22:10:36 jeremy Exp $
#include "G4GlobalGridXYSegmentation.hh" #include "ReadoutUtil.hh" #include "G4NavigationHistory.hh"
-G4GlobalGridXYSegmentation::G4GlobalGridXYSegmentation( - double gridSizeX, - double gridSizeY ) - : G4Segmentation(G4Segmentation::eNonprojective), - m_gridSizeX(gridSizeX), - m_gridSizeY(gridSizeY)
+G4GlobalGridXYSegmentation::G4GlobalGridXYSegmentation(double gridSizeX, double gridSizeY) : + G4Segmentation(G4Segmentation::eNonprojective), m_gridSizeX(gridSizeX), m_gridSizeY(gridSizeY)
{
setBinNames();
}
G4GlobalGridXYSegmentation::~G4GlobalGridXYSegmentation()
-{}
+{
+}
G4ThreeVector G4GlobalGridXYSegmentation::getGlobalHitPos(const G4Step* aStep)
-{
+{
// Compute the midpoint of the global step.
G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos(aStep);
@@ -40,15 +37,15 @@
void G4GlobalGridXYSegmentation::setBins(const G4Step* aStep)
{
// Compute the midpoint of the step.
- G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos( aStep ); -
+ G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos(aStep); +
// Compute the bin values.
- int binX = computeBinX( globalStepPos ); - int binY = computeBinY( globalStepPos );
+ int binX = computeBinX(globalStepPos); + int binY = computeBinY(globalStepPos);
// Set the bin values.
- setBin( 0, binX ); - setBin( 1, binY );
+ setBin(0, binX); + setBin(1, binY);
} int G4GlobalGridXYSegmentation::computeBinX(const G4ThreeVector& stepPos)
diff -u -r1.7 -r1.8 --- G4GridXYZSegmentation.cc 30 Oct 2009 23:16:59 -0000 1.7 +++ G4GridXYZSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.8 @@ -1,37 +1,33 @@
-// $Header: /cvs/lcd/lcdd/src/G4GridXYZSegmentation.cc,v 1.7 2009/10/30 23:16:59 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4GridXYZSegmentation.cc,v 1.8 2013/06/24 22:10:36 jeremy Exp $
#include "G4GridXYZSegmentation.hh" #include "ReadoutUtil.hh" #include "G4NavigationHistory.hh"
-G4GridXYZSegmentation::G4GridXYZSegmentation(double gridSizeX, - double gridSizeY, - double gridSizeZ ) - : G4Segmentation(G4Segmentation::eNonprojective), - m_gridSizeX(gridSizeX), - m_gridSizeY(gridSizeY), - m_gridSizeZ(gridSizeZ)
+G4GridXYZSegmentation::G4GridXYZSegmentation(double gridSizeX, double gridSizeY, double gridSizeZ) : + G4Segmentation(G4Segmentation::eNonprojective), m_gridSizeX(gridSizeX), m_gridSizeY(gridSizeY), m_gridSizeZ(gridSizeZ)
{
setBinNames();
}
G4GridXYZSegmentation::~G4GridXYZSegmentation()
-{}
+{
+}
G4ThreeVector G4GridXYZSegmentation::getGlobalHitPos(const G4Step* aStep)
-{
+{
// compute midpoint
- G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos( aStep );
+ G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos(aStep);
// figure local step pos using touchable and global midpoint
- G4ThreeVector localStepPos = ReadoutUtil::transformGlobalToLocal( aStep, globalStepPos );
+ G4ThreeVector localStepPos = ReadoutUtil::transformGlobalToLocal(aStep, globalStepPos);
// local cell pos
- G4ThreeVector localCellPos = this->getLocalHitPos( localStepPos ); -
+ G4ThreeVector localCellPos = this->getLocalHitPos(localStepPos); +
// global cell pos
- G4ThreeVector globalCellPos = ReadoutUtil::transformLocalToGlobal( aStep, localCellPos );
+ G4ThreeVector globalCellPos = ReadoutUtil::transformLocalToGlobal(aStep, localCellPos);
return globalCellPos;
}
@@ -39,36 +35,35 @@
void G4GridXYZSegmentation::setBins(const G4Step* aStep)
{
// Compute the midpoint of the step.
- G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos( aStep );
+ G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos(aStep);
// Transform from global coordinate system to local coordinate system of volume pointed to by this step.
- G4ThreeVector localStepPos = ReadoutUtil::transformGlobalToLocal( aStep, globalStepPos ); -
+ G4ThreeVector localStepPos = ReadoutUtil::transformGlobalToLocal(aStep, globalStepPos); +
// Compute the bin values.
- int binX = computeBinX( localStepPos ); - int binY = computeBinY( localStepPos ); - int binZ = computeBinZ( localStepPos );
+ int binX = computeBinX(localStepPos); + int binY = computeBinY(localStepPos); + int binZ = computeBinZ(localStepPos);
// Set the bins.
- int idx=0;
+ int idx = 0;
- setBin( idx, binX );
+ setBin(idx, binX);
++idx;
- setBin( idx, binY );
+ setBin(idx, binY);
++idx;
- setBin( idx, binZ );
+ setBin(idx, binZ);
++idx;
}
int G4GridXYZSegmentation::computeBinX(const G4ThreeVector& localStepPos)
{
int ret;
- if ( m_gridSizeX != 0 ) {
+ if (m_gridSizeX != 0) {
ret = G4Segmentation::computeBin(localStepPos.x(), m_gridSizeX);
- }
- else {
+ } else {
ret = 0;
}
return ret;
@@ -77,10 +72,9 @@
int G4GridXYZSegmentation::computeBinY(const G4ThreeVector& localStepPos)
{
int ret;
- if ( m_gridSizeY != 0 ) {
+ if (m_gridSizeY != 0) {
ret = G4Segmentation::computeBin(localStepPos.y(), m_gridSizeY);
- }
- else {
+ } else {
ret = 0;
}
return ret;
@@ -89,10 +83,9 @@
int G4GridXYZSegmentation::computeBinZ(const G4ThreeVector& localStepPos)
{
int ret;
- if ( m_gridSizeZ != 0 ) {
+ if (m_gridSizeZ != 0) {
ret = G4Segmentation::computeBin(localStepPos.z(), m_gridSizeZ);
- }
- else {
+ } else {
ret = 0;
}
return ret;
@@ -111,21 +104,21 @@
double G4GridXYZSegmentation::computeDimZ(int bin)
{
return G4Segmentation::computeDim(bin, m_gridSizeZ);
-}
+}
G4ThreeVector G4GridXYZSegmentation::getGlobalHitPosPreStep(const G4StepPoint* aPreStepPoint)
{
- G4ThreeVector globalStepPos = aPreStepPoint->GetPosition(); -
+ G4ThreeVector globalStepPos = aPreStepPoint->GetPosition(); +
// Figure out local step pos using touchable and global midpoint.
- G4ThreeVector localStepPos = ReadoutUtil::transformGlobalToLocal(aPreStepPoint,globalStepPos); -
+ G4ThreeVector localStepPos = ReadoutUtil::transformGlobalToLocal(aPreStepPoint, globalStepPos); +
// Compute local cell pos.
- G4ThreeVector localCellPos = this->getLocalHitPos( localStepPos ); -
+ G4ThreeVector localCellPos = this->getLocalHitPos(localStepPos); +
// Compute global cell pos.
- G4ThreeVector globalCellPos = ReadoutUtil::transformLocalToGlobal( aPreStepPoint, localCellPos ); -
+ G4ThreeVector globalCellPos = ReadoutUtil::transformLocalToGlobal(aPreStepPoint, localCellPos); +
return globalCellPos; }
@@ -133,16 +126,16 @@
{
G4ThreeVector localHitPos;
- if (m_gridSizeX > 0) {
- localHitPos.setX( computeDimX( computeBinX( localStepPos ) ) );
+ if (m_gridSizeX > 0) {
+ localHitPos.setX(computeDimX(computeBinX(localStepPos)));
}
if (m_gridSizeY > 0) {
- localHitPos.setY( computeDimY( computeBinY( localStepPos ) ) );
+ localHitPos.setY(computeDimY(computeBinY(localStepPos)));
}
if (m_gridSizeZ > 0) {
- localHitPos.setZ( computeDimZ( computeBinZ( localStepPos ) ) );
+ localHitPos.setZ(computeDimZ(computeBinZ(localStepPos)));
}
return localHitPos;
diff -u -r1.2 -r1.3 --- G4LimitSet.cc 1 Feb 2012 10:28:56 -0000 1.2 +++ G4LimitSet.cc 24 Jun 2013 22:10:36 -0000 1.3 @@ -22,110 +22,98 @@
const G4LimitSet::LimitValueType G4LimitSet::EKIN_MIN_DEFAULT = 0.; const G4LimitSet::LimitValueType G4LimitSet::RANGE_MIN_DEFAULT = 0.;
-G4LimitSet::G4LimitSet(const G4String& name)
- : G4UserLimits("G4LimitSet"),
- m_name(name)
-{
- m_limitsMap[STEP_LENGTH_MAX_KEY] = LimitMap();
- m_limitsMap[TRACK_LENGTH_MAX_KEY] = LimitMap();
- m_limitsMap[TIME_MAX_KEY] = LimitMap();
- m_limitsMap[EKIN_MIN_KEY] = LimitMap();
- m_limitsMap[RANGE_MIN_KEY] = LimitMap();
+G4LimitSet::G4LimitSet(const G4String& name) :
+ G4UserLimits("G4LimitSet"), m_name(name)
+{
+ m_limitsMap[STEP_LENGTH_MAX_KEY] = LimitMap();
+ m_limitsMap[TRACK_LENGTH_MAX_KEY] = LimitMap();
+ m_limitsMap[TIME_MAX_KEY] = LimitMap();
+ m_limitsMap[EKIN_MIN_KEY] = LimitMap();
+ m_limitsMap[RANGE_MIN_KEY] = LimitMap();
} G4LimitSet::~G4LimitSet()
-{}
+{
+}
G4double G4LimitSet::GetMaxAllowedStep(const G4Track& aTrack)
{
- double maxStepLength = getLimitForParticle(STEP_LENGTH_MAX_KEY, aTrack); - return maxStepLength == LIMIT_NOT_SET ? STEP_LENGTH_MAX_DEFAULT : maxStepLength;
+ double maxStepLength = getLimitForParticle(STEP_LENGTH_MAX_KEY, aTrack); + return maxStepLength == LIMIT_NOT_SET ? STEP_LENGTH_MAX_DEFAULT : maxStepLength;
}
G4double G4LimitSet::GetUserMaxTrackLength(const G4Track& aTrack)
{
- double maxTrackLength = getLimitForParticle(TRACK_LENGTH_MAX_KEY, aTrack); - return maxTrackLength == LIMIT_NOT_SET ? TRACK_LENGTH_MAX_DEFAULT : maxTrackLength;
+ double maxTrackLength = getLimitForParticle(TRACK_LENGTH_MAX_KEY, aTrack); + return maxTrackLength == LIMIT_NOT_SET ? TRACK_LENGTH_MAX_DEFAULT : maxTrackLength;
}
-G4double G4LimitSet::GetUserMaxTime (const G4Track& aTrack)
+G4double G4LimitSet::GetUserMaxTime(const G4Track& aTrack)
{
- double maxTime = getLimitForParticle(TIME_MAX_KEY, aTrack); - return maxTime == LIMIT_NOT_SET ? TIME_MAX_DEFAULT : maxTime;
+ double maxTime = getLimitForParticle(TIME_MAX_KEY, aTrack); + return maxTime == LIMIT_NOT_SET ? TIME_MAX_DEFAULT : maxTime;
}
G4double G4LimitSet::GetUserMinEkine(const G4Track& aTrack)
{
- double minEkine = getLimitForParticle(EKIN_MIN_KEY, aTrack); - return minEkine == LIMIT_NOT_SET ? EKIN_MIN_DEFAULT : minEkine;
+ double minEkine = getLimitForParticle(EKIN_MIN_KEY, aTrack); + return minEkine == LIMIT_NOT_SET ? EKIN_MIN_DEFAULT : minEkine;
}
G4double G4LimitSet::GetUserMinRange(const G4Track& aTrack)
{
- double minRange = getLimitForParticle(RANGE_MIN_KEY, aTrack); - return minRange == LIMIT_NOT_SET ? RANGE_MIN_DEFAULT : minRange;
+ double minRange = getLimitForParticle(RANGE_MIN_KEY, aTrack); + return minRange == LIMIT_NOT_SET ? RANGE_MIN_DEFAULT : minRange;
}
const G4LimitSet::ParticleType G4LimitSet::getParticleType(const G4Track& aTrack)
{
- return aTrack.GetDefinition()->GetParticleName();
+ return aTrack.GetDefinition()->GetParticleName();
}
-void G4LimitSet::setLimitForParticle(LimitNameType limitName,
- ParticleType particleType,
- LimitValueType limitValue)
-{
- if ( m_limitsMap.find(limitName) != m_limitsMap.end() ) {
- m_limitsMap[limitName][particleType] = limitValue;
- }
- else {
- G4Exception("", "", FatalException, "Invalid limits map.");
- }
-}
-
-G4LimitSet::LimitValueType G4LimitSet::getLimitForParticle(LimitNameType limitName,
- ParticleType particleType)
-{
- //std::cout << "G4LimitSet::getLimitForParticle()" << std::endl;
- //std::cout << "limitName, particleType: " << limitName << " " << particleType << std::endl;
- LimitValueType limitValue = 0;
- if ( m_limitsMap.find(limitName) != m_limitsMap.end() ) {
- if ( m_limitsMap[limitName].find(particleType) != m_limitsMap[limitName].end() ) {
- limitValue = m_limitsMap[limitName][particleType];
+void G4LimitSet::setLimitForParticle(LimitNameType limitName, ParticleType particleType, LimitValueType limitValue)
+{
+ if (m_limitsMap.find(limitName) != m_limitsMap.end()) {
+ m_limitsMap[limitName][particleType] = limitValue;
+ } else {
+ G4Exception("", "", FatalException, "Invalid limits map.");
}
- else {
- if ( ( m_limitsMap[limitName].find(ANY_PARTICLE) != m_limitsMap[limitName].end() ) ) {
- limitValue = m_limitsMap[limitName][ANY_PARTICLE];
- }
- else {
- limitValue = LIMIT_NOT_SET;
- }
+}
+
+G4LimitSet::LimitValueType G4LimitSet::getLimitForParticle(LimitNameType limitName, ParticleType particleType)
+{
+ //std::cout << "G4LimitSet::getLimitForParticle()" << std::endl;
+ //std::cout << "limitName, particleType: " << limitName << " " << particleType << std::endl;
+ LimitValueType limitValue = 0;
+ if (m_limitsMap.find(limitName) != m_limitsMap.end()) {
+ if (m_limitsMap[limitName].find(particleType) != m_limitsMap[limitName].end()) {
+ limitValue = m_limitsMap[limitName][particleType];
+ } else {
+ if ((m_limitsMap[limitName].find(ANY_PARTICLE) != m_limitsMap[limitName].end())) {
+ limitValue = m_limitsMap[limitName][ANY_PARTICLE];
+ } else {
+ limitValue = LIMIT_NOT_SET;
+ }
+ }
+ } else {
+ G4Exception("", "", FatalException, "Invalid limits map.");
}
- }
- else {
- G4Exception("", "", FatalException, "Invalid limits map.");
- }
- //std::cout << "limitValue: " << limitValue << std::endl;
- return limitValue;
+ //std::cout << "limitValue: " << limitValue << std::endl; + return limitValue;
}
-G4LimitSet::LimitValueType G4LimitSet::getLimitForParticle(LimitNameType limitName, - const G4Track& aTrack)
+G4LimitSet::LimitValueType G4LimitSet::getLimitForParticle(LimitNameType limitName, const G4Track& aTrack)
{
- return getLimitForParticle(limitName, getParticleType(aTrack) );
+ return getLimitForParticle(limitName, getParticleType(aTrack));
}
void G4LimitSet::setName(const G4String& n)
{
- m_name = n;
+ m_name = n;
}
G4String& G4LimitSet::getName()
{
- return m_name;
+ return m_name;
}
- - - -
diff -u -r1.14 -r1.15 --- G4NonprojectiveCylinderSegmentation.cc 1 Apr 2008 19:52:47 -0000 1.14 +++ G4NonprojectiveCylinderSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.15 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4NonprojectiveCylinderSegmentation.cc,v 1.14 2008/04/01 19:52:47 wenzel Exp $
+// $Header: /cvs/lcd/lcdd/src/G4NonprojectiveCylinderSegmentation.cc,v 1.15 2013/06/24 22:10:36 jeremy Exp $
#include "G4NonprojectiveCylinderSegmentation.hh" #include "ReadoutUtil.hh"
@@ -7,254 +7,251 @@
#include <cmath>
-G4NonprojectiveCylinderSegmentation::G4NonprojectiveCylinderSegmentation(double gridSizePhi, - double gridSizeZ) - : G4Segmentation(G4Segmentation::eNonprojective), - m_gridSizePhi(gridSizePhi), - m_gridSizeZ(gridSizeZ)
+G4NonprojectiveCylinderSegmentation::G4NonprojectiveCylinderSegmentation(double gridSizePhi, double gridSizeZ) : + G4Segmentation(G4Segmentation::eNonprojective), m_gridSizePhi(gridSizePhi), m_gridSizeZ(gridSizeZ)
{
- setBinNames();
+ setBinNames();
} G4NonprojectiveCylinderSegmentation::~G4NonprojectiveCylinderSegmentation()
-{}
+{
+}
G4ThreeVector G4NonprojectiveCylinderSegmentation::getGlobalHitPos(const G4Step* aStep)
{
- // local cell pos - G4ThreeVector localCellPos = getLocalHitPos( aStep );
+ // local cell pos + G4ThreeVector localCellPos = getLocalHitPos(aStep);
- // global cell pos - G4ThreeVector globalCellPos = ReadoutUtil::transformLocalToGlobal( aStep, localCellPos );
+ // global cell pos + G4ThreeVector globalCellPos = ReadoutUtil::transformLocalToGlobal(aStep, localCellPos);
- // DEBUG: print local, global cell pos - //G4cout << "localCellPos " << localCellPos << G4endl; - //G4cout << "globalCellPos " << globalCellPos << G4endl; - //
+ // DEBUG: print local, global cell pos + //G4cout << "localCellPos " << localCellPos << G4endl; + //G4cout << "globalCellPos " << globalCellPos << G4endl; + //
- return localCellPos;
+ return localCellPos;
}
G4ThreeVector G4NonprojectiveCylinderSegmentation::getGlobalHitPos(const G4StepPoint* aPreStepPoint)
{
- // local cell pos - G4ThreeVector localCellPos = getLocalHitPos( aPreStepPoint );
+ // local cell pos + G4ThreeVector localCellPos = getLocalHitPos(aPreStepPoint);
- // global cell pos - G4ThreeVector globalCellPos = ReadoutUtil::transformLocalToGlobal( aPreStepPoint, localCellPos );
+ // global cell pos + G4ThreeVector globalCellPos = ReadoutUtil::transformLocalToGlobal(aPreStepPoint, localCellPos);
- // DEBUG: print local, global cell pos - //G4cout << "localCellPos " << localCellPos << G4endl; - //G4cout << "globalCellPos " << globalCellPos << G4endl; - //
+ // DEBUG: print local, global cell pos + //G4cout << "localCellPos " << localCellPos << G4endl; + //G4cout << "globalCellPos " << globalCellPos << G4endl; + //
- return localCellPos;
+ return localCellPos;
}
G4ThreeVector G4NonprojectiveCylinderSegmentation::getLocalHitPos(const G4Step* aStep)
{
- G4ThreeVector globalMidPos = ReadoutUtil::computeMidPos( aStep );
+ G4ThreeVector globalMidPos = ReadoutUtil::computeMidPos(aStep);
- // retrieve G4Tubs - const G4Tubs* tubs = ReadoutUtil::getTubs( aStep );
+ // retrieve G4Tubs + const G4Tubs* tubs = ReadoutUtil::getTubs(aStep);
- assert( tubs );
+ assert(tubs);
- // rcyl of cell = mid rad of current tubs - double rcyl = ReadoutUtil::computeTubsMidRadius( tubs );
+ // rcyl of cell = mid rad of current tubs + double rcyl = ReadoutUtil::computeTubsMidRadius(tubs);
- // compute single delta phi in degrees - double deltaPhi = computeDeltaPhi( aStep );
+ // compute single delta phi in degrees + double deltaPhi = computeDeltaPhi(aStep);
- // phi index - int iphi = computeBinPhi( aStep );
+ // phi index + int iphi = computeBinPhi(aStep);
- // z index in local - int iz = computeBinZ( ReadoutUtil::transformGlobalToLocal( aStep, globalMidPos ) );
+ // z index in local + int iz = computeBinZ(ReadoutUtil::transformGlobalToLocal(aStep, globalMidPos));
- // compute cell Z, phi - double cellPhi = computeDim( iphi, deltaPhi ); - double cellZ = computeDim( iz, m_gridSizeZ);
+ // compute cell Z, phi + double cellPhi = computeDim(iphi, deltaPhi); + double cellZ = computeDim(iz, m_gridSizeZ);
- // compute X, Y - double cellX = rcyl * cos( cellPhi ); - double cellY = rcyl * sin( cellPhi );
+ // compute X, Y + double cellX = rcyl * cos(cellPhi); + double cellY = rcyl * sin(cellPhi);
- G4ThreeVector cellCenter( cellX, cellY, cellZ );
+ G4ThreeVector cellCenter(cellX, cellY, cellZ);
- // DEBUG: print all - //G4cout << G4endl; - //G4cout << "rcyl <" << rcyl << ">" << G4endl; - //G4cout << "deltaPhi <" << deltaPhi << ">" << G4endl; - //G4cout << "iphi <" << iphi << ">" << G4endl; - //G4cout << "iz <" << iz << ">" << G4endl; - //G4cout << "cellPhi <" << cellPhi << ">" << G4endl; - //G4cout << "cellCenter " << cellCenter << G4endl; - //G4cout << G4endl; - //
+ // DEBUG: print all + //G4cout << G4endl; + //G4cout << "rcyl <" << rcyl << ">" << G4endl; + //G4cout << "deltaPhi <" << deltaPhi << ">" << G4endl; + //G4cout << "iphi <" << iphi << ">" << G4endl; + //G4cout << "iz <" << iz << ">" << G4endl; + //G4cout << "cellPhi <" << cellPhi << ">" << G4endl; + //G4cout << "cellCenter " << cellCenter << G4endl; + //G4cout << G4endl; + //
- return cellCenter;
+ return cellCenter;
}
G4ThreeVector G4NonprojectiveCylinderSegmentation::getLocalHitPos(const G4StepPoint* aPreStepPoint)
{
- G4ThreeVector globalPos = aPreStepPoint->GetPosition() ;
+ G4ThreeVector globalPos = aPreStepPoint->GetPosition();
- // retrieve G4Tubs - const G4Tubs* tubs = ReadoutUtil::getTubs( aPreStepPoint );
+ // retrieve G4Tubs + const G4Tubs* tubs = ReadoutUtil::getTubs(aPreStepPoint);
- assert( tubs );
+ assert(tubs);
- // rcyl of cell = mid rad of current tubs - double rcyl = ReadoutUtil::computeTubsMidRadius( tubs );
+ // rcyl of cell = mid rad of current tubs + double rcyl = ReadoutUtil::computeTubsMidRadius(tubs);
- // compute single delta phi in degrees - double deltaPhi = computeDeltaPhi( aPreStepPoint );
+ // compute single delta phi in degrees + double deltaPhi = computeDeltaPhi(aPreStepPoint);
- // phi index - int iphi = computeBinPhi( aPreStepPoint );
+ // phi index + int iphi = computeBinPhi(aPreStepPoint);
- // z index in local - int iz = computeBinZ( ReadoutUtil::transformGlobalToLocal( aPreStepPoint, globalPos ) );
+ // z index in local + int iz = computeBinZ(ReadoutUtil::transformGlobalToLocal(aPreStepPoint, globalPos));
- // compute cell Z, phi - double cellPhi = computeDim( iphi, deltaPhi ); - double cellZ = computeDim( iz, m_gridSizeZ);
+ // compute cell Z, phi + double cellPhi = computeDim(iphi, deltaPhi); + double cellZ = computeDim(iz, m_gridSizeZ);
- // compute X, Y - double cellX = rcyl * cos( cellPhi ); - double cellY = rcyl * sin( cellPhi );
+ // compute X, Y + double cellX = rcyl * cos(cellPhi); + double cellY = rcyl * sin(cellPhi);
- G4ThreeVector cellCenter( cellX, cellY, cellZ );
+ G4ThreeVector cellCenter(cellX, cellY, cellZ);
- // DEBUG: print all - //G4cout << G4endl; - //G4cout << "rcyl <" << rcyl << ">" << G4endl; - //G4cout << "deltaPhi <" << deltaPhi << ">" << G4endl; - //G4cout << "iphi <" << iphi << ">" << G4endl; - //G4cout << "iz <" << iz << ">" << G4endl; - //G4cout << "cellPhi <" << cellPhi << ">" << G4endl; - //G4cout << "cellCenter " << cellCenter << G4endl; - //G4cout << G4endl; - //
+ // DEBUG: print all + //G4cout << G4endl; + //G4cout << "rcyl <" << rcyl << ">" << G4endl; + //G4cout << "deltaPhi <" << deltaPhi << ">" << G4endl; + //G4cout << "iphi <" << iphi << ">" << G4endl; + //G4cout << "iz <" << iz << ">" << G4endl; + //G4cout << "cellPhi <" << cellPhi << ">" << G4endl; + //G4cout << "cellCenter " << cellCenter << G4endl; + //G4cout << G4endl; + //
- return cellCenter;
+ return cellCenter;
}
double G4NonprojectiveCylinderSegmentation::computeDeltaPhi(const G4Step* aStep)
{
- // mid radius of current tubs - double mid_rad_layer = ReadoutUtil::computeTubsMidRadius( aStep );
+ // mid radius of current tubs + double mid_rad_layer = ReadoutUtil::computeTubsMidRadius(aStep);
- // circumference of current tubs - double circ = 2.0 * ReadoutUtil::PI * mid_rad_layer;
+ // circumference of current tubs + double circ = 2.0 * ReadoutUtil::PI * mid_rad_layer;
- // number of cells along phi in curr layer - int nphi = (int)floor( circ / m_gridSizePhi );
+ // number of cells along phi in curr layer + int nphi = (int) floor(circ / m_gridSizePhi);
- // single phi division in degrees - double deltaPhi = ( 360.0 * deg ) / nphi;
+ // single phi division in degrees + double deltaPhi = (360.0 * deg) / nphi;
- return deltaPhi;
+ return deltaPhi;
}
double G4NonprojectiveCylinderSegmentation::computeDeltaPhi(const G4StepPoint* aPreStepPoint)
{
- // mid radius of current tubs - double mid_rad_layer = ReadoutUtil::computeTubsMidRadius( aPreStepPoint );
+ // mid radius of current tubs + double mid_rad_layer = ReadoutUtil::computeTubsMidRadius(aPreStepPoint);
- // circumference of current tubs - double circ = 2.0 * ReadoutUtil::PI * mid_rad_layer;
+ // circumference of current tubs + double circ = 2.0 * ReadoutUtil::PI * mid_rad_layer;
- // number of cells along phi in curr layer - int nphi = (int)floor( circ / m_gridSizePhi );
+ // number of cells along phi in curr layer + int nphi = (int) floor(circ / m_gridSizePhi);
- // single phi division in degrees - double deltaPhi = ( 360.0 * deg ) / nphi;
+ // single phi division in degrees + double deltaPhi = (360.0 * deg) / nphi;
- return deltaPhi;
+ return deltaPhi;
}
void G4NonprojectiveCylinderSegmentation::setBins(const G4Step* aStep)
{
- //G4cout << "G4NonprojectiveCylinderSegmentation::setBins()" << G4endl;
+ //G4cout << "G4NonprojectiveCylinderSegmentation::setBins()" << G4endl;
- G4ThreeVector globalMidPos = ReadoutUtil::computeMidPos( aStep );
+ G4ThreeVector globalMidPos = ReadoutUtil::computeMidPos(aStep);
- int bphi = computeBinPhi( aStep ); - int bz = computeBinZ( globalMidPos );
+ int bphi = computeBinPhi(aStep); + int bz = computeBinZ(globalMidPos);
- setBin( 0, bphi ); - setBin( 1, bz );
+ setBin(0, bphi); + setBin(1, bz);
}
void G4NonprojectiveCylinderSegmentation::setBins(const G4StepPoint* aPreStepPoint)
{
- //G4cout << "G4NonprojectiveCylinderSegmentation::setBins()" << G4endl;
+ //G4cout << "G4NonprojectiveCylinderSegmentation::setBins()" << G4endl;
- G4ThreeVector globalPos = aPreStepPoint->GetPosition();
+ G4ThreeVector globalPos = aPreStepPoint->GetPosition();
- int bphi = computeBinPhi( aPreStepPoint ); - int bz = computeBinZ( globalPos );
+ int bphi = computeBinPhi(aPreStepPoint); + int bz = computeBinZ(globalPos);
- setBin( 0, bphi ); - setBin( 1, bz );
+ setBin(0, bphi); + setBin(1, bz);
}
int G4NonprojectiveCylinderSegmentation::computeBinPhi(const G4Step* aStep)
{
- G4ThreeVector globalMidPos = ReadoutUtil::computeMidPos( aStep );
+ G4ThreeVector globalMidPos = ReadoutUtil::computeMidPos(aStep);
- const G4Tubs* tubs = ReadoutUtil::getTubs( aStep ); - assert( tubs );
+ const G4Tubs* tubs = ReadoutUtil::getTubs(aStep); + assert(tubs);
- // compute single delta phi in degrees - double deltaPhi = computeDeltaPhi( aStep );
+ // compute single delta phi in degrees + double deltaPhi = computeDeltaPhi(aStep);
- // step phi - double stepPhi = globalMidPos.phi();
+ // step phi + double stepPhi = globalMidPos.phi();
- if ( stepPhi<0 ) {
- stepPhi += 2.0 * ReadoutUtil::PI;
- }
+ if (stepPhi < 0) {
+ stepPhi += 2.0 * ReadoutUtil::PI;
+ }
- // phi index - return computeBin( stepPhi, deltaPhi / radian );
+ // phi index + return computeBin(stepPhi, deltaPhi / radian);
}
int G4NonprojectiveCylinderSegmentation::computeBinPhi(const G4StepPoint* aPreStepPoint)
{
- G4ThreeVector globalPos = aPreStepPoint->GetPosition();
+ G4ThreeVector globalPos = aPreStepPoint->GetPosition();
- const G4Tubs* tubs = ReadoutUtil::getTubs( aPreStepPoint ); - assert( tubs );
+ const G4Tubs* tubs = ReadoutUtil::getTubs(aPreStepPoint); + assert(tubs);
- // compute single delta phi in degrees - double deltaPhi = computeDeltaPhi( aPreStepPoint );
+ // compute single delta phi in degrees + double deltaPhi = computeDeltaPhi(aPreStepPoint);
- // step phi - double stepPhi = globalPos.phi();
+ // step phi + double stepPhi = globalPos.phi();
- if ( stepPhi<0 ) {
- stepPhi += 2.0 * ReadoutUtil::PI;
- }
+ if (stepPhi < 0) {
+ stepPhi += 2.0 * ReadoutUtil::PI;
+ }
- // phi index - return computeBin( stepPhi, deltaPhi / radian );
+ // phi index + return computeBin(stepPhi, deltaPhi / radian);
}
-
int G4NonprojectiveCylinderSegmentation::computeBinZ(const G4ThreeVector& localStepPos)
{
- //G4cout << "localStepPos.z() <" << localStepPos.z() << ">" << G4endl; - //G4cout << "m_gridSizeZ <" << m_gridSizeZ << ">" << G4endl;
+ //G4cout << "localStepPos.z() <" << localStepPos.z() << ">" << G4endl; + //G4cout << "m_gridSizeZ <" << m_gridSizeZ << ">" << G4endl;
- return computeBin( localStepPos.z(), m_gridSizeZ );
+ return computeBin(localStepPos.z(), m_gridSizeZ);
}
bool G4NonprojectiveCylinderSegmentation::isValidSolid(G4VSolid* s)
{
- bool valid = G4Segmentation::isValidSolid(s);
+ bool valid = G4Segmentation::isValidSolid(s);
- if ( valid ) {
- if ( s->GetEntityType() != "G4Tubs" ) {
- valid = false;
+ if (valid) {
+ if (s->GetEntityType() != "G4Tubs") {
+ valid = false;
+ }
}
- }
- return valid;
+ return valid;
}
diff -u -r1.8 -r1.9 --- G4OpticalCalorimeter.cc 17 Jun 2013 22:07:33 -0000 1.8 +++ G4OpticalCalorimeter.cc 24 Jun 2013 22:10:36 -0000 1.9 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4OpticalCalorimeter.cc,v 1.8 2013/06/17 22:07:33 wenzel Exp $
+// $Header: /cvs/lcd/lcdd/src/G4OpticalCalorimeter.cc,v 1.9 2013/06/24 22:10:36 jeremy Exp $
#include "G4OpticalCalorimeterSD.hh"
@@ -17,17 +17,11 @@
* In this case the only the energy deposited by aborbed Cerenkov * photons is stored. Probably this will be dropped in the * near future.
- */
-G4OpticalCalorimeterSD::G4OpticalCalorimeterSD(G4String sdName,
- G4String hcName,
- G4Segmentation* sdSeg,
- HitComparator* compare)
- : G4CalorimeterSD(sdName,
- hcName,
- sdSeg,
- compare)
-{
- CerenGenerator = 0;
+ */
+G4OpticalCalorimeterSD::G4OpticalCalorimeterSD(G4String sdName, G4String hcName, G4Segmentation* sdSeg, HitComparator* compare) :
+ G4CalorimeterSD(sdName, hcName, sdSeg, compare)
+{
+ CerenGenerator = 0;
} /**
@@ -37,61 +31,54 @@
* Cerenkov Photons and the second Collection to store the ionization losses. * If more than 2 collections are given the additional Hit collections will * be ignored.
- */ -G4OpticalCalorimeterSD::G4OpticalCalorimeterSD(G4String sdName, - const vector<G4String>& hcNames, - G4Segmentation* sdSeg, - HitComparator* compare) - : G4CalorimeterSD(sdName, - hcNames, - sdSeg, - compare)
+ */ +G4OpticalCalorimeterSD::G4OpticalCalorimeterSD(G4String sdName, const vector<G4String>& hcNames, G4Segmentation* sdSeg, HitComparator* compare) : + G4CalorimeterSD(sdName, hcNames, sdSeg, compare)
{
- CerenGenerator = 0;
+ CerenGenerator = 0;
}
-
+
G4OpticalCalorimeterSD::~G4OpticalCalorimeterSD()
-{}
+{
+}
G4bool G4OpticalCalorimeterSD::ProcessHits(G4Step* aStep, G4TouchableHistory* tahis)
{
- if (!CerenGenerator) CerenGenerator= new Cerenkov();
+ if (!CerenGenerator) + CerenGenerator = new Cerenkov();
G4int NCerenPhotons = 0;
G4Track* theTrack = aStep->GetTrack();
const G4double charge = theTrack->GetDefinition()->GetPDGCharge();
G4StepPoint* pPreStepPoint = aStep->GetPreStepPoint();
G4StepPoint* pPostStepPoint = aStep->GetPostStepPoint();
- G4double beta = 0.5 * (pPreStepPoint ->GetBeta() + pPostStepPoint->GetBeta());
+ G4double beta = 0.5 * (pPreStepPoint->GetBeta() + pPostStepPoint->GetBeta());
const G4VTouchable* touch = aStep->GetPreStepPoint()->GetTouchable();
G4String thematerial = touch->GetVolume()->GetLogicalVolume()->GetMaterial()->GetName();
G4double MeanNumberOfPhotons = CerenGenerator->GetAverageNumberOfPhotons(charge, beta, thematerial);
if (MeanNumberOfPhotons > 0.0) {
- G4double step_length = aStep->GetStepLength(); - MeanNumberOfPhotons = MeanNumberOfPhotons * step_length; - NCerenPhotons = (G4int) G4Poisson(MeanNumberOfPhotons);
+ G4double step_length = aStep->GetStepLength(); + MeanNumberOfPhotons = MeanNumberOfPhotons * step_length; + NCerenPhotons = (G4int) G4Poisson(MeanNumberOfPhotons);
} else {
- NCerenPhotons = 0;
+ NCerenPhotons = 0;
}
- if (NCerenPhotons <= 0)
- {
- return G4CalorimeterSD::ProcessHits(aStep, tahis);
- }
- else
- {
- G4SensitiveDetector::ProcessHits(aStep, 0);
- G4ThreeVector myPoint = aStep->GetPreStepPoint()->GetPosition();
- G4StepPoint* apreStepPoint = aStep->GetPreStepPoint();
- G4Navigator* theNavigator = G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking();
- G4VPhysicalVolume* myVolume = theNavigator->LocateGlobalPointAndSetup(myPoint);
- if ( getVerbose() > 2 ) {
+ if (NCerenPhotons <= 0) {
+ return G4CalorimeterSD::ProcessHits(aStep, tahis);
+ } else {
+ G4SensitiveDetector::ProcessHits(aStep, 0);
+ G4ThreeVector myPoint = aStep->GetPreStepPoint()->GetPosition();
+ G4StepPoint* apreStepPoint = aStep->GetPreStepPoint();
+ G4Navigator* theNavigator = G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking();
+ G4VPhysicalVolume* myVolume = theNavigator->LocateGlobalPointAndSetup(myPoint);
+ if (getVerbose() > 2) {
G4cout << "Physical volume = " << myVolume->GetName() << G4endl;
G4cout << "Point of interaction = " << myPoint<< G4endl;
G4cout << "sdname " << GetName() << " hcname " <<collectionName[0]<< G4endl;
}
- // total photon energy - // G4double theEdep = aTrack->GetTotalEnergy(); - G4double theEdep =double(NCerenPhotons);
+ // total photon energy + // G4double theEdep = aTrack->GetTotalEnergy(); + G4double theEdep = double(NCerenPhotons);
// get global cell pos from seg
G4ThreeVector globalCellPos = m_segmentation->getGlobalHitPosPreStep(apreStepPoint);
// reset the seg bins
@@ -99,33 +86,31 @@
// set the seg bins
m_segmentation->setBins(aStep);
// create id and pack into 64
- Id64bit id64 = makeId();
+ Id64bit id64 = makeId();
// find hit by simple lkp of new hit with above info
G4CalorimeterHit* thisHit = new G4CalorimeterHit(theEdep, globalCellPos);
- thisHit->setId64bit( id64.getId0(), id64.getId1() ); - G4CalorimeterHit* fndHit = 0;
+ thisHit->setId64bit(id64.getId0(), id64.getId1()); + G4CalorimeterHit* fndHit = 0;
// hit is not found?
- if (!(fndHit = findHit(thisHit, eCerenkov)))
- {
+ if (!(fndHit = findHit(thisHit, eCerenkov))) {
// add it to lkp map
hits_vector[eCerenkov].push_back(thisHit);
// add to the HC
- m_hitsCollections[eCerenkov]->insert(thisHit); - }
+ m_hitsCollections[eCerenkov]->insert(thisHit); + }
// found a hit
- else
- {
+ else {
// don't need to insert thisHit, so delete it
delete thisHit;
- thisHit = 0;
+ thisHit = 0;
// incr total edep of the hit
fndHit->incrEdep(theEdep);
// for setting contrib
thisHit = fndHit;
- }
+ }
// add McpHitContrib to this hit, setting info from step info
- thisHit->addMcpHitContrib( McpHitContrib( aStep ) ); - // aTrack->SetTrackStatus(fStopAndKill); // don't step photon any further
+ thisHit->addMcpHitContrib(McpHitContrib(aStep)); + // aTrack->SetTrackStatus(fStopAndKill); // don't step photon any further
return true;
} // end Cerenkov photon treatment
}
diff -u -r1.9 -r1.10 --- G4ProjectiveCylinderSegmentation.cc 1 Apr 2008 19:52:47 -0000 1.9 +++ G4ProjectiveCylinderSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.10 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4ProjectiveCylinderSegmentation.cc,v 1.9 2008/04/01 19:52:47 wenzel Exp $
+// $Header: /cvs/lcd/lcdd/src/G4ProjectiveCylinderSegmentation.cc,v 1.10 2013/06/24 22:10:36 jeremy Exp $
#include "G4ProjectiveCylinderSegmentation.hh" #include "ReadoutUtil.hh"
@@ -8,57 +8,58 @@
#include "G4LogicalVolume.hh" #include "G4Tubs.hh"
-G4ProjectiveCylinderSegmentation::G4ProjectiveCylinderSegmentation(G4int ntheta,
- G4int nphi)
- : G4ProjectiveSegmentation(ntheta, nphi)
-{}
+G4ProjectiveCylinderSegmentation::G4ProjectiveCylinderSegmentation(G4int ntheta, G4int nphi) :
+ G4ProjectiveSegmentation(ntheta, nphi)
+{
+}
G4ProjectiveCylinderSegmentation::~G4ProjectiveCylinderSegmentation()
-{}
+{
+}
double G4ProjectiveCylinderSegmentation::getRadius(const G4Step* aStep)
{
- return ReadoutUtil::computeTubsMidRadius( ReadoutUtil::getTubs( aStep ) );
+ return ReadoutUtil::computeTubsMidRadius(ReadoutUtil::getTubs(aStep));
}
double G4ProjectiveCylinderSegmentation::getRadius(const G4StepPoint* aPreStepPoint)
{
- return ReadoutUtil::computeTubsMidRadius( ReadoutUtil::getTubs( aPreStepPoint ) );
+ return ReadoutUtil::computeTubsMidRadius(ReadoutUtil::getTubs(aPreStepPoint));
}
double G4ProjectiveCylinderSegmentation::getZ(const G4Step* aStep)
{
- double rcyl = getRadius( aStep );
+ double rcyl = getRadius(aStep);
- double ctheta = getThetaDim( aStep );
+ double ctheta = getThetaDim(aStep);
- // ctheta in 0 to pi ... - // ctheta < pi/2 should be negative
+ // ctheta in 0 to pi ... + // ctheta < pi/2 should be negative
- double zcell = rcyl / tan( ctheta );
+ double zcell = rcyl / tan(ctheta);
- return zcell;
+ return zcell;
}
double G4ProjectiveCylinderSegmentation::getZ(const G4StepPoint* aPreStepPoint)
{
- double rcyl = getRadius( aPreStepPoint );
+ double rcyl = getRadius(aPreStepPoint);
- double ctheta = getThetaDim( aPreStepPoint );
+ double ctheta = getThetaDim(aPreStepPoint);
- // ctheta in 0 to pi ... - // ctheta < pi/2 should be negative
+ // ctheta in 0 to pi ... + // ctheta < pi/2 should be negative
- double zcell = rcyl / tan( ctheta );
+ double zcell = rcyl / tan(ctheta);
- return zcell;
+ return zcell;
}
bool G4ProjectiveCylinderSegmentation::isValidSolid(G4VSolid* s)
{
- bool valid = G4Segmentation::isValidSolid(s);
+ bool valid = G4Segmentation::isValidSolid(s);
- if ( valid ) {
- if ( s->GetEntityType() != "G4Tubs" ) {
- valid = false;
+ if (valid) {
+ if (s->GetEntityType() != "G4Tubs") {
+ valid = false;
+ }
}
- }
- return valid;
+ return valid;
}
diff -u -r1.10 -r1.11 --- G4ProjectiveSegmentation.cc 1 Apr 2008 19:52:47 -0000 1.10 +++ G4ProjectiveSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.11 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4ProjectiveSegmentation.cc,v 1.10 2008/04/01 19:52:47 wenzel Exp $
+// $Header: /cvs/lcd/lcdd/src/G4ProjectiveSegmentation.cc,v 1.11 2013/06/24 22:10:36 jeremy Exp $
#include "G4ProjectiveSegmentation.hh" #include "ReadoutUtil.hh"
@@ -9,233 +9,228 @@
#include "G4LogicalVolume.hh" #include "G4Tubs.hh"
-G4ProjectiveSegmentation::G4ProjectiveSegmentation(G4int ntheta, - G4int nphi) - : G4Segmentation(G4Segmentation::eProjective), - m_ntheta(ntheta), - m_nphi(nphi)
+G4ProjectiveSegmentation::G4ProjectiveSegmentation(G4int ntheta, G4int nphi) : + G4Segmentation(G4Segmentation::eProjective), m_ntheta(ntheta), m_nphi(nphi)
{
- //G4cout << "G4ProjectiveSegmentation" << G4endl; - //G4cout << "ntheta, nphi: " << ntheta << ", " << nphi << G4endl;
+ //G4cout << "G4ProjectiveSegmentation" << G4endl; + //G4cout << "ntheta, nphi: " << ntheta << ", " << nphi << G4endl;
- computeDivisions();
+ computeDivisions();
- setBinNames();
+ setBinNames();
} G4ProjectiveSegmentation::~G4ProjectiveSegmentation()
-{}
+{
+}
G4ThreeVector G4ProjectiveSegmentation::getGlobalHitPos(const G4Step* aStep)
{
- // DEBUG - //G4cout << "G4ProjectiveSegmentation::getGlobalHitPos()" << G4endl; - //
+ // DEBUG + //G4cout << "G4ProjectiveSegmentation::getGlobalHitPos()" << G4endl; + //
- // divide entire theta, phi range into bins; bins always positive - // theta, phi coord of step midpoint - // compute bin numbers - // get dim from bins
+ // divide entire theta, phi range into bins; bins always positive + // theta, phi coord of step midpoint + // compute bin numbers + // get dim from bins
- // get radius, z components (probably from subclass function) - double rcyl = getRadius( aStep ); - double zcell = getZ( aStep );
+ // get radius, z components (probably from subclass function) + double rcyl = getRadius(aStep); + double zcell = getZ(aStep);
- // get phi component - double cphi = getPhiDim( aStep );
+ // get phi component + double cphi = getPhiDim(aStep);
- // compute x, y cells - double xcell = rcyl * cos( cphi ); - double ycell = rcyl * sin( cphi );
+ // compute x, y cells + double xcell = rcyl * cos(cphi); + double ycell = rcyl * sin(cphi);
- G4ThreeVector pos( xcell, ycell, zcell);
+ G4ThreeVector pos(xcell, ycell, zcell);
- //G4ThreeVector midPos = ReadoutUtil::computeMidPos( aStep );
+ //G4ThreeVector midPos = ReadoutUtil::computeMidPos( aStep );
- // DEBUG: print all - //G4cout << "sphi <" << midPos.phi() << ">" << G4endl; - //G4cout << "cphi <" << cphi << ">" << G4endl; - //G4cout << "sphi - cphi = " << midPos.phi() - cphi << G4endl;
+ // DEBUG: print all + //G4cout << "sphi <" << midPos.phi() << ">" << G4endl; + //G4cout << "cphi <" << cphi << ">" << G4endl; + //G4cout << "sphi - cphi = " << midPos.phi() - cphi << G4endl;
- //G4cout << "stheta <" << midPos.theta() << ">" << G4endl; - //G4cout << "ctheta <" << getThetaDim( aStep ) << ">" << G4endl; - //G4cout << "stheta - ctheta = " << midPos.theta() - getThetaDim( aStep ) << G4endl;
+ //G4cout << "stheta <" << midPos.theta() << ">" << G4endl; + //G4cout << "ctheta <" << getThetaDim( aStep ) << ">" << G4endl; + //G4cout << "stheta - ctheta = " << midPos.theta() - getThetaDim( aStep ) << G4endl;
- //G4cout << "rcyl <" << rcyl << ">" << G4endl; - //G4cout << "zcell <" << zcell << ">" << G4endl; - //G4cout << "globalCellPos <" << pos << ">" << G4endl; - //
+ //G4cout << "rcyl <" << rcyl << ">" << G4endl; + //G4cout << "zcell <" << zcell << ">" << G4endl; + //G4cout << "globalCellPos <" << pos << ">" << G4endl; + //
- return pos;
+ return pos;
}
G4ThreeVector G4ProjectiveSegmentation::getGlobalHitPos(const G4StepPoint* aPreStepPoint)
{
- // DEBUG - //G4cout << "G4ProjectiveSegmentation::getGlobalHitPos()" << G4endl; - //
+ // DEBUG + //G4cout << "G4ProjectiveSegmentation::getGlobalHitPos()" << G4endl; + //
- // divide entire theta, phi range into bins; bins always positive - // theta, phi coord of step midpoint - // compute bin numbers - // get dim from bins
+ // divide entire theta, phi range into bins; bins always positive + // theta, phi coord of step midpoint + // compute bin numbers + // get dim from bins
- // get radius, z components (probably from subclass function) - double rcyl = getRadius( aPreStepPoint ); - double zcell = getZ( aPreStepPoint );
+ // get radius, z components (probably from subclass function) + double rcyl = getRadius(aPreStepPoint); + double zcell = getZ(aPreStepPoint);
- // get phi component - double cphi = getPhiDim( aPreStepPoint );
+ // get phi component + double cphi = getPhiDim(aPreStepPoint);
- // compute x, y cells - double xcell = rcyl * cos( cphi ); - double ycell = rcyl * sin( cphi );
+ // compute x, y cells + double xcell = rcyl * cos(cphi); + double ycell = rcyl * sin(cphi);
- G4ThreeVector pos( xcell, ycell, zcell);
+ G4ThreeVector pos(xcell, ycell, zcell);
- //G4ThreeVector midPos = ReadoutUtil::computeMidPos( aStep );
+ //G4ThreeVector midPos = ReadoutUtil::computeMidPos( aStep );
- // DEBUG: print all - //G4cout << "sphi <" << midPos.phi() << ">" << G4endl; - //G4cout << "cphi <" << cphi << ">" << G4endl; - //G4cout << "sphi - cphi = " << midPos.phi() - cphi << G4endl;
+ // DEBUG: print all + //G4cout << "sphi <" << midPos.phi() << ">" << G4endl; + //G4cout << "cphi <" << cphi << ">" << G4endl; + //G4cout << "sphi - cphi = " << midPos.phi() - cphi << G4endl;
- //G4cout << "stheta <" << midPos.theta() << ">" << G4endl; - //G4cout << "ctheta <" << getThetaDim( aStep ) << ">" << G4endl; - //G4cout << "stheta - ctheta = " << midPos.theta() - getThetaDim( aStep ) << G4endl;
+ //G4cout << "stheta <" << midPos.theta() << ">" << G4endl; + //G4cout << "ctheta <" << getThetaDim( aStep ) << ">" << G4endl; + //G4cout << "stheta - ctheta = " << midPos.theta() - getThetaDim( aStep ) << G4endl;
- //G4cout << "rcyl <" << rcyl << ">" << G4endl; - //G4cout << "zcell <" << zcell << ">" << G4endl; - //G4cout << "globalCellPos <" << pos << ">" << G4endl; - //
+ //G4cout << "rcyl <" << rcyl << ">" << G4endl; + //G4cout << "zcell <" << zcell << ">" << G4endl; + //G4cout << "globalCellPos <" << pos << ">" << G4endl; + //
- return pos;
+ return pos;
}
void G4ProjectiveSegmentation::setBins(const G4Step* aStep)
{
- G4ThreeVector globalMidPos = ReadoutUtil::computeMidPos( aStep );
+ G4ThreeVector globalMidPos = ReadoutUtil::computeMidPos(aStep);
- setBin( 0, getThetaBin( globalMidPos ) ); - setBin( 1, getPhiBin( globalMidPos ) );
+ setBin(0, getThetaBin(globalMidPos)); + setBin(1, getPhiBin(globalMidPos));
}
void G4ProjectiveSegmentation::setBins(const G4StepPoint* aPreStepPoint)
{
- G4ThreeVector globalPos = aPreStepPoint->GetPosition(); - - setBin( 0, getThetaBin( globalPos ) ); - setBin( 1, getPhiBin( globalPos ) );
+ G4ThreeVector globalPos = aPreStepPoint->GetPosition(); + + setBin(0, getThetaBin(globalPos)); + setBin(1, getPhiBin(globalPos));
}
G4int G4ProjectiveSegmentation::getNtheta() const
{
- return m_ntheta;
+ return m_ntheta;
}
G4int G4ProjectiveSegmentation::getNphi() const
{
- return m_nphi;
+ return m_nphi;
}
void G4ProjectiveSegmentation::computeDivisions()
{
- m_divTheta = ( 180.0 * deg ) / m_ntheta; - m_divPhi = ( 360.0 * deg ) / m_nphi;
+ m_divTheta = (180.0 * deg) / m_ntheta; + m_divPhi = (360.0 * deg) / m_nphi;
}
int G4ProjectiveSegmentation::getThetaBin(const G4ThreeVector& globalStepPos)
{
- // theta needs to be in range 0 - PI - return G4Segmentation::computeBin( globalStepPos.theta(), m_divTheta / radian );
+ // theta needs to be in range 0 - PI + return G4Segmentation::computeBin(globalStepPos.theta(), m_divTheta / radian);
}
int G4ProjectiveSegmentation::getPhiBin(const G4ThreeVector& globalStepPos)
{
- // adjust phi for < 0 - double sphi = globalStepPos.phi();
+ // adjust phi for < 0 + double sphi = globalStepPos.phi();
- if ( sphi < 0.0 ) {
- sphi += 360.0 * deg;
- }
-
- // needs more checks, for phi in range 0 - TWOPI
- // if > TWOPI, then subtract TWOPI
- //
- // OR use X, Y for phi calc
+ if (sphi < 0.0) {
+ sphi += 360.0 * deg;
+ }
+
+ // needs more checks, for phi in range 0 - TWOPI
+ // if > TWOPI, then subtract TWOPI
+ //
+ // OR use X, Y for phi calc
- // compute and return bin - return G4Segmentation::computeBin( sphi, m_divPhi / radian );
+ // compute and return bin + return G4Segmentation::computeBin(sphi, m_divPhi / radian);
}
// default impl. returns mag of pos
double G4ProjectiveSegmentation::getRadius(const G4Step* aStep)
{
- //G4cout << "G4ProjectiveSegmentation::getRadius()" << G4endl;
+ //G4cout << "G4ProjectiveSegmentation::getRadius()" << G4endl;
- return ReadoutUtil::computeMidPos( aStep ).mag();
+ return ReadoutUtil::computeMidPos(aStep).mag();
}
double G4ProjectiveSegmentation::getRadius(const G4StepPoint* aPreStepPoint)
{
- //G4cout << "G4ProjectiveSegmentation::getRadius()" << G4endl; - return aPreStepPoint->GetPosition().mag();
+ //G4cout << "G4ProjectiveSegmentation::getRadius()" << G4endl; + return aPreStepPoint->GetPosition().mag();
}
// default impl. returns z of pos
double G4ProjectiveSegmentation::getZ(const G4Step* aStep)
{
- //G4cout << "G4ProjectiveSegmentation::getZ()" << G4endl; - return ReadoutUtil::computeMidPos( aStep ).z();
+ //G4cout << "G4ProjectiveSegmentation::getZ()" << G4endl; + return ReadoutUtil::computeMidPos(aStep).z();
}
double G4ProjectiveSegmentation::getZ(const G4StepPoint* aPreStepPoint)
{
- //G4cout << "G4ProjectiveSegmentation::getZ()" << G4endl; - return aPreStepPoint->GetPosition().z();
+ //G4cout << "G4ProjectiveSegmentation::getZ()" << G4endl; + return aPreStepPoint->GetPosition().z();
}
double G4ProjectiveSegmentation::getThetaDim(const int &thetaBin) const
{
- return G4Segmentation::computeDim(thetaBin, - m_divTheta);
+ return G4Segmentation::computeDim(thetaBin, m_divTheta);
}
-
double G4ProjectiveSegmentation::getPhiDim(const int &phiBin) const
{
- return G4Segmentation::computeDim(phiBin, - m_divPhi);
+ return G4Segmentation::computeDim(phiBin, m_divPhi);
}
double G4ProjectiveSegmentation::getThetaDim(const G4Step* aStep)
{
- //G4cout << "G4ProjectiveSegmentation::getThetaDim(G4Step*)" << G4endl; - G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos( aStep ); - double ctheta = getThetaDim( getThetaBin( globalStepPos ) ); - return ctheta;
+ //G4cout << "G4ProjectiveSegmentation::getThetaDim(G4Step*)" << G4endl; + G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos(aStep); + double ctheta = getThetaDim(getThetaBin(globalStepPos)); + return ctheta;
}
double G4ProjectiveSegmentation::getThetaDim(const G4StepPoint* aPreStepPoint)
{
- //G4cout << "G4ProjectiveSegmentation::getThetaDim(G4Step*)" << G4endl; - G4ThreeVector globalStepPos = aPreStepPoint->GetPosition(); - double ctheta = getThetaDim( getThetaBin( globalStepPos ) ); - return ctheta;
+ //G4cout << "G4ProjectiveSegmentation::getThetaDim(G4Step*)" << G4endl; + G4ThreeVector globalStepPos = aPreStepPoint->GetPosition(); + double ctheta = getThetaDim(getThetaBin(globalStepPos)); + return ctheta;
}
double G4ProjectiveSegmentation::getPhiDim(const G4Step* aStep)
{
- //G4cout << "G4ProjectiveSegmentation::getPhiDim(G4Step*)" << G4endl;
+ //G4cout << "G4ProjectiveSegmentation::getPhiDim(G4Step*)" << G4endl;
- G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos( aStep ); - double cphi = getPhiDim( getPhiBin( globalStepPos ) ); - return cphi;
+ G4ThreeVector globalStepPos = ReadoutUtil::computeMidPos(aStep); + double cphi = getPhiDim(getPhiBin(globalStepPos)); + return cphi;
}
double G4ProjectiveSegmentation::getPhiDim(const G4StepPoint* aPreStepPoint)
{
- //G4cout << "G4ProjectiveSegmentation::getPhiDim(G4Step*)" << G4endl;
+ //G4cout << "G4ProjectiveSegmentation::getPhiDim(G4Step*)" << G4endl;
- G4ThreeVector globalStepPos = aPreStepPoint->GetPosition(); - double cphi = getPhiDim( getPhiBin( globalStepPos ) ); - return cphi;
+ G4ThreeVector globalStepPos = aPreStepPoint->GetPosition(); + double cphi = getPhiDim(getPhiBin(globalStepPos)); + return cphi;
}
diff -u -r1.3 -r1.4 --- G4ProjectiveZPlaneSegmentation.cc 1 Apr 2008 19:52:47 -0000 1.3 +++ G4ProjectiveZPlaneSegmentation.cc 24 Jun 2013 22:10:36 -0000 1.4 @@ -1,56 +1,57 @@
-// $Header: /cvs/lcd/lcdd/src/G4ProjectiveZPlaneSegmentation.cc,v 1.3 2008/04/01 19:52:47 wenzel Exp $
+// $Header: /cvs/lcd/lcdd/src/G4ProjectiveZPlaneSegmentation.cc,v 1.4 2013/06/24 22:10:36 jeremy Exp $
#include "G4ProjectiveZPlaneSegmentation.hh" #include "ReadoutUtil.hh"
-G4ProjectiveZPlaneSegmentation::G4ProjectiveZPlaneSegmentation(G4int ntheta,
- G4int nphi)
- : G4ProjectiveSegmentation( ntheta, nphi )
-{}
+G4ProjectiveZPlaneSegmentation::G4ProjectiveZPlaneSegmentation(G4int ntheta, G4int nphi) :
+ G4ProjectiveSegmentation(ntheta, nphi)
+{
+}
G4ProjectiveZPlaneSegmentation::~G4ProjectiveZPlaneSegmentation()
-{}
+{
+}
double G4ProjectiveZPlaneSegmentation::getRadius(const G4Step* aStep)
{
- //G4cout << "G4ProjectiveZPlaneSegmentation::getRadius()" << G4endl;
+ //G4cout << "G4ProjectiveZPlaneSegmentation::getRadius()" << G4endl;
- double zcell = getZ( aStep );
+ double zcell = getZ(aStep);
- double ctheta = G4ProjectiveSegmentation::getThetaDim( aStep );
+ double ctheta = G4ProjectiveSegmentation::getThetaDim(aStep);
- double rcyl = zcell * tan( ctheta );
+ double rcyl = zcell * tan(ctheta);
- return rcyl;
+ return rcyl;
}
double G4ProjectiveZPlaneSegmentation::getRadius(const G4StepPoint* aPreStepPoint)
{
- //G4cout << "G4ProjectiveZPlaneSegmentation::getRadius()" << G4endl;
+ //G4cout << "G4ProjectiveZPlaneSegmentation::getRadius()" << G4endl;
- double zcell = getZ( aPreStepPoint );
+ double zcell = getZ(aPreStepPoint);
- double ctheta = G4ProjectiveSegmentation::getThetaDim( aPreStepPoint );
+ double ctheta = G4ProjectiveSegmentation::getThetaDim(aPreStepPoint);
- double rcyl = zcell * tan( ctheta );
+ double rcyl = zcell * tan(ctheta);
- return rcyl;
+ return rcyl;
}
double G4ProjectiveZPlaneSegmentation::getZ(const G4Step* aStep)
{
- //G4cout << "G4ProjectiveZPlaneSegmentation::getZ()" << G4endl;
+ //G4cout << "G4ProjectiveZPlaneSegmentation::getZ()" << G4endl;
- G4ThreeVector gpos = ReadoutUtil::getVolumeGlobalPosition( aStep->GetPreStepPoint(), G4ThreeVector() ); - return gpos.z();
+ G4ThreeVector gpos = ReadoutUtil::getVolumeGlobalPosition(aStep->GetPreStepPoint(), G4ThreeVector()); + return gpos.z();
}
double G4ProjectiveZPlaneSegmentation::getZ(const G4StepPoint* aPreStepPoint)
{
- //G4cout << "G4ProjectiveZPlaneSegmentation::getZ()" << G4endl;
+ //G4cout << "G4ProjectiveZPlaneSegmentation::getZ()" << G4endl;
- G4ThreeVector gpos = ReadoutUtil::getVolumeGlobalPosition( aPreStepPoint, G4ThreeVector() ); - return gpos.z();
+ G4ThreeVector gpos = ReadoutUtil::getVolumeGlobalPosition(aPreStepPoint, G4ThreeVector()); + return gpos.z();
}
diff -u -r1.11 -r1.12 --- G4RZFieldMap.cc 1 Feb 2012 10:28:56 -0000 1.11 +++ G4RZFieldMap.cc 24 Jun 2013 22:10:36 -0000 1.12 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4RZFieldMap.cc,v 1.11 2012/02/01 10:28:56 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4RZFieldMap.cc,v 1.12 2013/06/24 22:10:36 jeremy Exp $
#include "G4RZFieldMap.hh" #include "globals.hh"
@@ -14,105 +14,94 @@
using std::endl; #endif
-G4RZFieldMap::G4RZFieldMap(int numBinsR, - int numBinsZ, - double gridSizeR, - double gridSizeZ, - std::vector<RZBData> fieldData) - : m_numBinsR(numBinsR), - m_numBinsZ(numBinsZ), - m_gridSizeR(gridSizeR), - m_gridSizeZ(gridSizeZ), - m_BrArray(0), - m_BzArray(0)
+G4RZFieldMap::G4RZFieldMap(int numBinsR, int numBinsZ, double gridSizeR, double gridSizeZ, std::vector<RZBData> fieldData) : + m_numBinsR(numBinsR), m_numBinsZ(numBinsZ), m_gridSizeR(gridSizeR), m_gridSizeZ(gridSizeZ), m_BrArray(0), m_BzArray(0)
{
#ifdef FIELD_MAP_DEBUG
- cout << "numBinsR=" << numBinsR << endl; - cout << "numBinsZ=" << numBinsZ << endl; - cout << "gridSizeR=" << gridSizeR << endl; - cout << "gridSizeZ=" << gridSizeZ << endl;
+ cout << "numBinsR=" << numBinsR << endl; + cout << "numBinsZ=" << numBinsZ << endl; + cout << "gridSizeR=" << gridSizeR << endl; + cout << "gridSizeZ=" << gridSizeZ << endl;
#endif
- if ( numBinsR < 2 ) {
- G4Exception("", "", FatalException, "numBinsR must be >= 2");
- }
+ if (numBinsR < 2) {
+ G4Exception("", "", FatalException, "numBinsR must be >= 2");
+ }
- if ( numBinsZ < 2 ) {
- G4Exception("", "", FatalException, "numBinsZ must be >= 2");
- }
+ if (numBinsZ < 2) {
+ G4Exception("", "", FatalException, "numBinsZ must be >= 2");
+ }
- if ( gridSizeR <= 0 ) {
- G4Exception("", "", FatalException, "gridSizeR must be >= 0");
- }
+ if (gridSizeR <= 0) {
+ G4Exception("", "", FatalException, "gridSizeR must be >= 0");
+ }
- if ( gridSizeZ <= 0 ) {
- G4Exception("", "", FatalException, "gridSizeZ must be >= 0");
- }
+ if (gridSizeZ <= 0) {
+ G4Exception("", "", FatalException, "gridSizeZ must be >= 0");
+ }
- m_maxR = ( numBinsR - 1 ) * m_gridSizeR; - m_maxZ = ( numBinsZ - 1 ) * m_gridSizeZ;
+ m_maxR = (numBinsR - 1) * m_gridSizeR; + m_maxZ = (numBinsZ - 1) * m_gridSizeZ;
- initializeArrays(); - fillArrays(fieldData);
+ initializeArrays(); + fillArrays(fieldData);
}
void G4RZFieldMap::initializeArrays()
{
- // Make two 2D arrays of numBinsZ x numBinsR
- m_BrArray = new double*[m_numBinsZ];
- m_BzArray = new double*[m_numBinsZ];
-
- for (int i=0; i<m_numBinsZ; i++) {
- m_BrArray[i] = new double[m_numBinsR];
- m_BzArray[i] = new double[m_numBinsR];
- }
-
- // Initialize arrays to all 0's.
- for ( int i=0; i<m_numBinsZ; i++) {
- for ( int j=0; j<m_numBinsR; j++) {
- m_BrArray[i][j]=0;
- m_BzArray[i][j]=0;
+ // Make two 2D arrays of numBinsZ x numBinsR
+ m_BrArray = new double*[m_numBinsZ];
+ m_BzArray = new double*[m_numBinsZ];
+
+ for (int i = 0; i < m_numBinsZ; i++) {
+ m_BrArray[i] = new double[m_numBinsR];
+ m_BzArray[i] = new double[m_numBinsR];
+ }
+
+ // Initialize arrays to all 0's.
+ for (int i = 0; i < m_numBinsZ; i++) {
+ for (int j = 0; j < m_numBinsR; j++) {
+ m_BrArray[i][j] = 0;
+ m_BzArray[i][j] = 0;
+ }
}
- }
}
void G4RZFieldMap::fillArrays(std::vector<RZBData> fieldData)
{
- for ( std::vector<RZBData>::iterator iter = fieldData.begin();
- iter != fieldData.end();
- iter++ ) {
- RZBData rzb = *iter;
-
- int iz= (int) ((rzb.z() + 0.0001)/m_gridSizeZ);
- iz = iz;
- int ir=(int) ((rzb.r() + 0.0001)/m_gridSizeR);
- ir = ir;
+ for (std::vector<RZBData>::iterator iter = fieldData.begin(); iter != fieldData.end(); iter++) {
+ RZBData rzb = *iter;
+
+ int iz = (int) ((rzb.z() + 0.0001) / m_gridSizeZ);
+ iz = iz;
+ int ir = (int) ((rzb.r() + 0.0001) / m_gridSizeR);
+ ir = ir;
- m_BzArray[iz][ir] = rzb.Bz(); - m_BrArray[iz][ir] = rzb.Br();
+ m_BzArray[iz][ir] = rzb.Bz(); + m_BrArray[iz][ir] = rzb.Br();
#ifdef FIELD_MAP_DEBUG
- cout << "ir iz = " << ir << " " << iz << endl; - cout << "Br Bz = " << m_BrArray[iz][ir] << " " << m_BzArray[iz][ir] << endl; - cout << endl;
+ cout << "ir iz = " << ir << " " << iz << endl; + cout << "Br Bz = " << m_BrArray[iz][ir] << " " << m_BzArray[iz][ir] << endl; + cout << endl;
#endif
- }
+ }
}
G4RZFieldMap::~G4RZFieldMap()
{
- deleteArrays();
+ deleteArrays();
}
void G4RZFieldMap::deleteArrays()
{
- for (int i=0; i<m_numBinsZ; i++) {
- delete[] m_BrArray[i];
- delete[] m_BzArray[i];
- }
- delete[] m_BrArray;
- delete[] m_BzArray;
+ for (int i = 0; i < m_numBinsZ; i++) {
+ delete[] m_BrArray[i];
+ delete[] m_BzArray[i];
+ }
+ delete[] m_BrArray;
+ delete[] m_BzArray;
} /**
@@ -125,134 +114,134 @@
* via the RZBFieldProvider.cpp test code provided by Norman. * */
-void G4RZFieldMap::GetFieldValue( const double Point[3], double *Bfield ) const
+void G4RZFieldMap::GetFieldValue(const double Point[3], double *Bfield) const
{
#ifdef FIELD_MAP_DEBUG
- cout << "Point = " << Point[0] << " " << Point[1] << " " << Point[2] << endl;
+ cout << "Point = " << Point[0] << " " << Point[1] << " " << Point[2] << endl;
#endif
- double r = sqrt( ( Point[0] * Point[0] ) + ( Point[1] * Point[1] ) ); - double z = Point[2];
+ double r = sqrt((Point[0] * Point[0]) + (Point[1] * Point[1])); + double z = Point[2];
- double hz = 0; - double hr = 0;
+ double hz = 0; + double hr = 0;
- // Check for z or r out of range.
- if(fabs(z) >= m_maxZ || r >= m_maxR) {
+ // Check for z or r out of range.
+ if (fabs(z) >= m_maxZ || r >= m_maxR) {
#ifdef FIELD_MAP_DEBUG
- cout << "OUT OF RANGE: z r = " << fabs(z) << " " << r << endl; - cout << "MAX: maxZ maxR " << m_maxZ << " " << m_maxR << endl;
+ cout << "OUT OF RANGE: z r = " << fabs(z) << " " << r << endl; + cout << "MAX: maxZ maxR " << m_maxZ << " " << m_maxR << endl;
#endif
- return; - }
+ return; + }
- // Compute z bin. - int iz = (int) ((fabs(z)+0.001)/m_gridSizeZ);
+ // Compute z bin. + int iz = (int) ((fabs(z) + 0.001) / m_gridSizeZ);
- // Compute r bin. - int ir = (int) ((r+0.001)/m_gridSizeR);
+ // Compute r bin. + int ir = (int) ((r + 0.001) / m_gridSizeR);
- // Adjust for iz out of range.
+ // Adjust for iz out of range.
// int izfar = 0;
// if( iz >= m_numBinsZ-1 ) {
// izfar = 1;
// iz = m_numBinsZ - 1;
// }
- // Check for iz < 0.
- if ( iz < 0 ) {
+// Check for iz < 0.
+ if (iz < 0) {
#ifdef FIELD_MAP_DEBUG
- cout << "ERROR: iz < 0" << endl; - cout << "iz=" << iz << endl; - cout << "returning" << endl;
+ cout << "ERROR: iz < 0" << endl; + cout << "iz=" << iz << endl; + cout << "returning" << endl;
#endif
- }
+ }
// Check for Z overflow on iz+1.
- if ( iz+1 >= m_numBinsZ ) {
+ if (iz + 1 >= m_numBinsZ) {
#ifdef FIELD_MAP_DEBUG
- cout << "ERROR: iz overflow" << endl; - cout << "iz=" << iz << endl; - cout << "returning" << endl;
+ cout << "ERROR: iz overflow" << endl; + cout << "iz=" << iz << endl; + cout << "returning" << endl;
#endif
- return; - }
+ return; + }
- // Check for R overflow on ir+1.
- if ( ir+1 >= m_numBinsR ) {
+ // Check for R overflow on ir+1.
+ if (ir + 1 >= m_numBinsR) {
#ifdef FIELD_MAP_DEBUG
- cout << "ERROR: ir overflow" << endl; - cout << "ir=" << ir << endl; - cout << "returning" << endl;
+ cout << "ERROR: ir overflow" << endl; + cout << "ir=" << ir << endl; + cout << "returning" << endl;
#endif
- return; - }
+ return; + }
#ifdef FIELD_MAP_DEBUG
- cout << "dz " << m_gridSizeZ << " dr " << m_gridSizeR << endl; - cout << "z " << z << " r " << r << endl; - cout << "iz " << iz << " ir " << ir << endl;
+ cout << "dz " << m_gridSizeZ << " dr " << m_gridSizeR << endl; + cout << "z " << z << " r " << r << endl; + cout << "iz " << iz << " ir " << ir << endl;
#endif
- double bz0 = m_BzArray[iz][ir]; - double br0 = m_BrArray[iz][ir];
+ double bz0 = m_BzArray[iz][ir]; + double br0 = m_BrArray[iz][ir];
#ifdef FIELD_MAP_DEBUG
- cout << "bz0 " << bz0 << " br0 " << br0 << endl;
+ cout << "bz0 " << bz0 << " br0 " << br0 << endl;
#endif
- double delz = 0.; - double delr = 0.;
+ double delz = 0.; + double delr = 0.;
- double brdz = 0.; - double brdr = 0.;
+ double brdz = 0.; + double brdr = 0.;
- if(r>0.0) {
- delr = r - float(ir) * m_gridSizeR;
+ if (r > 0.0) {
+ delr = r - float(ir) * m_gridSizeR;
#ifdef FIELD_MAP_DEBUG
- if ( iz+1 == m_gridSizeZ-1 ) {
- cout << "WARNING: iz+1 == gridSizeZ-1" << endl;
- }
+ if ( iz+1 == m_gridSizeZ-1 ) {
+ cout << "WARNING: iz+1 == gridSizeZ-1" << endl;
+ }
- if ( ir+1 == m_gridSizeR-1 ) {
- cout << "WARNING: ir+1 == gridSizeR-1" << endl;
- }
+ if ( ir+1 == m_gridSizeR-1 ) {
+ cout << "WARNING: ir+1 == gridSizeR-1" << endl;
+ }
#endif #ifdef FIELD_MAP_DEBUG
- cout << "checking brarray access ..." << endl; - cout << "iz+1=" << iz+1 << endl; - cout << "ir=" << ir << endl; - cout << m_BrArray[iz+1][ir] << endl; - cout << "m_BrArray[iz+1][ir] is ok" << endl; - cout << "iz=" << iz << endl; - cout << "ir+1=" << ir+1 << endl; - cout << m_BrArray[iz][ir+1] << endl; - cout << "m_BrArray[iz][ir+1] is ok" << endl; - cout << "done" << endl;
+ cout << "checking brarray access ..." << endl; + cout << "iz+1=" << iz+1 << endl; + cout << "ir=" << ir << endl; + cout << m_BrArray[iz+1][ir] << endl; + cout << "m_BrArray[iz+1][ir] is ok" << endl; + cout << "iz=" << iz << endl; + cout << "ir+1=" << ir+1 << endl; + cout << m_BrArray[iz][ir+1] << endl; + cout << "m_BrArray[iz][ir+1] is ok" << endl; + cout << "done" << endl;
#endif
- brdz = (m_BrArray[iz+1][ir]-br0)/m_gridSizeZ; - brdr = (m_BrArray[iz][ir+1]-br0)/m_gridSizeR;
+ brdz = (m_BrArray[iz + 1][ir] - br0) / m_gridSizeZ; + brdr = (m_BrArray[iz][ir + 1] - br0) / m_gridSizeR;
#ifdef FIELD_MAP_DEBUG
- cout << "br= " << m_BrArray[iz+1][ir] << " " << m_BrArray[iz][ir+1] << endl;
+ cout << "br= " << m_BrArray[iz+1][ir] << " " << m_BrArray[iz][ir+1] << endl;
#endif
- }
+ }
- delz = fabs(z) - float(iz) * m_gridSizeZ;
+ delz = fabs(z) - float(iz) * m_gridSizeZ;
#ifdef FIELD_MAP_DEBUG
- cout << " z " << z << " abs(z) " << fabs(z) << " iz " << iz << endl; - cout << " float(iz-1) " << float(iz-1) << " dz " << m_gridSizeZ << endl; - cout << " delz " << delz << endl;
+ cout << " z " << z << " abs(z) " << fabs(z) << " iz " << iz << endl; + cout << " float(iz-1) " << float(iz-1) << " dz " << m_gridSizeZ << endl; + cout << " delz " << delz << endl;
#endif
- double bzdz = (m_BzArray[iz+1][ir]-bz0)/m_gridSizeZ; - double bzdr = (m_BzArray[iz][ir+1]-bz0)/m_gridSizeR;
+ double bzdz = (m_BzArray[iz + 1][ir] - bz0) / m_gridSizeZ; + double bzdr = (m_BzArray[iz][ir + 1] - bz0) / m_gridSizeR;
#ifdef FIELD_MAP_DEBUG
- cout << "bz= " << m_BzArray[iz+1][ir] << " " << m_BzArray[iz][ir+1] << endl;
+ cout << "bz= " << m_BzArray[iz+1][ir] << " " << m_BzArray[iz][ir+1] << endl;
#endif
// if(izfar==1) {
@@ -260,22 +249,23 @@
// hr = br0+brdr*delr;
// }
// else {
- hz = bz0+bzdz*delz+bzdr*delr; - hr = br0+brdz*delz+brdr*delr;
+ hz = bz0 + bzdz * delz + bzdr * delr; + hr = br0 + brdz * delz + brdr * delr;
// }
- if(z<0.0) hr = -hr;
+ if (z < 0.0) + hr = -hr;
- double theta = atan2(Point[1], Point[0]); - double hx = hr * cos(theta); - double hy = hr * sin(theta);
+ double theta = atan2(Point[1], Point[0]); + double hx = hr * cos(theta); + double hy = hr * sin(theta);
- Bfield[0] += hx; - Bfield[1] += hy; - Bfield[2] += hz;
+ Bfield[0] += hx; + Bfield[1] += hy; + Bfield[2] += hz;
#ifdef FIELD_MAP_DEBUG
- cout << "Bfield XYZ = " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << endl; - cout << endl;
+ cout << "Bfield XYZ = " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << endl; + cout << endl;
#endif }
diff -u -r1.3 -r1.4 --- G4ScorerSD.cc 10 Mar 2006 07:40:34 -0000 1.3 +++ G4ScorerSD.cc 24 Jun 2013 22:10:36 -0000 1.4 @@ -2,98 +2,94 @@
#include "TrackInformation.hh"
-G4ScorerSD::G4ScorerSD(G4String sdName,
- G4String hcName
- )
- : G4TrackerSD(sdName, hcName),
- m_currentTrackID(-1)
-{}
+G4ScorerSD::G4ScorerSD(G4String sdName, G4String hcName) :
+ G4TrackerSD(sdName, hcName), m_currentTrackID(-1)
+{
+}
G4bool G4ScorerSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
{
#ifdef G4VERBOSE
- if ( m_verbose > 1 ) {
- std::cout << "G4ScorerSD::ProcessHits() - " << this->GetName() << std::endl;
- }
+ if ( m_verbose > 1 ) {
+ std::cout << "G4ScorerSD::ProcessHits() - " << this->GetName() << std::endl;
+ }
#endif
- G4SensitiveDetector::ProcessHits( aStep, 0 );
+ G4SensitiveDetector::ProcessHits(aStep, 0);
- bool sameTrack = false;
+ bool sameTrack = false;
#ifdef G4VERBOSE
- if ( m_verbose > 3 ) {
- std::cout << "current trackID <" << m_currentTrackID << ">" << std::endl;
- }
+ if ( m_verbose > 3 ) {
+ std::cout << "current trackID <" << m_currentTrackID << ">" << std::endl;
+ }
#endif
- if ( (m_currentTrackID == -1) || (m_currentTrackID != trackID() ) ) {
+ if ((m_currentTrackID == -1) || (m_currentTrackID != trackID())) {
#ifdef G4VERBOSE
- if ( m_verbose > 2 ) {
- std::cout << "new track <" << trackID() << ">" << std::endl;
- }
+ if ( m_verbose > 2 ) {
+ std::cout << "new track <" << trackID() << ">" << std::endl;
+ }
#endif
- m_currentTrackID = trackID();
- }
- else {
+ m_currentTrackID = trackID();
+ } else {
#ifdef G4VERBOSE
- if ( m_verbose > 2 ) {
- std::cout << "old track <" << trackID() << ">" << std::endl;
- }
+ if ( m_verbose > 2 ) {
+ std::cout << "old track <" << trackID() << ">" << std::endl;
+ }
#endif
- sameTrack = true; - }
+ sameTrack = true; + }
- if ( !sameTrack ) {
+ if (!sameTrack) {
#ifdef G4VERBOSE
- if ( m_verbose > 2 ) {
- std::cout << "writing hit" << std::endl;
- }
+ if ( m_verbose > 2 ) {
+ std::cout << "writing hit" << std::endl;
+ }
#endif
- // edep - G4double e = edep();
+ // edep + G4double e = edep(); + + // get track information + TrackInformation* trkInfo = trackInformation(); + + // set hit flag in trk info + trkInfo->setHasTrackerHit(true); + + // hit data + G4int trkID = trackID(); + G4double tdep = globalTime(); + G4ThreeVector prepos = prePosition(); + G4ThreeVector meanmom = meanMomentum();
- // get track information - TrackInformation* trkInfo = trackInformation();
+ // create hit + G4TrackerHit* trkHit = new G4TrackerHit();
- // set hit flag in trk info - trkInfo->setHasTrackerHit( true );
+ // create id vector + Id64bit id64 = makeId();
- // hit data
- G4int trkID = trackID();
- G4double tdep = globalTime();
- G4ThreeVector prepos = prePosition();
- G4ThreeVector meanmom = meanMomentum();
-
- // create hit
- G4TrackerHit* trkHit = new G4TrackerHit();
-
- // create id vector
- Id64bit id64 = makeId();
-
- // set track hit info
- trkHit->setTrackID(trkID);
- trkHit->setEdep(e);
- trkHit->setPos(prepos);
- trkHit->setMomentum(meanmom);
- trkHit->setTdep(tdep);
- trkHit->setId( id64.getId0() );
- trkHit->setLength(ReadoutUtil::computeDistance(aStep));
-
- // add to HC
- m_HC->insert(trkHit);
- }
- else {
+ // set track hit info
+ trkHit->setTrackID(trkID);
+ trkHit->setEdep(e);
+ trkHit->setPos(prepos);
+ trkHit->setMomentum(meanmom);
+ trkHit->setTdep(tdep);
+ trkHit->setId(id64.getId0());
+ trkHit->setLength(ReadoutUtil::computeDistance(aStep));
+
+ // add to HC
+ m_HC->insert(trkHit);
+ } else {
#ifdef G4VERBOSE
- if ( m_verbose > 0 ) {
- std::cout << "Skipping hit from track <" << m_currentTrackID << ">." << std::endl;
- }
+ if ( m_verbose > 0 ) {
+ std::cout << "Skipping hit from track <" << m_currentTrackID << ">." << std::endl;
+ }
#endif
- } - return true;
+ } + return true;
}
diff -u -r1.12 -r1.13 --- G4Segmentation.cc 19 Mar 2010 19:25:21 -0000 1.12 +++ G4Segmentation.cc 24 Jun 2013 22:10:36 -0000 1.13 @@ -1,45 +1,45 @@
-// $Header: /cvs/lcd/lcdd/src/G4Segmentation.cc,v 1.12 2010/03/19 19:25:21 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4Segmentation.cc,v 1.13 2013/06/24 22:10:36 jeremy Exp $
#include "G4Segmentation.hh" #include "ReadoutUtil.hh"
-G4Segmentation::G4Segmentation(EType segType, int nbins) - : m_numBins( nbins ), - m_type( segType )
+G4Segmentation::G4Segmentation(EType segType, int nbins) : + m_numBins(nbins), m_type(segType)
{
- // reserve nbins - m_bins.reserve( m_numBins );
+ // reserve nbins + m_bins.reserve(m_numBins);
- // fill in 0 vals - resetBins();
+ // fill in 0 vals + resetBins();
} G4Segmentation::~G4Segmentation()
-{}
+{
+}
void G4Segmentation::setBin(int binIdx, int binVal)
{
- m_bins.insert( m_bins.begin() + binIdx, binVal );
+ m_bins.insert(m_bins.begin() + binIdx, binVal);
}
int G4Segmentation::getNumberOfBins()
{
- return m_numBins;
+ return m_numBins;
}
const std::vector<int>& G4Segmentation::getBins()
{
- return m_bins;
+ return m_bins;
}
G4Segmentation::EType G4Segmentation::getType()
{
- return m_type;
+ return m_type;
}
G4ThreeVector G4Segmentation::getGlobalHitPos(const G4Step* aStep)
{
- return ReadoutUtil::computeMidPos( aStep );
+ return ReadoutUtil::computeMidPos(aStep);
} G4ThreeVector G4Segmentation::getGlobalHitPosPreStep(const G4StepPoint* aPreStepPoint)
@@ -50,27 +50,25 @@
void G4Segmentation::resetBins()
{
- m_bins.clear();
+ m_bins.clear();
}
void G4Segmentation::printOutBins(std::ostream& os, const std::vector<int>& bins)
{
- os << "segmentationBins <" << bins.size() << "> :: ";
- for ( std::vector<int>::const_iterator iter = bins.begin();
- iter != bins.end();
- iter++ ) {
- os << *iter << " ";
- }
- os << std::endl;
+ os << "segmentationBins <" << bins.size() << "> :: ";
+ for (std::vector<int>::const_iterator iter = bins.begin(); iter != bins.end(); iter++) {
+ os << *iter << " ";
+ }
+ os << std::endl;
}
bool G4Segmentation::isValidSolid(G4VSolid* s)
{
- bool valid = true;
+ bool valid = true;
- if ( 0 == s ) {
- valid = false;
- }
+ if (0 == s) {
+ valid = false;
+ }
- return valid;
+ return valid;
}
diff -u -r1.11 -r1.12 --- G4SegmentationFactory.cc 10 Jun 2013 19:41:48 -0000 1.11 +++ G4SegmentationFactory.cc 24 Jun 2013 22:10:36 -0000 1.12 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4SegmentationFactory.cc,v 1.11 2013/06/10 19:41:48 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4SegmentationFactory.cc,v 1.12 2013/06/24 22:10:36 jeremy Exp $
// GDML #include "Saxana/SAXObject.h"
@@ -67,9 +67,7 @@
//std::cout << "grid x, y, z: " << gsx << ", " << gsy << ", " << gsz << std::endl;
- seg = new G4GridXYZSegmentation(gsx, - gsy, - gsz);
+ seg = new G4GridXYZSegmentation(gsx, gsy, gsz);
} else {
std::cerr << "Failed cast to grid_xyz!" << std::endl;
}
diff -u -r1.18 -r1.19 --- G4SensitiveDetector.cc 18 Jun 2013 19:58:43 -0000 1.18 +++ G4SensitiveDetector.cc 24 Jun 2013 22:10:36 -0000 1.19 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4SensitiveDetector.cc,v 1.18 2013/06/18 19:58:43 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4SensitiveDetector.cc,v 1.19 2013/06/24 22:10:36 jeremy Exp $
#include "G4SensitiveDetector.hh"
@@ -27,13 +27,8 @@
const std::string& G4SensitiveDetector::calorimeterStr = "calorimeter"; const std::string& G4SensitiveDetector::noneStr = "none";
-G4SensitiveDetector::G4SensitiveDetector(G4String sdName, - G4String hcName, - EType sdType) -: - G4VSensitiveDetector(sdName), - m_idspec(0), - m_type(sdType)
+G4SensitiveDetector::G4SensitiveDetector(G4String sdName, G4String hcName, EType sdType) : + G4VSensitiveDetector(sdName), m_idspec(0), m_type(sdType)
{
// insert hits collection name into SD's name vector
collectionName.insert(hcName);
@@ -49,13 +44,8 @@
m_hcids.push_back(-1); }
-G4SensitiveDetector::G4SensitiveDetector(G4String sdName, - const vector<G4String>& hcNames, - EType sdType) -: - G4VSensitiveDetector(sdName), - m_idspec(0), - m_type(sdType)
+G4SensitiveDetector::G4SensitiveDetector(G4String sdName, const vector<G4String>& hcNames, EType sdType) : + G4VSensitiveDetector(sdName), m_idspec(0), m_type(sdType)
{
m_hcids.clear();
@@ -99,8 +89,7 @@
{
if (m_type == eTracker) {
return trackerStr;
- }
- else if (m_type == eCalorimeter) {
+ } else if (m_type == eCalorimeter) {
return calorimeterStr;
}
return noneStr;
@@ -119,9 +108,7 @@
if (m_idspec != 0) {
os << "id spec: " << m_idspec->getName() << std::endl;
os << "id fields:";
- for (IdSpec::IdFields::const_iterator it = m_idspec->IdFieldsBegin();
- it != m_idspec->IdFieldsEnd();
- it++) {
+ for (IdSpec::IdFields::const_iterator it = m_idspec->IdFieldsBegin(); it != m_idspec->IdFieldsEnd(); it++) {
os << " " << (*it)->getLabel();
}
os << std::endl;
@@ -150,26 +137,23 @@
{
G4VHitsCollection* hc = 0;
if (this->getHCID() != -1) {
- hc = G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetHCofThisEvent()->GetHC( - this->getHCID());
+ hc = G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetHCofThisEvent()->GetHC(this->getHCID());
}
return hc;
}
G4VHitsCollection* G4SensitiveDetector::getHitsCollection(G4int nHC) const
- {
+{
G4VHitsCollection* hc = 0;
if (this->getHCID(nHC) != -1) {
- hc = G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetHCofThisEvent()->GetHC( - this->getHCID(nHC));
+ hc = G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetHCofThisEvent()->GetHC(this->getHCID(nHC));
}
return hc;
}
std::ostream& G4SensitiveDetector::printNumberOfHits(std::ostream& os)
{
- for (int i = 0; i < getNumberOfHitsCollections(); i++)
- {
+ for (int i = 0; i < getNumberOfHitsCollections(); i++) {
os << getHitsCollection(i)->GetName() << " " << getHitsCollection(i)->GetSize() << std::endl;
}
return os;
@@ -184,9 +168,7 @@
std::vector<G4LogicalVolume*> G4SensitiveDetector::getLogicalVolumes() const
{
std::vector<G4LogicalVolume*> volumes;
- for (G4LogicalVolumeStore::const_iterator it = G4LogicalVolumeStore::GetInstance()->begin();
- it != G4LogicalVolumeStore::GetInstance()->end();
- it++) {
+ for (G4LogicalVolumeStore::const_iterator it = G4LogicalVolumeStore::GetInstance()->begin(); it != G4LogicalVolumeStore::GetInstance()->end(); it++) {
if ((*it)->GetSensitiveDetector() == this) {
volumes.push_back(*it);
}
@@ -198,9 +180,7 @@
{
std::vector<G4LogicalVolume*> volumes = this->getLogicalVolumes();
- for (std::vector<G4LogicalVolume*>::const_iterator it = volumes.begin();
- it != volumes.end();
- it++) {
+ for (std::vector<G4LogicalVolume*>::const_iterator it = volumes.begin(); it != volumes.end(); it++) {
std::cout << (*it)->GetName() << std::endl;
}
return os;
diff -u -r1.8 -r1.9 --- G4Solenoid.cc 1 Aug 2006 23:52:08 -0000 1.8 +++ G4Solenoid.cc 24 Jun 2013 22:10:36 -0000 1.9 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4Solenoid.cc,v 1.8 2006/08/01 23:52:08 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4Solenoid.cc,v 1.9 2013/06/24 22:10:36 jeremy Exp $
#include "G4Solenoid.hh"
@@ -6,48 +6,44 @@
//#include <iostream>
-G4Solenoid::G4Solenoid()
- : _innerField(0),
- _outerField(0),
- _innerR(0),
- _outerR(0),
- _innerZ(0),
- _outerZ(0)
-{}
+G4Solenoid::G4Solenoid() :
+ _innerField(0), _outerField(0), _innerR(0), _outerR(0), _innerZ(0), _outerZ(0)
+{
+}
G4Solenoid::~G4Solenoid()
-{}
+{
+}
/** * Apply simple solenoid magnetic field to the given Point. */ // TODO: use inner/outer Z
-void G4Solenoid::GetFieldValue( const double Point[3], double* Bfield ) const
+void G4Solenoid::GetFieldValue(const double Point[3], double* Bfield) const
{
- //std::cout << "G4Solenoid::GetFieldValue" << std::endl;
- //std::cout << "point: " << Point[0] << " " << Point[1] << " " << Point[2] << std::endl;
- //std::cout << "BEFORE --> bfield " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl;
-
- double this_radius = sqrt( Point[0] * Point[0] + Point[1] * Point[1] );
-
- if ( this_radius < _innerR ) {
- Bfield[2] += _innerField;
- }
- else if ( this_radius < _outerR ) {
- Bfield[2] += _outerField;
- }
+ //std::cout << "G4Solenoid::GetFieldValue" << std::endl;
+ //std::cout << "point: " << Point[0] << " " << Point[1] << " " << Point[2] << std::endl;
+ //std::cout << "BEFORE --> bfield " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl;
+
+ double this_radius = sqrt(Point[0] * Point[0] + Point[1] * Point[1]);
+
+ if (this_radius < _innerR) {
+ Bfield[2] += _innerField;
+ } else if (this_radius < _outerR) {
+ Bfield[2] += _outerField;
+ }
- //std::cout << "AFTER --> bfield = " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl << std::endl;
+ //std::cout << "AFTER --> bfield = " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl << std::endl;
- return;
+ return;
}
void G4Solenoid::printOut(std::ostream& os)
{
- os << "innerField <" << _innerField << ">" << std::endl; - os << "outerField <" << _outerField << ">" << std::endl; - os << "outerR <" << _outerR << ">" << std::endl; - os << "innerZ <" << _innerZ << ">" << std::endl; - os << "outerZ <" << _outerZ << ">" << std::endl; - os << std::endl;
+ os << "innerField <" << _innerField << ">" << std::endl; + os << "outerField <" << _outerField << ">" << std::endl; + os << "outerR <" << _outerR << ">" << std::endl; + os << "innerZ <" << _innerZ << ">" << std::endl; + os << "outerZ <" << _outerZ << ">" << std::endl; + os << std::endl;
}
diff -u -r1.6 -r1.7 --- G4StoreManager.cc 9 Dec 2005 01:55:55 -0000 1.6 +++ G4StoreManager.cc 24 Jun 2013 22:10:36 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4StoreManager.cc,v 1.6 2005/12/09 01:55:55 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4StoreManager.cc,v 1.7 2013/06/24 22:10:36 jeremy Exp $
// lcdd #include "G4StoreManager.hh"
@@ -8,21 +8,22 @@
G4StoreManager::G4StoreManager()
{
- G4UIdirectory* m_storesDir; - m_storesDir = new G4UIdirectory( "/stores/" ); - m_storesDir->SetGuidance( "Commands to inspect the Geant4 object stores. [LCDD]" );
+ G4UIdirectory* m_storesDir;
+ m_storesDir = new G4UIdirectory("/stores/");
+ m_storesDir->SetGuidance("Commands to inspect the Geant4 object stores. [LCDD]");
} G4StoreManager::~G4StoreManager()
-{}
+{
+}
G4StoreManager* G4StoreManager::instance()
{
- static G4StoreManager mgr;
+ static G4StoreManager mgr;
- if (!_instance) {
- _instance = &mgr;
- }
+ if (!_instance) {
+ _instance = &mgr;
+ }
- return _instance;
+ return _instance;
}
diff -u -r1.12 -r1.13 --- G4TrackerCombineSD.cc 10 Oct 2007 22:38:10 -0000 1.12 +++ G4TrackerCombineSD.cc 24 Jun 2013 22:10:36 -0000 1.13 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4TrackerCombineSD.cc,v 1.12 2007/10/10 22:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4TrackerCombineSD.cc,v 1.13 2013/06/24 22:10:36 jeremy Exp $
#include "G4TrackerCombineSD.hh" // LCDD
@@ -6,263 +6,256 @@
#include "TrackInformation.hh"
-G4TrackerCombineSD::G4TrackerCombineSD(G4String sdName,
- G4String hcName)
- : G4TrackerSD(sdName, hcName),
- m_combineHits(false),
- m_currentTrackID(-1),
- m_currentPV(0),
- m_edepTotal(0),
- m_minTime(0),
- m_startedHit(false),
- m_currentTrack(false)
-{}
+G4TrackerCombineSD::G4TrackerCombineSD(G4String sdName, G4String hcName) :
+ G4TrackerSD(sdName, hcName), m_combineHits(false), m_currentTrackID(-1), m_currentPV(0), m_edepTotal(0), m_minTime(0), m_startedHit(false), m_currentTrack(false)
+{
+}
G4TrackerCombineSD::~G4TrackerCombineSD()
-{}
+{
+}
void G4TrackerCombineSD::EndOfEvent(G4HCofThisEvent *hce)
{
- G4TrackerSD::EndOfEvent(hce); - clear();
+ G4TrackerSD::EndOfEvent(hce); + clear();
}
G4bool G4TrackerCombineSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
{
- // set cached step - G4SensitiveDetector::ProcessHits( aStep, 0 );
+ // set cached step + G4SensitiveDetector::ProcessHits(aStep, 0);
#ifdef G4VERBOSE
- if (getVerbose() > 0) {
- G4cout << "G4TrackerCombineSD::ProcessHits - " << GetName() << G4endl;
- G4cout << "trackID - " << trackID() << G4endl;
- G4cout << "particle - " << track()->GetDefinition()->GetParticleName() << G4endl;
- G4cout << "edep - " << step()->GetTotalEnergyDeposit() << G4endl;
- G4cout << "pre-physvol=" << aStep->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() << G4endl;
- G4cout << "post-physvol=" << aStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() << G4endl;
- if ( prePV() != postPV() ) {
- G4cout << "post-pv != pre-pv" << G4endl;
+ if (getVerbose() > 0) {
+ G4cout << "G4TrackerCombineSD::ProcessHits - " << GetName() << G4endl;
+ G4cout << "trackID - " << trackID() << G4endl;
+ G4cout << "particle - " << track()->GetDefinition()->GetParticleName() << G4endl;
+ G4cout << "edep - " << step()->GetTotalEnergyDeposit() << G4endl;
+ G4cout << "pre-physvol=" << aStep->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() << G4endl;
+ G4cout << "post-physvol=" << aStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() << G4endl;
+ if ( prePV() != postPV() ) {
+ G4cout << "post-pv != pre-pv" << G4endl;
+ }
}
- }
#endif
- // Return value indicating whether a hit was inserted. - bool r = false;
+ // Return value indicating whether a hit was inserted.
+ bool r = false;
+
+ // Started a hit already?
+ if (!m_startedHit) {
- // Started a hit already?
- if ( !m_startedHit ) {
-
- // If no hit, then start a new hit on the pre-step.
- startHit( pre() );
- }
+ // If no hit, then start a new hit on the pre-step. + startHit(pre()); + }
- // Check if the cached trackID is valid.
- if ( m_currentTrackID != -1 ) {
+ // Check if the cached trackID is valid.
+ if (m_currentTrackID != -1) {
- // Is this step's trackID different from the cached trackID?
- if ( trackID() != m_currentTrackID ) {
+ // Is this step's trackID different from the cached trackID?
+ if (trackID() != m_currentTrackID) {
#ifdef G4VERBOSE
- if ( getVerbose() > 0 ) {
- G4cout << "new track ID this step!" << G4endl;
- }
+ if ( getVerbose() > 0 ) {
+ G4cout << "new track ID this step!" << G4endl;
+ }
#endif
- // Insert the hit on the old track. - r = insertHit();
+ // Insert the hit on the old track. + r = insertHit();
- // Start a new hit on the pre-step. - startHit( pre() );
+ // Start a new hit on the pre-step. + startHit(pre()); + }
}
- }
#ifdef G4DEBUG
- else {
- std::cout << GetName() << "::WARNING : current TrackID == -1" << std::endl;
- }
+ else {
+ std::cout << GetName() << "::WARNING : current TrackID == -1" << std::endl;
+ }
#endif
- // Update the hit, checking if the call to this function is applicable. - updateHit();
+ // Update the hit, checking if the call to this function is applicable. + updateHit();
- // Entering a new PV on this step?
- if ( prePV() != postPV() ) {
+ // Entering a new PV on this step?
+ if (prePV() != postPV()) {
#ifdef G4VERBOSE
- if ( getVerbose() > 0 ) {
- G4cerr << "new physvol this step!" << G4endl;
- }
+ if ( getVerbose() > 0 ) {
+ G4cerr << "new physvol this step!" << G4endl;
+ }
#endif
- // Insert the current hit. - r = insertHit();
+ // Insert the current hit. + r = insertHit();
- // Check if pre and post steps have the same detector.
- if ( hasSameSD() ) {
+ // Check if pre and post steps have the same detector.
+ if (hasSameSD()) {
- // Start a new hit for the adjacent tracker layer. - startHit( post() );
+ // Start a new hit for the adjacent tracker layer.
+ startHit(post());
+ }
+ }
+ // Special case where the track status is StopAndKill.
+ // If so, we won't see it again, so need to insert the hit.
+ else if (m_currentTrack->GetTrackStatus() == fStopAndKill) {
+ r = insertHit();
}
- }
- // Special case where the track status is StopAndKill.
- // If so, we won't see it again, so need to insert the hit.
- else if ( m_currentTrack->GetTrackStatus() == fStopAndKill ) {
- r = insertHit();
- }
#ifdef G4VERBOSE
- if ( getVerbose() > 0 ) {
- G4cerr << "----" << G4endl;
- }
+ if ( getVerbose() > 0 ) {
+ G4cerr << "----" << G4endl;
+ }
#endif
- return r;
+ return r;
}
void G4TrackerCombineSD::updateHit()
{
#ifdef G4VERBOSE
- if ( getVerbose() > 1 ) {
- G4cout << "updateHit" << G4endl;
- }
+ if ( getVerbose() > 1 ) {
+ G4cout << "updateHit" << G4endl;
+ }
#endif
- // can only update if started hit
- if (m_startedHit) {
+ // can only update if started hit
+ if (m_startedHit) {
- // incr edep - m_edepTotal += edep();
+ // incr edep + m_edepTotal += edep();
- // first time only
- if ( m_minTime == 0 ) {
- m_minTime = globalTime();
+ // first time only
+ if (m_minTime == 0) {
+ m_minTime = globalTime();
+ }
+
+ // exit point and momentum
+ m_exitPoint = postPosition();
+ m_exitMomentum = postMomentum();
}
- - // exit point and momentum - m_exitPoint = postPosition(); - m_exitMomentum = postMomentum(); - }
}
void G4TrackerCombineSD::clear()
{
#ifdef G4VERBOSE
- if ( getVerbose() > 1 ) {
- G4cout << "clear" << G4endl;
- }
+ if ( getVerbose() > 1 ) {
+ G4cout << "clear" << G4endl;
+ }
#endif
- m_minTime = 0; - m_edepTotal = 0; - m_currentPV = 0; - m_currentTrackID = -1; - m_startedHit = false;
+ m_minTime = 0; + m_edepTotal = 0; + m_currentPV = 0; + m_currentTrackID = -1; + m_startedHit = false;
}
bool G4TrackerCombineSD::insertHit()
{
#ifdef G4VERBOSE
- if ( getVerbose() > 1 ) {
- G4cout << "insertHit" << G4endl;
- }
+ if ( getVerbose() > 1 ) {
+ G4cout << "insertHit" << G4endl;
+ }
#endif
- // never started another hit after clearing
- if ( !m_startedHit ) {
- G4cerr << "never started hit!" << G4endl;
- return false;
- }
+ // never started another hit after clearing
+ if (!m_startedHit) {
+ G4cerr << "never started hit!" << G4endl;
+ return false;
+ }
- // total energy below cut
- if ( m_edepTotal <= getEcut() && !isGeantino() ) {
+ // total energy below cut
+ if ( m_edepTotal <= getEcut() && !isGeantino() ) {
#ifdef G4VERBOSE
- if ( getVerbose() > 0 ) {
- std::cout << GetName() << " : cut this edep " << m_edepTotal << std::endl;
- }
+ if ( getVerbose() > 0 ) {
+ std::cout << GetName() << " : cut this edep " << m_edepTotal << std::endl;
+ }
#endif
- clear(); - return false; - }
+ clear(); + return false; + }
- // compute mid point - G4ThreeVector midPoint = - ReadoutUtil::computeThreeVectorMean(m_entryPoint, m_exitPoint);
+ // compute mid point + G4ThreeVector midPoint = + ReadoutUtil::computeThreeVectorMean(m_entryPoint, m_exitPoint);
- // compute mean momentum - G4ThreeVector meanMom = - ReadoutUtil::computeThreeVectorMean(m_entryMomentum, m_exitMomentum);
+ // compute mean momentum + G4ThreeVector meanMom = + ReadoutUtil::computeThreeVectorMean(m_entryMomentum, m_exitMomentum);
- // compute distance from start to entry - G4double pathlength = ReadoutUtil::computeDistance(m_entryPoint, m_exitPoint);
+ // compute distance from start to entry + G4double pathlength = ReadoutUtil::computeDistance(m_entryPoint, m_exitPoint);
- // hit data - G4TrackerHit* trkhit = new G4TrackerHit(); - trkhit->setTdep(m_minTime); - trkhit->setEdep(m_edepTotal); - trkhit->setPos(midPoint); - trkhit->setMomentum(meanMom); - trkhit->setTrackID(m_currentTrackID); - trkhit->setLength(pathlength);
+ // hit data + G4TrackerHit* trkhit = new G4TrackerHit(); + trkhit->setTdep(m_minTime); + trkhit->setEdep(m_edepTotal); + trkhit->setPos(midPoint); + trkhit->setMomentum(meanMom); + trkhit->setTrackID(m_currentTrackID); + trkhit->setLength(pathlength);
- // set id - Id64bit id64 = makeId(); - trkhit->setId(id64.getId0());
+ // set id + Id64bit id64 = makeId(); + trkhit->setId(id64.getId0());
#ifdef G4VERBOSE
- if ( getVerbose() > 1 ) {
- std::cout << GetName() << " : inserting new tracker hit" << std::endl;
- std::cout << *trkhit << std::endl;
- std::cout << "entryPoint = " << m_entryPoint << std::endl;
- std::cout << "entryPointR = " << m_entryPoint.mag() << std::endl;
- std::cout << "midPoint = " << midPoint << std::endl;
- std::cout << "midPointR = " << midPoint.mag() << std::endl;
- std::cout << "exitPoint = " << m_exitPoint << std::endl;
- std::cout << "exitPointR = " << m_exitPoint.mag() << std::endl;
- std::cout << "(exitPointR - entryPointR) / 2 = " << (m_exitPoint.mag() - m_entryPoint.mag()) / 2 << std::endl;
- std::cout << std::endl;
- }
+ if ( getVerbose() > 1 ) {
+ std::cout << GetName() << " : inserting new tracker hit" << std::endl;
+ std::cout << *trkhit << std::endl;
+ std::cout << "entryPoint = " << m_entryPoint << std::endl;
+ std::cout << "entryPointR = " << m_entryPoint.mag() << std::endl;
+ std::cout << "midPoint = " << midPoint << std::endl;
+ std::cout << "midPointR = " << midPoint.mag() << std::endl;
+ std::cout << "exitPoint = " << m_exitPoint << std::endl;
+ std::cout << "exitPointR = " << m_exitPoint.mag() << std::endl;
+ std::cout << "(exitPointR - entryPointR) / 2 = " << (m_exitPoint.mag() - m_entryPoint.mag()) / 2 << std::endl;
+ std::cout << std::endl;
+ }
#endif
- m_HC->insert(trkhit);
+ m_HC->insert(trkhit);
- TrackInformation::getTrackInformation( m_currentTrack )->setHasTrackerHit( true );
+ TrackInformation::getTrackInformation( m_currentTrack )->setHasTrackerHit( true );
- // clear cached data - clear();
+ // clear cached data + clear();
#ifdef G4VERBOSE
- if ( getVerbose() > 0 ) {
- G4cout << G4endl;
- }
+ if ( getVerbose() > 0 ) {
+ G4cout << G4endl;
+ }
#endif
- return true; -}
+ return true; + }
void G4TrackerCombineSD::startHit(G4StepPoint* aStepPoint)
{
#ifdef G4VERBOSE
- if ( getVerbose() > 0 ) {
- G4cout << "startHit" << G4endl;
- }
-#endif
-
- m_currentTrack = step()->GetTrack();
- m_currentPV = aStepPoint->GetPhysicalVolume();
- m_entryPoint = m_exitPoint = aStepPoint->GetPosition();
- m_entryMomentum = m_exitMomentum = aStepPoint->GetMomentum();
- m_currentTrackID = trackID();
- m_startedHit = true;
-
-#ifdef G4VERBOSE
- if ( getVerbose() > 2 ) {
- std::cout << GetName() << " : starting new hit" << std::endl;
- std::cout << "volume = " << m_currentPV->GetName() << std::endl;
- std::cout << "trackID = " << m_currentTrackID << std::endl;
- std::cout << "entry point = " << m_entryPoint << std::endl;
- }
+ if ( getVerbose() > 0 ) {
+ G4cout << "startHit" << G4endl;
+ }
#endif
-}
+ m_currentTrack = step()->GetTrack();
+ m_currentPV = aStepPoint->GetPhysicalVolume();
+ m_entryPoint = m_exitPoint = aStepPoint->GetPosition();
+ m_entryMomentum = m_exitMomentum = aStepPoint->GetMomentum();
+ m_currentTrackID = trackID();
+ m_startedHit = true;
+
+#ifdef G4VERBOSE
+ if ( getVerbose() > 2 ) {
+ std::cout << GetName() << " : starting new hit" << std::endl;
+ std::cout << "volume = " << m_currentPV->GetName() << std::endl;
+ std::cout << "trackID = " << m_currentTrackID << std::endl;
+ std::cout << "entry point = " << m_entryPoint << std::endl;
+ }
+#endif
+}
diff -u -r1.8 -r1.9 --- G4TrackerHit.cc 31 Mar 2006 01:09:38 -0000 1.8 +++ G4TrackerHit.cc 24 Jun 2013 22:10:36 -0000 1.9 @@ -11,51 +11,42 @@
G4Allocator<G4TrackerHit> G4TrackerHitAllocator;
-G4TrackerHit::G4TrackerHit()
- : G4VHit(),
- m_edep(0),
- m_tdep(0),
- m_trkID(-1),
- m_length(0)
-{}
+G4TrackerHit::G4TrackerHit() :
+ G4VHit(), m_edep(0), m_tdep(0), m_trkID(-1), m_length(0)
+{
+}
G4TrackerHit::~G4TrackerHit()
-{}
+{
+}
#ifdef G4VIS_USE
void G4TrackerHit::Draw()
{
- G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
+ G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
- if(pVVisManager) {
+ if(pVVisManager) {
- G4Point3D p3D = G4Point3D( m_pos ); - G4Circle chit(p3D); - chit.SetScreenDiameter(3.0); - chit.SetFillStyle(G4Circle::filled);
+ G4Point3D p3D = G4Point3D( m_pos ); + G4Circle chit(p3D); + chit.SetScreenDiameter(3.0); + chit.SetFillStyle(G4Circle::filled);
- G4Colour col(1.0, 0.0, 1.0);
+ G4Colour col(1.0, 0.0, 1.0);
- chit.SetVisAttributes(G4VisAttributes( col ) ); - pVVisManager->Draw( chit ); - }
+ chit.SetVisAttributes(G4VisAttributes( col ) ); + pVVisManager->Draw( chit ); + }
}
#endif
void G4TrackerHit::Print()
{
- std::cout << *this << std::endl;
+ std::cout << *this << std::endl;
}
std::ostream& operator<<(std::ostream &os, const G4TrackerHit& hit)
{
- std::cout << hit.getTrackID() << " " - << hit.getPos() << " " - << G4BestUnit(hit.getEdep(), "Energy") << " " - << hit.getMomentum() << " " - << G4BestUnit(hit.getLength(), "Length") << " " - << G4BestUnit(hit.getTdep(), "Time") << " " - << hit.getPDG() << " " - << std::endl; - return os;
+ std::cout << hit.getTrackID() << " " << hit.getPos() << " " << G4BestUnit(hit.getEdep(), "Energy") << " " << hit.getMomentum() << " " << G4BestUnit(hit.getLength(), "Length") << " " << G4BestUnit(hit.getTdep(), "Time") << " " << hit.getPDG() << " " << std::endl; + return os;
}
diff -u -r1.40 -r1.41 --- G4TrackerSD.cc 9 Jun 2011 01:48:22 -0000 1.40 +++ G4TrackerSD.cc 24 Jun 2013 22:10:36 -0000 1.41 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4TrackerSD.cc,v 1.40 2011/06/09 01:48:22 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4TrackerSD.cc,v 1.41 2013/06/24 22:10:36 jeremy Exp $
// LCDD #include "IdManager.hh"
@@ -13,138 +13,127 @@
#include <iostream>
-G4TrackerSD::G4TrackerSD(G4String sdName, - G4String hcName) - : G4SensitiveDetector(sdName, - hcName, - G4SensitiveDetector::eTracker), - m_HC(0)
+G4TrackerSD::G4TrackerSD(G4String sdName, G4String hcName) : + G4SensitiveDetector(sdName, hcName, G4SensitiveDetector::eTracker), m_HC(0)
{
- m_hits.clear();
+ m_hits.clear();
} G4TrackerSD::~G4TrackerSD()
-{}
+{
+}
void G4TrackerSD::Initialize(G4HCofThisEvent *HCE)
{
- clearHits();
+ clearHits();
- // create tracker hits coll - m_HC = new G4TrackerHitsCollection( GetName(), collectionName[0] );
+ // create tracker hits coll + m_HC = new G4TrackerHitsCollection(GetName(), collectionName[0]);
- // set HCID
- if ( getHCID() < 0) {
- setHCID( GetCollectionID(0) );
- }
+ // set HCID
+ if (getHCID() < 0) {
+ setHCID(GetCollectionID(0));
+ }
- // add collection to HC of event - HCE->AddHitsCollection( getHCID(), m_HC );
+ // add collection to HC of event + HCE->AddHitsCollection(getHCID(), m_HC);
}
G4bool G4TrackerSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
{
- // set cached step - G4SensitiveDetector::ProcessHits( aStep, 0 );
+ // set cached step + G4SensitiveDetector::ProcessHits(aStep, 0);
- // edep - G4double e = edep();
+ // edep + G4double e = edep();
- // check edep < cut
- if ( e <= getEcut() && !isGeantino() )
- {
- return false;
- }
-
- // get track information
- TrackInformation* trkInfo = trackInformation();
-
- // set hit flag in trk info
- trkInfo->setHasTrackerHit( true );
-
- // hit data
- G4int trkID = trackID();
- G4double tdep = globalTime();
- G4ThreeVector midPos = midPosition();
- G4ThreeVector prePos = aStep->GetPreStepPoint()->GetPosition();
- G4ThreeVector postPos = aStep->GetPostStepPoint()->GetPosition();
- double avgMom = (pre()->GetMomentum().mag() + post()->GetMomentum().mag()) / 2;
- G4ThreeVector mom = (postPos - prePos);
- if (mom.mag() > 0)
- {
- mom.setMag(avgMom);
- }
- else
- {
- std::cerr << "prePos - postPos = 0 --> " << prePos << " | " << postPos << std::endl;
- }
-
- G4double pathLength = ReadoutUtil::computeDistance(aStep);
-
- // create hit
- G4TrackerHit* trkHit = new G4TrackerHit();
-
- // create id vector
- Id64bit id64 = makeId();
-
- // set track hit info
- trkHit->setTrackID(trkID);
- trkHit->setEdep(e);
- trkHit->setPos(midPos);
- trkHit->setMomentum(mom);
- trkHit->setTdep(tdep);
- trkHit->setId( id64.getId0() );
- trkHit->setLength(pathLength);
+ // check edep < cut
+ if (e <= getEcut() && !isGeantino()) {
+ return false;
+ }
+
+ // get track information
+ TrackInformation* trkInfo = trackInformation();
+
+ // set hit flag in trk info
+ trkInfo->setHasTrackerHit(true);
+
+ // hit data
+ G4int trkID = trackID();
+ G4double tdep = globalTime();
+ G4ThreeVector midPos = midPosition();
+ G4ThreeVector prePos = aStep->GetPreStepPoint()->GetPosition();
+ G4ThreeVector postPos = aStep->GetPostStepPoint()->GetPosition();
+ double avgMom = (pre()->GetMomentum().mag() + post()->GetMomentum().mag()) / 2;
+ G4ThreeVector mom = (postPos - prePos);
+ if (mom.mag() > 0) {
+ mom.setMag(avgMom);
+ } else {
+ std::cerr << "prePos - postPos = 0 --> " << prePos << " | " << postPos << std::endl;
+ }
+
+ G4double pathLength = ReadoutUtil::computeDistance(aStep);
+
+ // create hit
+ G4TrackerHit* trkHit = new G4TrackerHit();
+
+ // create id vector
+ Id64bit id64 = makeId();
+
+ // set track hit info
+ trkHit->setTrackID(trkID);
+ trkHit->setEdep(e);
+ trkHit->setPos(midPos);
+ trkHit->setMomentum(mom);
+ trkHit->setTdep(tdep);
+ trkHit->setId(id64.getId0());
+ trkHit->setLength(pathLength);
- // add to HC - m_HC->insert(trkHit);
+ // add to HC + m_HC->insert(trkHit);
- m_hits.push_back( trkHit );
+ m_hits.push_back(trkHit);
- return true;
+ return true;
}
std::ostream& G4TrackerSD::printHits(std::ostream& os)
{
- for (G4TrackerHitList::const_iterator iter = m_hits.begin();
- iter != m_hits.end();
- iter++ ) {
- os << (*( const_cast< const G4TrackerHit* > (*iter) ));
- }
- os << std::endl;
- return os;
+ for (G4TrackerHitList::const_iterator iter = m_hits.begin(); iter != m_hits.end(); iter++) {
+ os << (*(const_cast<const G4TrackerHit*>(*iter)));
+ }
+ os << std::endl;
+ return os;
}
void G4TrackerSD::EndOfEvent(G4HCofThisEvent *)
{
#ifdef G4VERBOSE
- if ( getVerbose() > 0 ) {
- std::cout << GetName() << " has " << m_HC->GetSize() << " hits." << std::endl;
- }
-
- if ( getVerbose() > 1 ) {
- printHits ( std::cout );
- }
+ if ( getVerbose() > 0 ) {
+ std::cout << GetName() << " has " << m_HC->GetSize() << " hits." << std::endl;
+ }
+
+ if ( getVerbose() > 1 ) {
+ printHits ( std::cout );
+ }
#endif
}
double G4TrackerSD::getEdep() const
{
- double edep=0.0;
- for ( G4TrackerHitList::const_iterator it = m_hits.begin();
- it != m_hits.end();
- it++ ) {
- edep += (*it)->getEdep();
- }
- return edep;
+ double edep = 0.0;
+ for (G4TrackerHitList::const_iterator it = m_hits.begin(); it != m_hits.end(); it++) {
+ edep += (*it)->getEdep();
+ }
+ return edep;
}
-void G4TrackerSD::clearHits()
+void G4TrackerSD::clearHits()
{
- m_hits.clear();
+ m_hits.clear();
}
G4TrackerSD::G4TrackerHitList G4TrackerSD::getTrackerHitList()
{
- return m_hits;
+ return m_hits;
}
diff -u -r1.4 -r1.5 --- G4UnsegmentedCalorimeterSD.cc 9 Aug 2011 21:40:43 -0000 1.4 +++ G4UnsegmentedCalorimeterSD.cc 24 Jun 2013 22:10:36 -0000 1.5 @@ -1,26 +1,22 @@
-// $Id: G4UnsegmentedCalorimeterSD.cc,v 1.4 2011/08/09 21:40:43 jeremy Exp $
+// $Id: G4UnsegmentedCalorimeterSD.cc,v 1.5 2013/06/24 22:10:36 jeremy Exp $
#include "G4UnsegmentedCalorimeterSD.hh"
-G4UnsegmentedCalorimeterSD::G4UnsegmentedCalorimeterSD(
- G4String sdName,
- G4String hcName,
- G4Segmentation* seg ) :
- G4CalorimeterSD( sdName, hcName, seg )
-{}
-
-G4bool G4UnsegmentedCalorimeterSD::ProcessHits(
- G4Step* aStep,
- G4TouchableHistory* )
+G4UnsegmentedCalorimeterSD::G4UnsegmentedCalorimeterSD(G4String sdName, G4String hcName, G4Segmentation* seg) :
+ G4CalorimeterSD(sdName, hcName, seg)
+{
+}
+
+G4bool G4UnsegmentedCalorimeterSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
{
#ifdef G4VERBOSE
if ( getVerbose() > 0 )
{
- std::cout << "G4UnsegmentedCalorimeterSD::ProcessHits - " << this->GetName() << std::endl;
+ std::cout << "G4UnsegmentedCalorimeterSD::ProcessHits - " << this->GetName() << std::endl;
}
#endif
/* Cache the step information. */
- G4SensitiveDetector::ProcessHits( aStep, 0 );
+ G4SensitiveDetector::ProcessHits(aStep, 0);
/* Get the energy deposition. */
G4double theEdep = edep();
@@ -29,8 +25,7 @@
* This needs to be a <= comparison for cutting on 0,
* but it allows geantinos, which always have 0 edep.
*/
- if ( theEdep <= getEcut() && !isGeantino() )
- {
+ if (theEdep <= getEcut() && !isGeantino()) {
#ifdef G4VERBOSE
if ( getVerbose() > 2 )
{
@@ -47,27 +42,25 @@
/* Reset the segmentation bins. */
//m_segmentation->resetBins();
-
/* Set the segmentation bins. */
//m_segmentation->setBins( aStep );
-
/* Create a 64-bit ID. */
Id64bit id64 = makeId();
/* Create a new hit. */
- G4CalorimeterHit* thisHit = new G4CalorimeterHit( theEdep, hitPos );
+ G4CalorimeterHit* thisHit = new G4CalorimeterHit(theEdep, hitPos);
/* Set the 64-bit ID. */
- thisHit->setId64bit( id64.getId0(), id64.getId1() );
+ thisHit->setId64bit(id64.getId0(), id64.getId1());
/* Add hit to lookup map. */
- hits_vector[0].push_back( thisHit );
+ hits_vector[0].push_back(thisHit);
/* Add hit to the HC. */
- m_hitsCollections[0]->insert( thisHit );
+ m_hitsCollections[0]->insert(thisHit);
/* Add an MCParticle contribution for this hit. */
- thisHit->addMcpHitContrib( McpHitContrib( aStep ) );
+ thisHit->addMcpHitContrib(McpHitContrib(aStep));
/* Success. */
return true;
diff -u -r1.3 -r1.4 --- GDMLWriter.cc 3 Sep 2008 18:53:47 -0000 1.3 +++ GDMLWriter.cc 24 Jun 2013 22:10:36 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/GDMLWriter.cc,v 1.3 2008/09/03 18:53:47 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/GDMLWriter.cc,v 1.4 2013/06/24 22:10:36 jeremy Exp $
#include "GDMLWriter.hh" // gdml
@@ -14,8 +14,7 @@
G4GDMLWriter g4writer("http://www.lcsim.org/schemas/gdml/1.0/gdml.xsd", fileName);
try {
g4writer.DumpGeometryInfo(world, volumes);
- }
- catch (std::exception &err) {
+ } catch (std::exception &err) {
G4cerr << "problem writing geometry: " << err.what() << std::endl;
}
}
@@ -23,12 +22,12 @@
void GDMLWriter::writeCurrentGeometry(const std::string& fileName)
{
G4cout << "Dumping current geometry to file <" << fileName << ">" << G4endl;
-
+
G4VPhysicalVolume* world =
- G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume(); -
+ G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume(); +
G4GDMLWriter g4writer("http://www.lcsim.org/schemas/gdml/1.0/gdml.xsd", fileName);
-
+
try {
g4writer.DumpGeometryInfo(world);
}
diff -u -r1.3 -r1.4 --- GDMLWriterMessenger.cc 3 Sep 2008 18:53:47 -0000 1.3 +++ GDMLWriterMessenger.cc 24 Jun 2013 22:10:36 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/GDMLWriterMessenger.cc,v 1.3 2008/09/03 18:53:47 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/GDMLWriterMessenger.cc,v 1.4 2013/06/24 22:10:36 jeremy Exp $
#include "GDMLWriterMessenger.hh" // geant4
@@ -13,7 +13,8 @@
} GDMLWriterMessenger::~GDMLWriterMessenger()
-{}
+{
+}
void GDMLWriterMessenger::SetNewValue(G4UIcommand *, G4String newVals)
{
@@ -23,28 +24,23 @@
is >> fileName >> volume;
- if (volume.length() > 1)
- {
+ if (volume.length() > 1) {
std::vector<std::string> volumes;
volumes.push_back(volume);
GDMLWriter::writeCurrentGeometry(fileName, volumes);
- }
- else
- {
+ } else {
GDMLWriter::writeCurrentGeometry(fileName);
- }
+ }
}
void GDMLWriterMessenger::defineCommands()
{
m_dumpGDMLCmd = new G4UIcommand("/lcdd/dumpGDML", this);
m_dumpGDMLCmd->SetGuidance("Dump current geometry to GDML output file.");
- G4UIparameter* p = new G4UIparameter("outputFile",'s',false);
+ G4UIparameter* p = new G4UIparameter("outputFile", 's', false);
m_dumpGDMLCmd->SetParameter(p);
- p = new G4UIparameter("topVolume",'s',true);
+ p = new G4UIparameter("topVolume", 's', true);
m_dumpGDMLCmd->SetParameter(p);
m_dumpGDMLCmd->AvailableForStates(G4State_Idle);
}
- -
diff -u -r1.12 -r1.13 --- GeometryManager.cc 12 Jul 2007 18:09:01 -0000 1.12 +++ GeometryManager.cc 24 Jun 2013 22:10:36 -0000 1.13 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/GeometryManager.cc,v 1.12 2007/07/12 18:09:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/GeometryManager.cc,v 1.13 2013/06/24 22:10:36 jeremy Exp $
#include "GeometryManager.hh" // LCDD
@@ -19,101 +19,102 @@
GeometryManager* GeometryManager::m_instance = 0;
-GeometryManager::GeometryManager() - : m_worldRegionIsSetup(false)
+GeometryManager::GeometryManager() : + m_worldRegionIsSetup(false)
{
- G4StoreManager::instance();
+ G4StoreManager::instance();
} GeometryManager::~GeometryManager()
-{}
+{
+}
GeometryManager* GeometryManager::instance()
{
- if ( m_instance == 0 ) {
- m_instance = new GeometryManager();
- }
+ if (m_instance == 0) {
+ m_instance = new GeometryManager();
+ }
- return m_instance;
+ return m_instance;
}
void GeometryManager::beginRun(const G4Run*)
{
- // only setup world region info on first run
- if (!m_worldRegionIsSetup) {
- setupWorldRegionInformation();
- }
+ // only setup world region info on first run
+ if (!m_worldRegionIsSetup) {
+ setupWorldRegionInformation();
+ }
}
G4LogicalVolume* GeometryManager::getWorldLogicalVolume() const
{
- //return GDMLProcessor::GetInstance()->GetWorldVolume()->GetLogicalVolume(); - return getWorldPhysicalVolume()->GetLogicalVolume();
+ //return GDMLProcessor::GetInstance()->GetWorldVolume()->GetLogicalVolume(); + return getWorldPhysicalVolume()->GetLogicalVolume();
}
G4VPhysicalVolume* GeometryManager::getWorldPhysicalVolume() const
{
- return G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume();
+ return G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume();
}
void GeometryManager::setupWorldRegionInformation()
{
- G4LogicalVolume* worldLV = getWorldLogicalVolume(); - - assert( worldLV ); - - G4UserRegionInformation* regInfo = new G4UserRegionInformation(); - regInfo->setStoreSecondaries( false ); - regInfo->setThreshold( 0.0 ); - - worldLV->GetRegion()->SetUserInformation( regInfo ); - m_worldRegionIsSetup = true;
+ G4LogicalVolume* worldLV = getWorldLogicalVolume(); + + assert(worldLV); + + G4UserRegionInformation* regInfo = new G4UserRegionInformation(); + regInfo->setStoreSecondaries(false); + regInfo->setThreshold(0.0); + + worldLV->GetRegion()->SetUserInformation(regInfo); + m_worldRegionIsSetup = true;
}
#ifdef HAVE_G4PVPLACEMENT_CHECKOVERLAPS
void GeometryManager::checkOverlaps() const
{
- checkOverlaps(getWorldLogicalVolume(), true);
+ checkOverlaps(getWorldLogicalVolume(), true);
}
void GeometryManager::checkOverlaps(G4LogicalVolume* lvolume, bool recurse) const
{
- if (lvolume==0) return;
+ if (lvolume==0) return;
- for (G4int i=0; i<lvolume->GetNoDaughters(); i++) {
+ for (G4int i=0; i<lvolume->GetNoDaughters(); i++) {
- G4PVPlacement* dau = static_cast<G4PVPlacement*>(lvolume->GetDaughter(i));
+ G4PVPlacement* dau = static_cast<G4PVPlacement*>(lvolume->GetDaughter(i));
- if (dau) {
- // Check overlaps of daughters in mother.
- dau->CheckOverlaps();
-
- // Recursively check overlaps of daughters.
- if (recurse) {
- checkOverlaps(dau->GetLogicalVolume(), true);
- }
+ if (dau) {
+ // Check overlaps of daughters in mother.
+ dau->CheckOverlaps();
+
+ // Recursively check overlaps of daughters.
+ if (recurse) {
+ checkOverlaps(dau->GetLogicalVolume(), true);
+ }
+ }
}
- }
}
void GeometryManager::checkOverlaps(const G4String& name, bool recurse) const
{
- G4LogicalVolumeStore* store = G4LogicalVolumeStore::GetInstance();
- bool found=false;
- for (std::vector<G4LogicalVolume*>::iterator it = store->begin();
- it != store->end();
- it++) {
- G4LogicalVolume* vol = (*it);
- if (vol->GetName() == name) {
- checkOverlaps(vol, recurse);
- found=true;
- break;
+ G4LogicalVolumeStore* store = G4LogicalVolumeStore::GetInstance();
+ bool found=false;
+ for (std::vector<G4LogicalVolume*>::iterator it = store->begin();
+ it != store->end();
+ it++) {
+ G4LogicalVolume* vol = (*it);
+ if (vol->GetName() == name) {
+ checkOverlaps(vol, recurse);
+ found=true;
+ break;
+ }
+ }
+ if (!found) {
+ G4cerr << "WARNING: The logical volume named <" << name << "> was not found in the G4LogicalVolumeStore!" << std::endl;
}
- }
- if (!found) {
- G4cerr << "WARNING: The logical volume named <" << name << "> was not found in the G4LogicalVolumeStore!" << std::endl;
- }
} #endif
diff -u -r1.28 -r1.29 --- IdFactory.cc 18 Jun 2013 19:58:56 -0000 1.28 +++ IdFactory.cc 24 Jun 2013 22:10:36 -0000 1.29 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/IdFactory.cc,v 1.28 2013/06/18 19:58:56 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/IdFactory.cc,v 1.29 2013/06/24 22:10:36 jeremy Exp $
// set for verbose output from this class //#define ID_DEBUG 1
@@ -59,13 +59,11 @@
/* Loop over the IdVec, packing its values into the 64-bit Id
using information from the IdSpec. */
- for (IdVec::ElementVector::const_iterator iter = idvec.getFieldsBegin();
- iter != idvec.getFieldsEnd();
- iter++) {
+ for (IdVec::ElementVector::const_iterator iter = idvec.getFieldsBegin(); iter != idvec.getFieldsEnd(); iter++) {
/* field ptr from idspec */
id_field = idspec->getIdField(idspec_idx);
- assert( id_field);
+ assert(id_field);
/* id value of field */
Id64bit::ElementType field_val = (Id64bit::ElementType) *iter;
@@ -89,16 +87,16 @@
/* If 1st time, set id val pntr. */
if (!next_id) {
#ifdef ID_DEBUG
- G4cout << "setting ptr to next id" << G4endl;
+ G4cout << "setting ptr to next id" << G4endl;
#endif
- ++id64_val_idx; - id64_val_ptr = &id64_val[id64_val_idx]; - next_id = true; - }
+ ++id64_val_idx; + id64_val_ptr = &id64_val[id64_val_idx]; + next_id = true; + }
- /* Adjust start idx for position in next 32-bit id. */ - field_start -= 32; - }
+ /* Adjust start idx for position in next 32-bit id. */ + field_start -= 32; + }
Bits field_mask = makeBitMask(field_bit_len);
@@ -117,21 +115,18 @@
/* For positive values, check that this value doesn't overflow the assigned length. */
// if ( field_val > 0 ) {
if (checkOverflow(field_val, field_mask) != 0) {
- G4cerr << "Value <" << field_val - << "> is too big for the field <" - << id_field->getLabel() << ">, len <" - << field_bit_len << ">." << G4endl;
+ G4cerr << "Value <" << field_val << "> is too big for the field <" << id_field->getLabel() << ">, len <" << field_bit_len << ">." << G4endl;
G4Exception("", "", FatalException, "Value too large for field.");
}
- // }
- // else {
- // }
+ // }
+ // else {
+ // }
#ifdef ID_DEBUG
- G4cout << "field_mask: " << hex << field_mask << G4endl;
+ G4cout << "field_mask: " << hex << field_mask << G4endl;
#endif
- /* Apply bit mask and shift to proper left pos. */
+ /* Apply bit mask and shift to proper left pos. */
Bits field_val_shifted_masked = (field_val & field_mask) << field_start;
/* AND into the current id val. */
@@ -213,9 +208,7 @@
}
if (idspec) {
- for (IdSpec::IdFields::const_iterator iter = idspec->IdFieldsBegin();
- iter != idspec->IdFieldsEnd();
- iter++) {
+ for (IdSpec::IdFields::const_iterator iter = idspec->IdFieldsBegin(); iter != idspec->IdFieldsEnd(); iter++) {
IdField* f = *iter;
@@ -265,8 +258,7 @@
if (-1 == bin_val) {
G4Exception("", "", FatalException, "Valid copy number not found for PV.");
- }
- else {
+ } else {
fnd_it = true;
}
}
@@ -294,9 +286,7 @@
int bin_count = 0;
bool fnd = false;
- for (std::vector<std::string>::const_iterator iter = bin_names.begin();
- iter != bin_names.end();
- iter++) {
+ for (std::vector<std::string>::const_iterator iter = bin_names.begin(); iter != bin_names.end(); iter++) {
if (*iter == field_name) {
fnd = true;
break;
@@ -323,9 +313,7 @@
G4VPhysicalVolume* pv = 0;
bool fnd = false;
- for (std::vector<G4VPhysicalVolume*>::const_iterator iter_pv = pvs.begin();
- iter_pv != pvs.end();
- iter_pv++) {
+ for (std::vector<G4VPhysicalVolume*>::const_iterator iter_pv = pvs.begin(); iter_pv != pvs.end(); iter_pv++) {
pv = *iter_pv; #ifdef ID_DEBUG
@@ -334,9 +322,7 @@
if (id_mgr->hasPhysVolIds(pv)) {
PhysVolId::PhysVolIds pvids = id_mgr->getPhysVolIds(pv);
- for (PhysVolId::PhysVolIds::const_iterator iter = pvids.begin();
- iter != pvids.end();
- iter++) {
+ for (PhysVolId::PhysVolIds::const_iterator iter = pvids.begin(); iter != pvids.end(); iter++) {
#ifdef ID_DEBUG
G4cout << "current field <" << (*iter).getFieldName() << ">" << G4endl;
@@ -373,16 +359,12 @@
G4VPhysicalVolume* pv = 0;
bool fnd = false;
- for (std::vector<G4VPhysicalVolume*>::const_iterator iter_pv = pvs.begin();
- iter_pv != pvs.end();
- iter_pv++) {
+ for (std::vector<G4VPhysicalVolume*>::const_iterator iter_pv = pvs.begin(); iter_pv != pvs.end(); iter_pv++) {
pv = *iter_pv;
if (id_mgr->hasPhysVolIds(pv)) {
PhysVolId::PhysVolIds pvids = id_mgr->getPhysVolIds(pv);
- for (PhysVolId::PhysVolIds::const_iterator iter = pvids.begin();
- iter != pvids.end();
- iter++) {
+ for (PhysVolId::PhysVolIds::const_iterator iter = pvids.begin(); iter != pvids.end(); iter++) {
if ((*iter).getFieldName() == field_name) {
fnd = true;
diff -u -r1.6 -r1.7 --- IdFieldProcess.cc 26 May 2005 20:54:43 -0000 1.6 +++ IdFieldProcess.cc 24 Jun 2013 22:10:36 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/IdFieldProcess.cc,v 1.6 2005/05/26 20:54:43 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/IdFieldProcess.cc,v 1.7 2013/06/24 22:10:36 jeremy Exp $
// GDML #include "Saxana/ProcessingConfigurator.h"
@@ -16,59 +16,62 @@
#include <iostream> /**
- @class idfieldProcess - @brief SAX process to create the idfield element.
+ @class idfieldProcess + @brief SAX process to create the idfield element.
*/
-class idfieldProcess : public SAXStateProcess
+class idfieldProcess: public SAXStateProcess
{
public:
- idfieldProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
-
- virtual ~idfieldProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
-
- idfieldElem* idfield = new idfieldElem;
-
- idfield->set_label( attrs.getValue( "label" ) );
- idfield->set_start( attrs.getValue( "start" ) );
- idfield->set_length( attrs.getValue( "length" ) );
- idfield->set_signed( attrs.getValue( "signed" ) );
-
- m_obj = idfield;
- *obj = idfield;
- }
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "idfield";
- return tag;
- }
+ idfieldProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~idfieldProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ idfieldElem* idfield = new idfieldElem;
+
+ idfield->set_label(attrs.getValue("label"));
+ idfield->set_start(attrs.getValue("start"));
+ idfield->set_length(attrs.getValue("length"));
+ idfield->set_signed(attrs.getValue("signed"));
+
+ m_obj = idfield;
+ *obj = idfield;
+ }
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "idfield";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(idfieldProcess)
diff -u -r1.6 -r1.7 --- IdManager.cc 19 Mar 2005 20:28:43 -0000 1.6 +++ IdManager.cc 24 Jun 2013 22:10:36 -0000 1.7 @@ -1,86 +1,85 @@
-// $Header: /cvs/lcd/lcdd/src/IdManager.cc,v 1.6 2005/03/19 20:28:43 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/IdManager.cc,v 1.7 2013/06/24 22:10:36 jeremy Exp $
#include "IdManager.hh" #include "G4LogicalVolume.hh" IdManager* IdManager::m_instance = 0;
-IdManager::IdManager()
-{}
+IdManager::IdManager()
+{
+}
-IdManager::~IdManager()
-{}
+IdManager::~IdManager()
+{
+}
IdManager* IdManager::instance()
{
- if ( m_instance == 0 ) {
- m_instance = new IdManager;
- }
+ if (m_instance == 0) {
+ m_instance = new IdManager;
+ }
- return m_instance;
+ return m_instance;
}
-void IdManager::addIdSpec(const std::string& name, IdSpec* spec)
+void IdManager::addIdSpec(const std::string& name, IdSpec* spec)
{
- m_idSpecs[ name ] = spec;
+ m_idSpecs[name] = spec;
}
- -IdSpec* IdManager::getIdSpec(const char* name)
+ +IdSpec* IdManager::getIdSpec(const char* name)
{
- std::string key = name; - return getIdSpec( key );
+ std::string key = name; + return getIdSpec(key);
}
-IdSpec* IdManager::getIdSpec(const std::string& name)
+IdSpec* IdManager::getIdSpec(const std::string& name)
{
- return m_idSpecs[ name ];
+ return m_idSpecs[name];
}
-IdManager::IdSpecs::const_iterator IdManager::getIdSpecsBegin()
+IdManager::IdSpecs::const_iterator IdManager::getIdSpecsBegin()
{
- return m_idSpecs.begin();
+ return m_idSpecs.begin();
}
-IdManager::IdSpecs::const_iterator IdManager::getIdSpecsEnd()
+IdManager::IdSpecs::const_iterator IdManager::getIdSpecsEnd()
{
- return m_idSpecs.end();
+ return m_idSpecs.end();
}
-void IdManager::addPhysVolId( G4LogicalVolume* lvMom, int childIdx, PhysVolId childId )
+void IdManager::addPhysVolId(G4LogicalVolume* lvMom, int childIdx, PhysVolId childId)
{
- // DEBUG - //std::cout << std::endl << "assigning physvolid..." << std::endl; - //std::cout << "lvMom <" << lvMom->GetName() << ">" << std::endl; - //std::cout << "childIdx <" << childIdx << ">" << std::endl; - //std::cout << "childId field: " << childId.getFieldName() << std::endl; - //std::cout << "childId <" << childId.getValue() << ">" << std::endl; - //
+ // DEBUG + //std::cout << std::endl << "assigning physvolid..." << std::endl; + //std::cout << "lvMom <" << lvMom->GetName() << ">" << std::endl; + //std::cout << "childIdx <" << childIdx << ">" << std::endl; + //std::cout << "childId field: " << childId.getFieldName() << std::endl; + //std::cout << "childId <" << childId.getValue() << ">" << std::endl; + //
- G4VPhysicalVolume* dau = lvMom->GetDaughter( childIdx );
+ G4VPhysicalVolume* dau = lvMom->GetDaughter(childIdx);
- if ( dau ) {
+ if (dau) {
- //std::cout << "found daughter <" << dau->GetName() << ">" << std::endl; - //std::cout << "dau ptr <" << dau << ">" << std::endl;
+ //std::cout << "found daughter <" << dau->GetName() << ">" << std::endl; + //std::cout << "dau ptr <" << dau << ">" << std::endl;
- m_physVolIdMap.addPhysVolId( dau, childId );
- }
- else {
- std::cerr << "IdManager::assignPhysVolId() - childIdx <" << childIdx << "> does not exist!" << std::endl;
- }
+ m_physVolIdMap.addPhysVolId(dau, childId);
+ } else {
+ std::cerr << "IdManager::assignPhysVolId() - childIdx <" << childIdx << "> does not exist!" << std::endl;
+ }
- //std::cout << std::endl;
+ //std::cout << std::endl;
}
void IdManager::printIds(std::ostream& os, const IdVec& ids)
{
- os << "id stack:";
+ os << "id stack:";
- for ( std::vector<int>::const_iterator iter = ids.getFieldsBegin();
- iter != ids.getFieldsEnd();
- iter++ ) {
- os << " " << *iter;
- }
+ for (std::vector<int>::const_iterator iter = ids.getFieldsBegin(); iter != ids.getFieldsEnd(); iter++) {
+ os << " " << *iter;
+ }
- os << std::endl;
+ os << std::endl;
}
diff -u -r1.4 -r1.5 --- IdSpec.cc 20 Jul 2006 21:07:54 -0000 1.4 +++ IdSpec.cc 24 Jun 2013 22:10:36 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/IdSpec.cc,v 1.4 2006/07/20 21:07:54 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/IdSpec.cc,v 1.5 2013/06/24 22:10:36 jeremy Exp $
#include "IdSpec.hh"
@@ -9,84 +9,80 @@
void IdSpec::printOut(std::ostream& os) const
{
- os << std::endl;
+ os << std::endl;
- os << "IdSpec: " << m_name << std::endl; - os << "bitLength: " << m_bitLength << std::endl;
+ os << "IdSpec: " << m_name << std::endl; + os << "bitLength: " << m_bitLength << std::endl;
- static const int def_width = 15;
+ static const int def_width = 15;
- os.width(def_width); - os << left << "label";
+ os.width(def_width); + os << left << "label";
- os.width(def_width); - os << left << "start";
+ os.width(def_width); + os << left << "start";
- os.width(def_width); - os << left << "end";
+ os.width(def_width); + os << left << "end";
- os.width(def_width); - os << left << "size";
+ os.width(def_width); + os << left << "size";
- os.width(def_width); - os << left << "signed";
+ os.width(def_width); + os << left << "signed";
- os << std::endl;
+ os << std::endl;
- os.fill('-');
- os.width(66);
- os << left << "-" << std::endl;
+ os.fill('-');
+ os.width(66);
+ os << left << "-" << std::endl;
- os.fill(' ');
+ os.fill(' ');
- for ( IdFields::const_iterator iter = IdFieldsBegin();
- iter != IdFieldsEnd();
- iter++ ) {
+ for (IdFields::const_iterator iter = IdFieldsBegin(); iter != IdFieldsEnd(); iter++) {
- IdField* f = *iter;
+ IdField* f = *iter;
- os.width(def_width); - os << left << f->getLabel();
+ os.width(def_width); + os << left << f->getLabel();
- os.width(def_width); - os << left << f->getStart();
+ os.width(def_width); + os << left << f->getStart();
- os.width(def_width); - os << left << f->getStart() + f->getLength() - 1;
+ os.width(def_width); + os << left << f->getStart() + f->getLength() - 1;
- os.width(def_width); - os << left << f->getLength();
+ os.width(def_width); + os << left << f->getLength();
- os.width(def_width); - os << left << f->getSigned();
+ os.width(def_width); + os << left << f->getSigned();
- os.width(def_width); - os << left << std::endl; - }
+ os.width(def_width); + os << left << std::endl; + }
- os << std::endl;
+ os << std::endl;
}
std::string IdSpec::getFieldDescription()
{
- std::stringstream enc;
+ std::stringstream enc;
+
+ // Loop over the fields in the IdSpec.
+ for (IdSpec::IdFields::const_iterator it = this->IdFieldsBegin(); it != this->IdFieldsEnd(); it++) {
+
+ // Get the IdField.
+ IdField* field = (*it);
- // Loop over the fields in the IdSpec.
- for (IdSpec::IdFields::const_iterator it = this->IdFieldsBegin();
- it != this->IdFieldsEnd();
- it++) {
-
- // Get the IdField.
- IdField* field = (*it);
-
- // Encode the field information into the LCIO / compact format.
- enc << field->getLabel() << ":" << field->getStart() << ":";
- if (field->getSigned() ) {
- enc << "-";
+ // Encode the field information into the LCIO / compact format.
+ enc << field->getLabel() << ":" << field->getStart() << ":";
+ if (field->getSigned()) {
+ enc << "-";
+ }
+ enc << field->getLength() << ",";
}
- enc << field->getLength() << ","; - }
- // Return the id description string, eliminating last comma. - return enc.str().substr(0, enc.str().length() - 1);
+ // Return the id description string, eliminating last comma. + return enc.str().substr(0, enc.str().length() - 1);
}
diff -u -r1.2 -r1.3 --- IdVec.cc 2 Feb 2005 02:02:38 -0000 1.2 +++ IdVec.cc 24 Jun 2013 22:10:36 -0000 1.3 @@ -1,43 +1,45 @@
-// $Header: /cvs/lcd/lcdd/src/IdVec.cc,v 1.2 2005/02/02 02:02:38 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/IdVec.cc,v 1.3 2013/06/24 22:10:36 jeremy Exp $
#include "IdVec.hh" IdVec::IdVec()
-{}
+{
+}
IdVec::~IdVec()
-{}
+{
+}
void IdVec::clear()
{
- m_fields.clear();
+ m_fields.clear();
}
void IdVec::push_back(ElementType et)
{
- m_fields.push_back( et );
+ m_fields.push_back(et);
}
IdVec::ElementType IdVec::getFieldValue(SizeType idx) const
{
- return m_fields.at( idx );
+ return m_fields.at(idx);
} void IdVec::setFieldValue(SizeType idx, ElementType et)
-{
- m_fields.insert( m_fields.begin() + idx, et );
+{
+ m_fields.insert(m_fields.begin() + idx, et);
}
-IdVec::ElementType IdVec::operator [] (SizeType idx) const
+IdVec::ElementType IdVec::operator [](SizeType idx) const
{
- return getFieldValue( idx );
+ return getFieldValue(idx);
}
IdVec::ElementVector::const_iterator IdVec::getFieldsBegin() const
{
- return m_fields.begin();
+ return m_fields.begin();
}
IdVec::ElementVector::const_iterator IdVec::getFieldsEnd() const
{
- return m_fields.end();
+ return m_fields.end();
}
diff -u -r1.14 -r1.15 --- LCDDDetectorConstruction.cc 1 Feb 2012 10:28:56 -0000 1.14 +++ LCDDDetectorConstruction.cc 24 Jun 2013 22:10:36 -0000 1.15 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/LCDDDetectorConstruction.cc,v 1.14 2012/02/01 10:28:56 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/LCDDDetectorConstruction.cc,v 1.15 2013/06/24 22:10:36 jeremy Exp $
// LCDD #include "LCDDDetectorConstruction.hh"
@@ -17,63 +17,63 @@
// std #include <cassert>
-LCDDDetectorConstruction::LCDDDetectorConstruction() - : m_world(0)
+LCDDDetectorConstruction::LCDDDetectorConstruction() : + m_world(0)
{
- // LCDD messenger - m_messenger = new LCDDMessenger();
+ // LCDD messenger + m_messenger = new LCDDMessenger();
- // writer messenger - m_writerMessenger = new GDMLWriterMessenger();
+ // writer messenger + m_writerMessenger = new GDMLWriterMessenger();
- // setup geo manager - GeometryManager::instance();
+ // setup geo manager + GeometryManager::instance();
- // setup parser if not already - LCDDParser::instance();
+ // setup parser if not already + LCDDParser::instance();
- m_inspector = new LCDDObjectStoreInspector();
+ m_inspector = new LCDDObjectStoreInspector();
}
LCDDDetectorConstruction::~LCDDDetectorConstruction()
{
- delete m_inspector; - delete m_writerMessenger; - delete m_messenger;
+ delete m_inspector; + delete m_writerMessenger; + delete m_messenger;
}
G4VPhysicalVolume* LCDDDetectorConstruction::Construct()
{
- // start build timer - G4Timer geoTimer; - geoTimer.Start();
+ // start build timer + G4Timer geoTimer; + geoTimer.Start();
- G4cout << "Started geometry construction timer." << G4endl;
+ G4cout << "Started geometry construction timer." << G4endl;
- // get geometry from the global parser instance, which will die on failure - G4VPhysicalVolume* pv = LCDDParser::instance()->construct();
+ // get geometry from the global parser instance, which will die on failure + G4VPhysicalVolume* pv = LCDDParser::instance()->construct();
- // set world ptr - setWorldVolume(pv);
+ // set world ptr + setWorldVolume(pv);
- // stop build timer and print - geoTimer.Stop(); - G4cout << "Geometry construction time: " << geoTimer << G4endl;
+ // stop build timer and print + geoTimer.Stop(); + G4cout << "Geometry construction time: " << geoTimer << G4endl;
- return pv;
+ return pv;
}
void LCDDDetectorConstruction::setWorldVolume(G4VPhysicalVolume *pv)
{
- if (pv == 0) {
- G4Exception("", "", FatalException, "PhysVol points to null.");
- }
+ if (pv == 0) {
+ G4Exception("", "", FatalException, "PhysVol points to null.");
+ }
- m_world = pv;
+ m_world = pv;
}
G4VPhysicalVolume* LCDDDetectorConstruction::getWorldVolume()
{
- return m_world;
+ return m_world;
}
diff -u -r1.5 -r1.6 --- LCDDFieldManager.cc 6 Jul 2006 22:16:58 -0000 1.5 +++ LCDDFieldManager.cc 24 Jun 2013 22:10:36 -0000 1.6 @@ -3,92 +3,89 @@
LCDDFieldManager* LCDDFieldManager::m_instance = 0; LCDDFieldManager::~LCDDFieldManager()
-{}
+{
+}
LCDDFieldManager* LCDDFieldManager::instance()
{
- if (m_instance == 0) {
- m_instance = new LCDDFieldManager();
- }
- return m_instance;
+ if (m_instance == 0) {
+ m_instance = new LCDDFieldManager();
+ }
+ return m_instance;
}
MagneticFieldOverlay* LCDDFieldManager::makeOverlay(std::vector<G4MagneticField*> fields)
{
- MagneticFieldOverlay* overlay = new MagneticFieldOverlay();
- for (std::vector<G4MagneticField*>::const_iterator iter = fields.begin();
- iter != fields.end();
- iter++) {
- overlay->addMagneticField(*iter);
- }
- return overlay;
+ MagneticFieldOverlay* overlay = new MagneticFieldOverlay();
+ for (std::vector<G4MagneticField*>::const_iterator iter = fields.begin(); iter != fields.end(); iter++) {
+ overlay->addMagneticField(*iter);
+ }
+ return overlay;
}
void LCDDFieldManager::setup()
{
- // Pointer to the field which will be passed to Geant4. - G4MagneticField* field = 0;
+ // Pointer to the field which will be passed to Geant4. + G4MagneticField* field = 0;
- // Setup only the global fields specified in global_field.
- if (m_globalfields.size() != 0) {
- // Use specific list of global fields registered with LCDDFieldManager.
- field = setup(m_globalfields);
- }
- // No global fields, so treat all fields registered with LCDDProcessor
- // as global.
- else {
-
- // Build a list of fields that were registered with the LCDDProcessor.
- std::vector<G4MagneticField*> fields;
- LCDDProcessor* proc = LCDDProcessor::instance();
- for (LCDDProcessor::MagneticFields::const_iterator iter = proc->getMagneticFieldsBegin();
- iter != proc->getMagneticFieldsEnd();
- iter++) {
- fields.push_back(iter->second);
+ // Setup only the global fields specified in global_field.
+ if (m_globalfields.size() != 0) {
+ // Use specific list of global fields registered with LCDDFieldManager.
+ field = setup(m_globalfields);
}
+ // No global fields, so treat all fields registered with LCDDProcessor
+ // as global.
+ else {
+
+ // Build a list of fields that were registered with the LCDDProcessor.
+ std::vector<G4MagneticField*> fields;
+ LCDDProcessor* proc = LCDDProcessor::instance();
+ for (LCDDProcessor::MagneticFields::const_iterator iter = proc->getMagneticFieldsBegin(); iter != proc->getMagneticFieldsEnd(); iter++) {
+ fields.push_back(iter->second);
+ }
- // Setup fields from LCDDProcessor. - field = setup(fields); - }
+ // Setup fields from LCDDProcessor. + field = setup(fields); + }
- // Initialize the single or overlay field with Geant4. - initialize(field);
+ // Initialize the single or overlay field with Geant4. + initialize(field);
}
G4MagneticField* LCDDFieldManager::setup(std::vector<G4MagneticField*> fields)
{
- G4MagneticField* field = 0;
- //if (fields.size() == 0) {
- // G4cerr << "LCDDFieldManager - No magnetic fields to setup." << G4endl;
- //}
- //else if (fields.size() == 1) {
- // field = fields[0];
- //}
- //else {
- field = makeOverlay(fields);
- //}
- return field;
+ G4MagneticField* field = 0;
+ //if (fields.size() == 0) {
+ // G4cerr << "LCDDFieldManager - No magnetic fields to setup." << G4endl;
+ //}
+ //else if (fields.size() == 1) {
+ // field = fields[0];
+ //}
+ //else {
+ field = makeOverlay(fields);
+ //}
+ return field;
}
void LCDDFieldManager::initialize(G4MagneticField* field)
{
- if (field != 0) {
- G4FieldManager* fieldMgr =
- G4TransportationManager::GetTransportationManager()->GetFieldManager();
- fieldMgr->SetDetectorField(field);
- fieldMgr->CreateChordFinder(field);
- }
+ if (field != 0) {
+ G4FieldManager* fieldMgr = G4TransportationManager::GetTransportationManager()->GetFieldManager();
+ fieldMgr->SetDetectorField(field);
+ fieldMgr->CreateChordFinder(field);
+ }
}
void LCDDFieldManager::addGlobalField(G4MagneticField* f)
{
- m_globalfields.push_back(f);
+ m_globalfields.push_back(f);
}
void LCDDFieldManager::addField(G4MagneticField* f)
{
- m_allfields.push_back(f);
+ m_allfields.push_back(f);
} LCDDFieldManager::LCDDFieldManager()
-{}
+{
+}
diff -u -r1.30 -r1.31 --- LCDDLibLoad.cc 30 May 2013 00:04:12 -0000 1.30 +++ LCDDLibLoad.cc 24 Jun 2013 22:10:36 -0000 1.31 @@ -2,105 +2,109 @@
#include <iostream>
-extern "C" {
+extern "C"
+{
-void LCDDLoadProcesses() {
+void LCDDLoadProcesses()
+{
- // header - LOAD_COMPONENT(headerProcess); - LOAD_COMPONENT(detectorProcess); - LOAD_COMPONENT(authorProcess); - LOAD_COMPONENT(generatorProcess); - LOAD_COMPONENT(commentProcess); - - // volume extended - LOAD_COMPONENT(volumeExtendedProcess); - LOAD_COMPONENT(physvolidProcess); - - // SDs - LOAD_COMPONENT(calorimeterProcess); - LOAD_COMPONENT(optical_calorimeterProcess); - LOAD_COMPONENT(unsegmented_calorimeterProcess); - LOAD_COMPONENT(trackerProcess); - LOAD_COMPONENT(scorerProcess); - LOAD_COMPONENT(sdrefProcess); - - // segmentations - LOAD_COMPONENT(grid_xyzProcess); - LOAD_COMPONENT(projective_cylinderProcess); - LOAD_COMPONENT(projective_zplaneProcess); - LOAD_COMPONENT(nonprojective_cylinderProcess); - LOAD_COMPONENT(global_grid_xyProcess); - LOAD_COMPONENT(cell_readout_2dProcess); - - // Ids - LOAD_COMPONENT(idspecProcess); - LOAD_COMPONENT(idfieldProcess); - LOAD_COMPONENT(idspecrefProcess); - - // field - LOAD_COMPONENT(fieldrefProcess); - LOAD_COMPONENT(global_fieldProcess); - LOAD_COMPONENT(solenoidProcess); - LOAD_COMPONENT(rz_field_mapProcess); - LOAD_COMPONENT(rzbProcess); - LOAD_COMPONENT(dipoleProcess); - LOAD_COMPONENT(dipole_coeffProcess); - LOAD_COMPONENT(box_dipoleProcess); - LOAD_COMPONENT(field_map_3dProcess) - - // region - LOAD_COMPONENT(regionProcess); - LOAD_COMPONENT(regionrefProcess); - - // display - LOAD_COMPONENT(visProcess); - LOAD_COMPONENT(visrefProcess); - LOAD_COMPONENT(colorProcess); - - // limit - LOAD_COMPONENT(limitsetProcess); - LOAD_COMPONENT(limitsetrefProcess); - LOAD_COMPONENT(limitProcess);
+ // header + LOAD_COMPONENT(headerProcess); + LOAD_COMPONENT(detectorProcess); + LOAD_COMPONENT(authorProcess); + LOAD_COMPONENT(generatorProcess); + LOAD_COMPONENT(commentProcess); + + // volume extended + LOAD_COMPONENT(volumeExtendedProcess); + LOAD_COMPONENT(physvolidProcess); + + // SDs + LOAD_COMPONENT(calorimeterProcess); + LOAD_COMPONENT(optical_calorimeterProcess); + LOAD_COMPONENT(unsegmented_calorimeterProcess); + LOAD_COMPONENT(trackerProcess); + LOAD_COMPONENT(scorerProcess); + LOAD_COMPONENT(sdrefProcess); + + // segmentations + LOAD_COMPONENT(grid_xyzProcess); + LOAD_COMPONENT(projective_cylinderProcess); + LOAD_COMPONENT(projective_zplaneProcess); + LOAD_COMPONENT(nonprojective_cylinderProcess); + LOAD_COMPONENT(global_grid_xyProcess); + LOAD_COMPONENT(cell_readout_2dProcess); + + // Ids + LOAD_COMPONENT(idspecProcess); + LOAD_COMPONENT(idfieldProcess); + LOAD_COMPONENT(idspecrefProcess); + + // field + LOAD_COMPONENT(fieldrefProcess); + LOAD_COMPONENT(global_fieldProcess); + LOAD_COMPONENT(solenoidProcess); + LOAD_COMPONENT(rz_field_mapProcess); + LOAD_COMPONENT(rzbProcess); + LOAD_COMPONENT(dipoleProcess); + LOAD_COMPONENT(dipole_coeffProcess); + LOAD_COMPONENT(box_dipoleProcess); + LOAD_COMPONENT(field_map_3dProcess) + + // region + LOAD_COMPONENT(regionProcess); + LOAD_COMPONENT(regionrefProcess); + + // display + LOAD_COMPONENT(visProcess); + LOAD_COMPONENT(visrefProcess); + LOAD_COMPONENT(colorProcess); + + // limit + LOAD_COMPONENT(limitsetProcess); + LOAD_COMPONENT(limitsetrefProcess); + LOAD_COMPONENT(limitProcess);
}
-void LCDDLoadSubscribers() {
- // subscribers
- LOAD_COMPONENT(headerSubscriber);
-
- // volume extended
- //LOAD_COMPONENT(volumeExtendedSubscriber);
-
- // SDs
- LOAD_COMPONENT(calorimeterSubscriber);
- LOAD_COMPONENT(optical_calorimeterSubscriber);
- LOAD_COMPONENT(unsegmented_calorimeterSubscriber);
- LOAD_COMPONENT(trackerSubscriber);
- LOAD_COMPONENT(scorerSubscriber);
-
- // Ids
- LOAD_COMPONENT(idspecSubscriber);
-
- // field
- LOAD_COMPONENT(solenoidSubscriber);
- LOAD_COMPONENT(rz_field_mapSubscriber);
- LOAD_COMPONENT(dipoleSubscriber);
- LOAD_COMPONENT(box_dipoleSubscriber);
- LOAD_COMPONENT(global_fieldSubscriber);
- LOAD_COMPONENT(field_map_3dSubscriber);
+void LCDDLoadSubscribers()
+{
+ // subscribers
+ LOAD_COMPONENT(headerSubscriber);
+
+ // volume extended
+ //LOAD_COMPONENT(volumeExtendedSubscriber);
+
+ // SDs
+ LOAD_COMPONENT(calorimeterSubscriber);
+ LOAD_COMPONENT(optical_calorimeterSubscriber);
+ LOAD_COMPONENT(unsegmented_calorimeterSubscriber);
+ LOAD_COMPONENT(trackerSubscriber);
+ LOAD_COMPONENT(scorerSubscriber);
+
+ // Ids
+ LOAD_COMPONENT(idspecSubscriber);
+
+ // field
+ LOAD_COMPONENT(solenoidSubscriber);
+ LOAD_COMPONENT(rz_field_mapSubscriber);
+ LOAD_COMPONENT(dipoleSubscriber);
+ LOAD_COMPONENT(box_dipoleSubscriber);
+ LOAD_COMPONENT(global_fieldSubscriber);
+ LOAD_COMPONENT(field_map_3dSubscriber);
- // region - LOAD_COMPONENT(regionSubscriber);
+ // region + LOAD_COMPONENT(regionSubscriber);
- // display - LOAD_COMPONENT(visSubscriber);
+ // display + LOAD_COMPONENT(visSubscriber);
- // limit - LOAD_COMPONENT(limitsetSubscriber);
+ // limit + LOAD_COMPONENT(limitsetSubscriber);
}
-void LCDDLibLoad() {
- LCDDLoadProcesses();
- LCDDLoadSubscribers();
+void LCDDLibLoad()
+{
+ LCDDLoadProcesses();
+ LCDDLoadSubscribers();
} }
diff -u -r1.9 -r1.10 --- LCDDMessenger.cc 2 Mar 2011 03:37:08 -0000 1.9 +++ LCDDMessenger.cc 24 Jun 2013 22:10:36 -0000 1.10 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/LCDDMessenger.cc,v 1.9 2011/03/02 03:37:08 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/LCDDMessenger.cc,v 1.10 2013/06/24 22:10:36 jeremy Exp $
// LCDD #include "LCDDMessenger.hh"
@@ -31,25 +31,18 @@
void LCDDMessenger::SetNewValue(G4UIcommand *cmd, G4String newVals)
{
- LCDDParser* parser=LCDDParser::instance();
+ LCDDParser* parser = LCDDParser::instance();
- G4String singleArg=newVals; - std::istringstream is((const char*)newVals);
+ G4String singleArg = newVals; + std::istringstream is((const char*) newVals);
- if (cmd==m_setURICmd)
- {
+ if (cmd == m_setURICmd) {
parser->setURI(singleArg);
- }
- else if (cmd==m_setSetupNameCmd)
- {
+ } else if (cmd == m_setSetupNameCmd) {
parser->setSetupName(singleArg);
- }
- else if (cmd==m_setVersionCmd)
- {
+ } else if (cmd == m_setVersionCmd) {
parser->setVersion(singleArg);
- }
- else if (cmd==m_setupCmd)
- {
+ } else if (cmd == m_setupCmd) {
G4String uri, setup, version;
is >> uri >> setup >> version;
@@ -57,9 +50,7 @@
parser->setURI(uri);
parser->setSetupName(setup);
parser->setVersion(version);
- }
- else if (cmd==m_dumpCmd)
- {
+ } else if (cmd == m_dumpCmd) {
//std::cout<<"arg: "<<singleArg<<std::endl;
NistElementsDump::writeXml(singleArg);
}
@@ -92,8 +83,7 @@
}
}
#endif
- else
- {
+ else {
G4cerr << "WARNING: Unknown cmd to LCDDMessenger - " << cmd << G4endl;
}
}
@@ -108,51 +98,51 @@
G4UIparameter *p;
// LCDD directory
- m_lcddDir=new G4UIdirectory("/lcdd/");
+ m_lcddDir = new G4UIdirectory("/lcdd/");
m_lcddDir->SetGuidance("XML detector description and geometry commands. [LCDD]");
// set URL for input geometry file
- m_setURICmd=new G4UIcommand("/lcdd/url", this);
+ m_setURICmd = new G4UIcommand("/lcdd/url", this);
m_setURICmd->SetGuidance("Set the Uniform Resource Locator (URL) for the input geometry file.");
m_setURICmd->AvailableForStates(G4State_PreInit);
- p=new G4UIparameter("URI", 's', false);
+ p = new G4UIparameter("URI", 's', false);
m_setURICmd->SetParameter(p);
// set name of GDML setup
- m_setSetupNameCmd=new G4UIcommand("/lcdd/setupName", this);
+ m_setSetupNameCmd = new G4UIcommand("/lcdd/setupName", this);
m_setSetupNameCmd->SetGuidance("Set GDML setup name.");
m_setSetupNameCmd->AvailableForStates(G4State_PreInit);
- p=new G4UIparameter("SetupName", 's', false);
+ p = new G4UIparameter("SetupName", 's', false);
m_setSetupNameCmd->SetParameter(p);
// set version of GDML setup
- m_setVersionCmd=new G4UIcommand("/lcdd/version", this);
+ m_setVersionCmd = new G4UIcommand("/lcdd/version", this);
m_setVersionCmd->SetGuidance("Set GDML version tag.");
m_setVersionCmd->AvailableForStates(G4State_PreInit);
- p=new G4UIparameter("Version", 's', false);
+ p = new G4UIparameter("Version", 's', false);
m_setVersionCmd->SetParameter(p);
// setup URI, Setup and Version in one command
- m_setupCmd=new G4UIcommand("/lcdd/setup", this);
+ m_setupCmd = new G4UIcommand("/lcdd/setup", this);
m_setupCmd->SetGuidance("Set URI, SetupName and Version with a single command.");
m_setupCmd->AvailableForStates(G4State_PreInit);
- p=new G4UIparameter("URI", 's', false);
+ p = new G4UIparameter("URI", 's', false);
p->SetGuidance("URI is a URL to the input file. It MUST NOT contain unescaped spaces.");
m_setupCmd->SetParameter(p);
- p=new G4UIparameter("SetupName", 's', true);
+ p = new G4UIparameter("SetupName", 's', true);
m_setupCmd->SetParameter(p);
- p=new G4UIparameter("Version", 's', true);
+ p = new G4UIparameter("Version", 's', true);
m_setupCmd->SetParameter(p);
- m_dumpCmd=new G4UIcommand("/lcdd/dumpNistElements", this);
+ m_dumpCmd = new G4UIcommand("/lcdd/dumpNistElements", this);
m_dumpCmd->SetGuidance("Dump NIST elements to file as GDML fragment, including lambda and X0.");
- p=new G4UIparameter("Filename", 's', true);
+ p = new G4UIparameter("Filename", 's', true);
p->SetDefaultValue("NistElements.xml");
m_dumpCmd->SetParameter(p);
diff -u -r1.12 -r1.13 --- LCDDParser.cc 1 Feb 2012 10:28:56 -0000 1.12 +++ LCDDParser.cc 24 Jun 2013 22:10:36 -0000 1.13 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/LCDDParser.cc,v 1.12 2012/02/01 10:28:56 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/LCDDParser.cc,v 1.13 2013/06/24 22:10:36 jeremy Exp $
#include "LCDDParser.hh" // lcdd
@@ -15,14 +15,10 @@
LCDDParser* LCDDParser::m_instance = 0;
-LCDDParser::LCDDParser()
- : m_URI(""),
- m_setupName(""),
- m_version(""),
- m_initialized(false),
- m_constructed(false),
- m_setURI(false)
-{}
+LCDDParser::LCDDParser() :
+ m_URI(""), m_setupName(""), m_version(""), m_initialized(false), m_constructed(false), m_setURI(false)
+{
+}
LCDDParser* LCDDParser::instance()
{
@@ -40,14 +36,10 @@
void LCDDParser::setupParserConfig()
{
- setupParserConfig(m_URI, - m_setupName, - m_version);
+ setupParserConfig(m_URI, m_setupName, m_version);
}
-void LCDDParser::setupParserConfig(const std::string& URI, - const std::string&, - const std::string& version)
+void LCDDParser::setupParserConfig(const std::string& URI, const std::string&, const std::string& version)
{
// settings from messenger commands
std::cout << "LCDD URI <" << m_URI << ">" << std::endl;
@@ -71,7 +63,7 @@
// load custom LCDD tag handlers
LCDDLibLoad();
- addVolumeExtendedSubscriber();
+ addVolumeExtendedSubscriber();
} void LCDDParser::initialize()
@@ -97,9 +89,8 @@
// get world volume from GDML
try {
- m_world = (G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume();
- }
- catch (std::exception& e) {
+ m_world = (G4VPhysicalVolume*) GDMLProcessor::GetInstance()->GetWorldVolume();
+ } catch (std::exception& e) {
G4Exception("", "", FatalException, "Failed to get the world volume.");
}
@@ -108,8 +99,7 @@
// This method should only be called once.
m_constructed = true;
- }
- else {
+ } else {
std::cerr << "LCDD geometry was already constructed." << std::endl;
}
@@ -161,7 +151,7 @@
{
bool valid = true;
- if ( !m_setURI ) {
+ if (!m_setURI) {
valid = false;
}
@@ -176,9 +166,9 @@
void LCDDParser::addVolumeExtendedSubscriber()
{
- RCObjectHandle<SAXSubscriber> obj;
+ RCObjectHandle<SAXSubscriber> obj;
obj = new volumeExtendedSubscriber();
- SAXSubscriberPool* pool = const_cast<SAXSubscriberPool*> ( m_sxp.GetSubscriberPool() );
- pool->AddSubscriber("volume",obj);
+ SAXSubscriberPool* pool = const_cast<SAXSubscriberPool*>(m_sxp.GetSubscriberPool());
+ pool->AddSubscriber("volume", obj);
}
diff -u -r1.17 -r1.18 --- LCDDProcessor.cc 12 May 2007 04:21:11 -0000 1.17 +++ LCDDProcessor.cc 24 Jun 2013 22:10:36 -0000 1.18 @@ -13,208 +13,206 @@
LCDDProcessor* LCDDProcessor::sInstance = 0;
-LCDDProcessor::LCDDProcessor()
- : m_header(0)
-{}
+LCDDProcessor::LCDDProcessor() :
+ m_header(0)
+{
+}
LCDDProcessor::~LCDDProcessor()
{
- if ( m_header != 0 ) {
- delete m_header;
- }
+ if (m_header != 0) {
+ delete m_header;
+ }
}
LCDDProcessor* LCDDProcessor::instance()
{
- if (sInstance == 0) {
- sInstance = new LCDDProcessor;
- }
+ if (sInstance == 0) {
+ sInstance = new LCDDProcessor;
+ }
- return sInstance;
+ return sInstance;
}
-void LCDDProcessor::addSensitiveDetector(std::string& name, - G4SensitiveDetector* sd)
+void LCDDProcessor::addSensitiveDetector(std::string& name, G4SensitiveDetector* sd)
{
- //std::cout << "adding SD: " << name << std::endl; - m_sensitiveDetectors[name] = sd;
+ //std::cout << "adding SD: " << name << std::endl; + m_sensitiveDetectors[name] = sd;
}
G4SensitiveDetector* LCDDProcessor::getSensitiveDetector(const std::string& name)
{
- return m_sensitiveDetectors[name];
+ return m_sensitiveDetectors[name];
}
G4SensitiveDetector* LCDDProcessor::getSensitiveDetector(const char* name)
{
- std::string key = name; - return getSensitiveDetector(key);
+ std::string key = name; + return getSensitiveDetector(key);
}
LCDDProcessor::SensitiveDetectors::const_iterator LCDDProcessor::getSensitiveDetectorsBegin()
{
- return m_sensitiveDetectors.begin();
+ return m_sensitiveDetectors.begin();
}
LCDDProcessor::SensitiveDetectors::const_iterator LCDDProcessor::getSensitiveDetectorsEnd()
{
- return m_sensitiveDetectors.end();
+ return m_sensitiveDetectors.end();
}
void LCDDProcessor::addMagneticField(std::string& name, G4MagneticField* mag)
{
- m_magneticFields[name] = mag;
+ m_magneticFields[name] = mag;
}
void LCDDProcessor::addGlobalField(G4MagneticField* mag)
{
- LCDDFieldManager::instance()->addGlobalField(mag);
+ LCDDFieldManager::instance()->addGlobalField(mag);
}
G4MagneticField* LCDDProcessor::getMagneticField(const std::string& name)
{
- return m_magneticFields[name];
+ return m_magneticFields[name];
}
G4MagneticField* LCDDProcessor::getMagneticField(const char* name)
{
- std::string key = name; - return getMagneticField( key );
+ std::string key = name; + return getMagneticField(key);
}
LCDDProcessor::MagneticFields::const_iterator LCDDProcessor::getMagneticFieldsBegin()
{
- return m_magneticFields.begin();
+ return m_magneticFields.begin();
}
LCDDProcessor::MagneticFields::const_iterator LCDDProcessor::getMagneticFieldsEnd()
{
- return m_magneticFields.end();
+ return m_magneticFields.end();
}
void LCDDProcessor::addRegion(std::string& name, G4Region* reg)
{
- m_regions[name] = reg;
+ m_regions[name] = reg;
}
G4Region* LCDDProcessor::getRegion(const std::string& name)
{
- return m_regions[name];
+ return m_regions[name];
}
G4Region* LCDDProcessor::getRegion(const char* name)
{
- std::string key = name; - return getRegion(name);
+ std::string key = name; + return getRegion(name);
}
LCDDProcessor::Regions::const_iterator LCDDProcessor::getRegionsBegin()
{
- return m_regions.begin();
+ return m_regions.begin();
}
LCDDProcessor::Regions::const_iterator LCDDProcessor::getRegionsEnd()
{
- return m_regions.end();
+ return m_regions.end();
}
void LCDDProcessor::addVisAttributes(std::string& name, G4VisAttributes* vis)
{
- m_visAttributes[name] = vis;
+ m_visAttributes[name] = vis;
}
G4VisAttributes* LCDDProcessor::getVisAttributes(const std::string& name)
{
- return m_visAttributes[name];
+ return m_visAttributes[name];
}
G4VisAttributes* LCDDProcessor::getVisAttributes(const char* name)
{
- std::string key = name; - return getVisAttributes(key);
+ std::string key = name; + return getVisAttributes(key);
}
LCDDProcessor::VisAttributes::const_iterator LCDDProcessor::getVisAttributesBegin()
{
- return m_visAttributes.begin();
+ return m_visAttributes.begin();
}
LCDDProcessor::VisAttributes::const_iterator LCDDProcessor::getVisAttributesEnd()
{
- return m_visAttributes.end();
+ return m_visAttributes.end();
}
void LCDDProcessor::addLimitSet(std::string& name, G4LimitSet* lim)
{
- m_limitSets[name] = lim;
+ m_limitSets[name] = lim;
}
G4LimitSet* LCDDProcessor::getLimitSet(const std::string& name)
{
- return m_limitSets[name];
+ return m_limitSets[name];
}
G4LimitSet* LCDDProcessor::getLimitSet(const char* name)
{
- std::string key = name; - return getLimitSet(key);
+ std::string key = name; + return getLimitSet(key);
}
LCDDProcessor::LimitSets::const_iterator LCDDProcessor::getLimitSetsBegin()
{
- return m_limitSets.begin();
+ return m_limitSets.begin();
}
LCDDProcessor::LimitSets::const_iterator LCDDProcessor::getLimitSetsEnd()
{
- return m_limitSets.end();
+ return m_limitSets.end();
}
const LCDDHeaderRecord* LCDDProcessor::getHeader() const
{
- return m_header;
+ return m_header;
}
void LCDDProcessor::setHeader(LCDDHeaderRecord* h)
{
- assert( h ); - m_header = h;
+ assert(h); + m_header = h;
}
std::string LCDDProcessor::getDetectorName() const
{
- std::string detTag;
- if ( m_header==0 ) {
- detTag = "UNKNOWN";
- }
- else
- {
- detTag = m_header->getDetectorName();
- }
- return detTag;
+ std::string detTag;
+ if (m_header == 0) {
+ detTag = "UNKNOWN";
+ } else {
+ detTag = m_header->getDetectorName();
+ }
+ return detTag;
}
const LCDDProcessor::VisAttributes* LCDDProcessor::getVisAttributesStore() const
{
- return &m_visAttributes;
+ return &m_visAttributes;
}
const LCDDProcessor::SensitiveDetectors* LCDDProcessor::getSensitiveDetectorStore() const
{
- return &m_sensitiveDetectors;
+ return &m_sensitiveDetectors;
}
const LCDDProcessor::MagneticFields* LCDDProcessor::getMagneticFieldStore() const
{
- return &m_magneticFields;
+ return &m_magneticFields;
}
const LCDDProcessor::Regions* LCDDProcessor::getRegionStore() const
{
- return &m_regions;
+ return &m_regions;
}
const LCDDProcessor::LimitSets* LCDDProcessor::getLimitSetStore() const
{
- return &m_limitSets;
+ return &m_limitSets;
}
diff -u -r1.4 -r1.5 --- MagneticFieldOverlay.cc 5 Jun 2006 17:41:29 -0000 1.4 +++ MagneticFieldOverlay.cc 24 Jun 2013 22:10:37 -0000 1.5 @@ -1,35 +1,35 @@
-// $Header: /cvs/lcd/lcdd/src/MagneticFieldOverlay.cc,v 1.4 2006/06/05 17:41:29 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/MagneticFieldOverlay.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
#include "MagneticFieldOverlay.hh" #include <iostream> MagneticFieldOverlay::MagneticFieldOverlay()
-{}
+{
+}
MagneticFieldOverlay::~MagneticFieldOverlay()
-{}
+{
+}
void MagneticFieldOverlay::addMagneticField(G4MagneticField* field)
{
- if (field != 0) {
- m_fields.push_back(field);
- }
+ if (field != 0) {
+ m_fields.push_back(field);
+ }
} /** * Call GetFieldValue of all G4MagneticField objects registered with this MagneticFieldOverlay. */
-void MagneticFieldOverlay::GetFieldValue( const double Point[3], double *Bfield ) const
+void MagneticFieldOverlay::GetFieldValue(const double Point[3], double *Bfield) const
{
- //std::cout << "MagneticFieldOverlay::GetFieldValue" << std::endl;
+ //std::cout << "MagneticFieldOverlay::GetFieldValue" << std::endl;
- Bfield[0] = Bfield[1] = Bfield[2] = 0.;
- for(std::vector<G4MagneticField*>::const_iterator iter = m_fields.begin();
- iter != m_fields.end();
- iter++) {
- (*iter)->GetFieldValue(Point, Bfield);
- }
+ Bfield[0] = Bfield[1] = Bfield[2] = 0.;
+ for (std::vector<G4MagneticField*>::const_iterator iter = m_fields.begin(); iter != m_fields.end(); iter++) {
+ (*iter)->GetFieldValue(Point, Bfield);
+ }
- //std::cout << "x y z: " << Point[0] << " " << Point[1] << " " << Point[2] << std::endl; - //std::cout << "bx, by, bz: " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl << std::endl;
+ //std::cout << "x y z: " << Point[0] << " " << Point[1] << " " << Point[2] << std::endl; + //std::cout << "bx, by, bz: " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl << std::endl;
}
diff -u -r1.4 -r1.5 --- McpHitContrib.cc 23 Aug 2011 22:40:52 -0000 1.4 +++ McpHitContrib.cc 24 Jun 2013 22:10:37 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/McpHitContrib.cc,v 1.4 2011/08/23 22:40:52 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/McpHitContrib.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
#include "McpHitContrib.hh" #include "TrackInformation.hh"
@@ -10,15 +10,21 @@
#include "G4ParticleTypes.hh" McpHitContrib::McpHitContrib() :
- m_trackID(-1), m_edep(0), m_PdgId(9999999), m_globalTime(0)
-{;}
+ m_trackID(-1), m_edep(0), m_PdgId(9999999), m_globalTime(0)
+{
+ ;
+}
McpHitContrib::McpHitContrib(G4int trackID, G4double edep, G4int PDGID, G4double globalTime) :
- m_trackID(trackID), m_edep(edep), m_PdgId(PDGID), m_globalTime(globalTime)
-{;}
+ m_trackID(trackID), m_edep(edep), m_PdgId(PDGID), m_globalTime(globalTime)
+{
+ ;
+}
McpHitContrib::~McpHitContrib()
-{;}
+{
+ ;
+}
McpHitContrib::McpHitContrib(const G4Step* aStep)
{
@@ -26,18 +32,15 @@
const G4Track* aTrack = aStep->GetTrack();
// Get the track information.
- TrackInformation* trkInfo = static_cast<TrackInformation*> (aTrack->GetUserInformation());
+ TrackInformation* trkInfo = static_cast<TrackInformation*>(aTrack->GetUserInformation());
// Get the track ID.
m_trackID = trkInfo->getOriginalTrackID();
// Set edep according to type of track.
- if (aTrack->GetDefinition() == G4OpticalPhoton::OpticalPhotonDefinition())
- {
+ if (aTrack->GetDefinition() == G4OpticalPhoton::OpticalPhotonDefinition()) {
m_edep = aTrack->GetTotalEnergy();
- }
- else
- {
+ } else {
m_edep = aStep->GetTotalEnergyDeposit();
}
@@ -48,8 +51,7 @@
m_globalTime = aTrack->GetGlobalTime();
// Compute the step midpoint.
- G4ThreeVector posVec = (0.5 * (aStep->GetPreStepPoint()->GetPosition() - + aStep->GetPostStepPoint()->GetPosition()));
+ G4ThreeVector posVec = (0.5 * (aStep->GetPreStepPoint()->GetPosition() + aStep->GetPostStepPoint()->GetPosition()));
m_position[0] = posVec[0];
m_position[1] = posVec[1];
m_position[2] = posVec[2];
diff -u -r1.1 -r1.2 --- NistElementsDump.cc 2 Mar 2011 03:37:08 -0000 1.1 +++ NistElementsDump.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -1,4 +1,4 @@
-// $Id: NistElementsDump.cc,v 1.1 2011/03/02 03:37:08 jeremy Exp $
+// $Id: NistElementsDump.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
#include "NistElementsDump.hh"
@@ -39,23 +39,20 @@
Element* materials = new Element("materials");
// Loop over chemical elements array.
- for (int i=0; i<nelements; i++)
- {
+ for (int i = 0; i < nelements; i++) {
// Get the element abbreviation and name.
const std::string& elemAbbrev = abbrevs[i];
const std::string& elemName = names[i];
// Get element and material from G4.
G4Element* elem = mgr->FindOrBuildElement(elemAbbrev);
- if (elem==0)
- {
+ if (elem == 0) {
std::cout << elemAbbrev << " not found." << std::endl;
continue;
}
- const std::string& g4mat = "G4_"+ elemAbbrev;
+ const std::string& g4mat = "G4_" + elemAbbrev;
G4Material* mat = mgr->FindOrBuildMaterial(g4mat);
- if (mat==0)
- {
+ if (mat == 0) {
std::cout << g4mat << " not found." << std::endl;
continue;
}
@@ -70,7 +67,7 @@
Element* atomNode = new Element("atom");
atomNode->addAttribute("type", "A");
atomNode->addAttribute("unit", "g/mol");
- atomNode->addAttribute("value", StringUtil::toString((elem->GetA()*mole/g)));
+ atomNode->addAttribute("value", StringUtil::toString((elem->GetA() * mole / g)));
// Append atom node to element.
elemNode->appendChild(*atomNode);
@@ -86,20 +83,13 @@
// Set material state.
G4State g4state = mat->GetState();
std::string state;
- if (g4state == kStateSolid)
- {
+ if (g4state == kStateSolid) {
state = "solid";
- }
- else if (g4state == kStateLiquid)
- {
+ } else if (g4state == kStateLiquid) {
state = "liquid";
- }
- else if (g4state == kStateGas)
- {
+ } else if (g4state == kStateGas) {
state = "gas";
- }
- else
- {
+ } else {
state = "unknown";
}
matNode->addAttribute("state", state);
@@ -108,21 +98,21 @@
Element* radlNode = new Element("RL");
radlNode->addAttribute("unit", "cm");
radlNode->addAttribute("type", "X0");
- radlNode->addAttribute("value", StringUtil::toString(mat->GetRadlen()/cm));
+ radlNode->addAttribute("value", StringUtil::toString(mat->GetRadlen() / cm));
matNode->appendChild(*radlNode);
// Add nuclear interaction length node.
Element* nilNode = new Element("NIL");
nilNode->addAttribute("unit", "cm");
nilNode->addAttribute("type", "lambda");
- nilNode->addAttribute("value", StringUtil::toString(mat->GetNuclearInterLength()/cm));
+ nilNode->addAttribute("value", StringUtil::toString(mat->GetNuclearInterLength() / cm));
matNode->appendChild((*nilNode));
// Add density node.
Element* densNode = new Element("D");
densNode->addAttribute("type", "density");
densNode->addAttribute("unit", "g/cm3");
- double matDens = mat->GetDensity()/(g/cm3);
+ double matDens = mat->GetDensity() / (g / cm3);
densNode->addAttribute("value", StringUtil::toString(matDens));
matNode->appendChild(*densNode);
diff -u -r1.14 -r1.15 --- ReadoutUtil.cc 1 Feb 2012 10:28:56 -0000 1.14 +++ ReadoutUtil.cc 24 Jun 2013 22:10:37 -0000 1.15 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/ReadoutUtil.cc,v 1.14 2012/02/01 10:28:56 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/ReadoutUtil.cc,v 1.15 2013/06/24 22:10:37 jeremy Exp $
#include "ReadoutUtil.hh" #include <cmath>
@@ -10,202 +10,189 @@
const double ReadoutUtil::PI = acos(-1);
-G4ThreeVector ReadoutUtil::computeThreeVectorMean(const G4ThreeVector& vec1, - const G4ThreeVector& vec2)
+G4ThreeVector ReadoutUtil::computeThreeVectorMean(const G4ThreeVector& vec1, const G4ThreeVector& vec2)
{
- return (0.5 * (vec1 + vec2 ) );
+ return (0.5 * (vec1 + vec2));
}
-G4double ReadoutUtil::computeDistance(const G4ThreeVector& vec1, - const G4ThreeVector& vec2)
+G4double ReadoutUtil::computeDistance(const G4ThreeVector& vec1, const G4ThreeVector& vec2)
{
- return (sqrt(pow(vec1.x() - vec2.x(), 2) + pow(vec1.y() - vec2.y(), 2) + pow(vec1.z() - vec2.z(), 2)));
+ return (sqrt(pow(vec1.x() - vec2.x(), 2) + pow(vec1.y() - vec2.y(), 2) + pow(vec1.z() - vec2.z(), 2)));
}
G4double ReadoutUtil::computeDistance(const G4Step* aStep)
{
- return computeDistance(aStep->GetPreStepPoint()->GetPosition(), aStep->GetPostStepPoint()->GetPosition());
+ return computeDistance(aStep->GetPreStepPoint()->GetPosition(), aStep->GetPostStepPoint()->GetPosition());
}
G4ThreeVector ReadoutUtil::computeMidPos(const G4Step* aStep)
{
- return computeThreeVectorMean( aStep->GetPreStepPoint()->GetPosition(), - aStep->GetPostStepPoint()->GetPosition() );
+ return computeThreeVectorMean(aStep->GetPreStepPoint()->GetPosition(), aStep->GetPostStepPoint()->GetPosition());
}
G4VSolid* ReadoutUtil::getSolidFromStepPoint(const G4StepPoint* aStepPoint)
{
- assert( aStepPoint );
+ assert(aStepPoint);
- return aStepPoint->GetTouchableHandle()->GetVolume()->GetLogicalVolume() - ->GetSolid();
+ return aStepPoint->GetTouchableHandle()->GetVolume()->GetLogicalVolume()->GetSolid();
}
G4TouchableHandle ReadoutUtil::getTouchableFromStep(const G4Step* aStep)
{
- return aStep->GetPreStepPoint()->GetTouchableHandle();
+ return aStep->GetPreStepPoint()->GetTouchableHandle();
}
-G4ThreeVector ReadoutUtil::getVolumeGlobalPosition(const G4StepPoint* aStepPoint, - const G4ThreeVector& pnt )
+G4ThreeVector ReadoutUtil::getVolumeGlobalPosition(const G4StepPoint* aStepPoint, const G4ThreeVector& pnt)
{
- return aStepPoint->GetTouchableHandle()->GetHistory()->GetTopTransform().Inverse().TransformPoint( pnt );
+ return aStepPoint->GetTouchableHandle()->GetHistory()->GetTopTransform().Inverse().TransformPoint(pnt);
}
G4ThreeVector ReadoutUtil::getVolumeGlobalPosition(const G4StepPoint* aStepPoint)
{
- return getVolumeGlobalPosition( aStepPoint, G4ThreeVector() );
+ return getVolumeGlobalPosition(aStepPoint, G4ThreeVector());
}
const G4Tubs* ReadoutUtil::getTubs(const G4Step* aStep)
{
- const G4Tubs* tubs = 0; - G4VSolid* solid = ReadoutUtil::getSolidFromStepPoint( aStep->GetPreStepPoint() ); - tubs = static_cast<const G4Tubs*> ( solid ); - return tubs;
+ const G4Tubs* tubs = 0; + G4VSolid* solid = ReadoutUtil::getSolidFromStepPoint(aStep->GetPreStepPoint()); + tubs = static_cast<const G4Tubs*>(solid); + return tubs;
}
const G4Tubs* ReadoutUtil::getTubs(const G4StepPoint* aPreStepPoint)
{
- const G4Tubs* tubs = 0; - G4VSolid* solid = ReadoutUtil::getSolidFromStepPoint( aPreStepPoint); - tubs = static_cast<const G4Tubs*> ( solid ); - return tubs;
+ const G4Tubs* tubs = 0; + G4VSolid* solid = ReadoutUtil::getSolidFromStepPoint(aPreStepPoint); + tubs = static_cast<const G4Tubs*>(solid); + return tubs;
}
double ReadoutUtil::computeTubsMidRadius(const G4Tubs* tubs)
{
- double thickness = getTubsThickness( tubs ); - double rcyl = tubs->GetInnerRadius() + thickness / 2; - return rcyl;
+ double thickness = getTubsThickness(tubs); + double rcyl = tubs->GetInnerRadius() + thickness / 2; + return rcyl;
}
double ReadoutUtil::computeTubsMidRadius(const G4Step* aStep)
{
- return computeTubsMidRadius( ReadoutUtil::getTubs( aStep ) );
+ return computeTubsMidRadius(ReadoutUtil::getTubs(aStep));
}
double ReadoutUtil::computeTubsMidRadius(const G4StepPoint* aPreStepPoint)
{
- return computeTubsMidRadius( ReadoutUtil::getTubs( aPreStepPoint ) );
+ return computeTubsMidRadius(ReadoutUtil::getTubs(aPreStepPoint));
}
double ReadoutUtil::getTubsThickness(const G4Tubs* tubs)
{
- return tubs->GetOuterRadius() - tubs->GetInnerRadius();
+ return tubs->GetOuterRadius() - tubs->GetInnerRadius();
}
-G4ThreeVector ReadoutUtil::transformLocalToGlobal(const G4Step* aStep, - const G4ThreeVector& localPos)
+G4ThreeVector ReadoutUtil::transformLocalToGlobal(const G4Step* aStep, const G4ThreeVector& localPos)
{
- // get touchable from PreStepPoint - G4TouchableHandle theTouchable = aStep->GetPreStepPoint()->GetTouchableHandle();
+ // get touchable from PreStepPoint + G4TouchableHandle theTouchable = aStep->GetPreStepPoint()->GetTouchableHandle();
- // compute global pos using local point and touchable - G4ThreeVector globalPos = theTouchable->GetHistory()->GetTopTransform().Inverse().TransformPoint( localPos );
+ // compute global pos using local point and touchable + G4ThreeVector globalPos = theTouchable->GetHistory()->GetTopTransform().Inverse().TransformPoint(localPos);
- return globalPos;
+ return globalPos;
}
-G4ThreeVector ReadoutUtil::transformLocalToGlobal(const G4StepPoint* aPreStepPoint, - const G4ThreeVector& localPos)
+G4ThreeVector ReadoutUtil::transformLocalToGlobal(const G4StepPoint* aPreStepPoint, const G4ThreeVector& localPos)
{
- // get touchable from PreStepPoint - G4TouchableHandle theTouchable = aPreStepPoint->GetTouchableHandle();
+ // get touchable from PreStepPoint + G4TouchableHandle theTouchable = aPreStepPoint->GetTouchableHandle();
- // compute global pos using local point and touchable - G4ThreeVector globalPos = theTouchable->GetHistory()->GetTopTransform().Inverse().TransformPoint( localPos );
+ // compute global pos using local point and touchable + G4ThreeVector globalPos = theTouchable->GetHistory()->GetTopTransform().Inverse().TransformPoint(localPos);
- return globalPos;
+ return globalPos;
}
-G4ThreeVector ReadoutUtil::transformGlobalToLocal(const G4Step* aStep, - const G4ThreeVector& globalPos)
+G4ThreeVector ReadoutUtil::transformGlobalToLocal(const G4Step* aStep, const G4ThreeVector& globalPos)
{
- // get touchable from PreStepPoint - G4TouchableHandle theTouchable = aStep->GetPreStepPoint()->GetTouchableHandle();
+ // get touchable from PreStepPoint + G4TouchableHandle theTouchable = aStep->GetPreStepPoint()->GetTouchableHandle();
- // compute local pos using global point and touchable - G4ThreeVector localPos = theTouchable->GetHistory()->GetTopTransform().TransformPoint( globalPos );
+ // compute local pos using global point and touchable + G4ThreeVector localPos = theTouchable->GetHistory()->GetTopTransform().TransformPoint(globalPos);
- return localPos;
+ return localPos;
}
-G4ThreeVector ReadoutUtil::transformGlobalToLocal(const G4StepPoint* aPreStepPoint, - const G4ThreeVector& globalPos)
+G4ThreeVector ReadoutUtil::transformGlobalToLocal(const G4StepPoint* aPreStepPoint, const G4ThreeVector& globalPos)
{
- // get touchable from PreStepPoint - G4TouchableHandle theTouchable = aPreStepPoint->GetTouchableHandle();
+ // get touchable from PreStepPoint + G4TouchableHandle theTouchable = aPreStepPoint->GetTouchableHandle();
- // compute local pos using global point and touchable - G4ThreeVector localPos = theTouchable->GetHistory()->GetTopTransform().TransformPoint( globalPos );
+ // compute local pos using global point and touchable + G4ThreeVector localPos = theTouchable->GetHistory()->GetTopTransform().TransformPoint(globalPos);
- return localPos;
+ return localPos;
}
-std::vector<G4VPhysicalVolume*> ReadoutUtil::getPhysVolList( G4Step* aStep )
+std::vector<G4VPhysicalVolume*> ReadoutUtil::getPhysVolList(G4Step* aStep)
{
- std::vector<G4VPhysicalVolume*> physVols;
+ std::vector<G4VPhysicalVolume*> physVols;
- // get touchable from PreStepPoint - G4TouchableHandle theTouchable = aStep->GetPreStepPoint()->GetTouchableHandle();
+ // get touchable from PreStepPoint + G4TouchableHandle theTouchable = aStep->GetPreStepPoint()->GetTouchableHandle();
- G4int hdepth = theTouchable->GetHistoryDepth();
+ G4int hdepth = theTouchable->GetHistoryDepth();
- const G4NavigationHistory* theTouchableHistory = theTouchable->GetHistory();
+ const G4NavigationHistory* theTouchableHistory = theTouchable->GetHistory();
- for ( int i = hdepth;
- i > 0;
- i-- ) {
- G4VPhysicalVolume* pv = theTouchableHistory->GetVolume( i );
- physVols.push_back( pv );
+ for (int i = hdepth; i > 0; i--) {
+ G4VPhysicalVolume* pv = theTouchableHistory->GetVolume(i);
+ physVols.push_back(pv);
#ifdef ID_DEBUG
- G4cout << "pushed back <" << pv->GetName() << ">" << G4endl;
+ G4cout << "pushed back <" << pv->GetName() << ">" << G4endl;
#endif
- }
+ }
- return physVols;
+ return physVols;
}
int ReadoutUtil::getVolumeNumber(G4TouchableHandle theTouchable, int historyDepth)
{
- bool no_depth = false;
+ bool no_depth = false;
- if (historyDepth == -1) {
- no_depth = true;
- }
+ if (historyDepth == -1) {
+ no_depth = true;
+ }
- G4VPhysicalVolume *pv = 0;
+ G4VPhysicalVolume *pv = 0;
- // pv only with depth arg
- if (!no_depth) {
- pv = theTouchable->GetHistory()->GetVolume(historyDepth);
- }
+ // pv only with depth arg
+ if (!no_depth) {
+ pv = theTouchable->GetHistory()->GetVolume(historyDepth);
+ }
- int vnum = -1;
+ int vnum = -1;
- // rep num: no pv, replicated, parameterised
- if ( !pv ||
- pv->IsReplicated() ||
- pv->IsParameterised() ) {
+ // rep num: no pv, replicated, parameterised
+ if (!pv || pv->IsReplicated() || pv->IsParameterised()) {
- // no depth
- if (no_depth) {
- vnum = theTouchable->GetReplicaNumber();
+ // no depth
+ if (no_depth) {
+ vnum = theTouchable->GetReplicaNumber();
+ }
+ // use history depth
+ else {
+ vnum = theTouchable->GetReplicaNumber(historyDepth);
+ }
}
- // use history depth
+ // copy num: placement
else {
- vnum = theTouchable->GetReplicaNumber(historyDepth);
+ vnum = pv->GetCopyNo();
}
- }
- // copy num: placement
- else {
- vnum = pv->GetCopyNo();
- }
- return vnum;
+ return vnum;
}
bool ReadoutUtil::isGeantino(G4Step* aStep)
{
- G4ParticleDefinition* def = aStep->GetTrack()->GetDefinition(); - if ( def == G4Geantino::Definition() || def == G4ChargedGeantino::Definition() ) - return true; - else - return false;
+ G4ParticleDefinition* def = aStep->GetTrack()->GetDefinition(); + if (def == G4Geantino::Definition() || def == G4ChargedGeantino::Definition()) + return true; + else + return false;
}
diff -u -r1.24 -r1.25 --- SensitiveDetectorFactory.cc 30 May 2013 00:04:12 -0000 1.24 +++ SensitiveDetectorFactory.cc 24 Jun 2013 22:10:37 -0000 1.25 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/SensitiveDetectorFactory.cc,v 1.24 2013/05/30 00:04:12 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/SensitiveDetectorFactory.cc,v 1.25 2013/06/24 22:10:37 jeremy Exp $
#include "SensitiveDetectorFactory.hh" // lcdd
@@ -12,15 +12,13 @@
#include "IdComparator.hh" #include "StringUtil.hh"
-G4SensitiveDetector* SensitiveDetectorFactory::createSensitiveDetector( - const SAXObject* object)
+G4SensitiveDetector* SensitiveDetectorFactory::createSensitiveDetector(const SAXObject* object)
{
//std::cout << "create SD" << std::endl;
G4SensitiveDetector* sd = 0;
- const SensitiveDetectorType* sdt = - dynamic_cast<const SensitiveDetectorType*>(object);
+ const SensitiveDetectorType* sdt = dynamic_cast<const SensitiveDetectorType*>(object);
if (sdt) {
@@ -45,15 +43,14 @@
G4Exception("", "", FatalException, "Unknown SD type. Check the LCDD file.");
}
- // set ecut and verbose
+ // set ecut and verbose
setBaseSensitiveDetectorAttributes(sd, sdt);
// find idspec
IdSpec* idspec = findIdSpec(sdt);
// set idspec, if exists (null is ok)
- if (idspec != 0)
- {
+ if (idspec != 0) {
sd->setIdSpec(idspec);
}
@@ -72,8 +69,7 @@
G4CalorimeterSD* sd = 0;
G4Segmentation* seg = 0;
- const SensitiveDetectorType* sdt = - dynamic_cast<const SensitiveDetectorType*>(object);
+ const SensitiveDetectorType* sdt = dynamic_cast<const SensitiveDetectorType*>(object);
std::string sd_type = sdt->get_type();
@@ -108,19 +104,16 @@
IdSpec* idspec = findIdSpec(sdt);
if (hitCompareStr != "id" && hitCompareStr != "position") {
- G4cerr << "Invalid selection for hit comparison <" << hitCompareStr << ">, for calorimeter <" - << sdt->get_name() << ">." << G4endl;
+ G4cerr << "Invalid selection for hit comparison <" << hitCompareStr << ">, for calorimeter <" << sdt->get_name() << ">." << G4endl;
G4Exception("", "", FatalException, "Invalid selection for hit comparison.");
}
- // Compare on IDs.
+ // Compare on IDs.
if (hitCompareStr == "id") {
if (idspec) {
hitCompare = new IdComparator();
} else {
- std::cerr << "WARNING: IdSpec for <" << sdt->get_name() - << "> does not exist! Position comparison will be used for hit aggregation instead of id." - << std::endl;
+ std::cerr << "WARNING: IdSpec for <" << sdt->get_name() << "> does not exist! Position comparison will be used for hit aggregation instead of id." << std::endl;
}
}
@@ -130,13 +123,8 @@
}
if (sd_type == "calorimeter") {
- sd = new G4CalorimeterSD(
- sdt->get_name(),
- sdt->get_hitsCollectionName(),
- seg,
- hitCompare);
- }
- else if (sd_type == "optical_calorimeter") {
+ sd = new G4CalorimeterSD(sdt->get_name(), sdt->get_hitsCollectionName(), seg, hitCompare);
+ } else if (sd_type == "optical_calorimeter") {
//
// in case of optical alorimeter there are 2 hit collections
//
@@ -149,10 +137,7 @@
sd = new G4OpticalCalorimeterSD(sdt->get_name(), hcnames, seg, hitCompare);
} else if (sd_type == "unsegmented_calorimeter") {
// Segmentation could be null but that is fine for this type of calorimeter.
- sd = new G4UnsegmentedCalorimeterSD( - sdt->get_name(), - sdt->get_hitsCollectionName(), - seg);
+ sd = new G4UnsegmentedCalorimeterSD(sdt->get_name(), sdt->get_hitsCollectionName(), seg);
} else {
G4cerr << "Unknown sensitive detector type: " << sd_type << G4endl;
G4Exception("SensitiveDetectorFactory", "", FatalException, "Unknown sensitive detector type.");
@@ -173,8 +158,7 @@
std::string hc = trk->get_hitsCollectionName();
if (checkHCName(hc)) {
- G4Exception("SensitiveDetectorFactory", "", FatalException,
- "Name of the hits collection is invalid.");
+ G4Exception("SensitiveDetectorFactory", "", FatalException, "Name of the hits collection is invalid.");
}
/* tracker that aggregates hits */
@@ -198,8 +182,7 @@
std::string hc = scr->get_hitsCollectionName();
if (checkHCName(hc)) {
- G4Exception("SensitiveDetectorFactory", "", FatalException,
- "Name of the hits collections is invalid.");
+ G4Exception("SensitiveDetectorFactory", "", FatalException, "Name of the hits collections is invalid.");
}
sd = new G4ScorerSD(nm, hc);
@@ -217,14 +200,12 @@
// find idspec
if (child_tag == "idspecref") {
- IdSpecType::idspecref* id_ref = - dynamic_cast<IdSpecType::idspecref*>(seq->content(i).object);
+ IdSpecType::idspecref* id_ref = dynamic_cast<IdSpecType::idspecref*>(seq->content(i).object);
idspec = IdManager::instance()->getIdSpec(id_ref->get_ref());
if (idspec == 0) {
- G4cerr << "IdSpec <" << id_ref->get_ref() << "> referenced by detector <" << sdt->get_name() - << "> does not exist." << G4endl;
+ G4cerr << "IdSpec <" << id_ref->get_ref() << "> referenced by detector <" << sdt->get_name() << "> does not exist." << G4endl;
G4Exception("", "", FatalException, "IdSpec does not exist.");
}
@@ -234,9 +215,7 @@
return idspec; }
-void SensitiveDetectorFactory::setBaseSensitiveDetectorAttributes( - G4SensitiveDetector* sd, - const SensitiveDetectorType* sdt)
+void SensitiveDetectorFactory::setBaseSensitiveDetectorAttributes(G4SensitiveDetector* sd, const SensitiveDetectorType* sdt)
{
sd->setEcut(SensitiveDetectorFactory::computeEcut(sdt));
sd->setVerbose(SensitiveDetectorFactory::convertVerbose(sdt));
@@ -264,8 +243,7 @@
bool SensitiveDetectorFactory::isSegmentationTag(const std::string& s)
{
// @todo Fix this to know all segmentation types automatically somehow. (schema?)
- return (s == "projective_cylinder" || s == "grid_xyz" || s == "global_grid_xy" || s - == "nonprojective_cylinder" || s == "projective_zplane" || s == "cell_readout_2d");
+ return (s == "projective_cylinder" || s == "grid_xyz" || s == "global_grid_xy" || s == "nonprojective_cylinder" || s == "projective_zplane" || s == "cell_readout_2d");
} bool SensitiveDetectorFactory::checkHCName(const std::string& s)
@@ -276,12 +254,9 @@
if (s.size() <= 1) {
bad = true;
//std::cerr << "HCName <" << s << "> is not enough characters." << std::endl;
- }
- else {
+ } else {
LCDDProcessor* proc = LCDDProcessor::instance();
- for (LCDDProcessor::SensitiveDetectors::const_iterator iter =
- proc->getSensitiveDetectorsBegin(); iter
- != proc->getSensitiveDetectorsBegin(); iter++) {
+ for (LCDDProcessor::SensitiveDetectors::const_iterator iter = proc->getSensitiveDetectorsBegin(); iter != proc->getSensitiveDetectorsBegin(); iter++) {
if (iter->second->getHCName() == s) {
bad = true;
//std::cerr << "HCName <" << s << "> already assigned to SD <" << iter->second->GetName() << ">." << std::endl;
diff -u -r1.2 -r1.3 --- SensitiveDetectorMessenger.cc 12 Jul 2007 18:09:01 -0000 1.2 +++ SensitiveDetectorMessenger.cc 24 Jun 2013 22:10:37 -0000 1.3 @@ -1,4 +1,4 @@
-// $Id: SensitiveDetectorMessenger.cc,v 1.2 2007/07/12 18:09:01 jeremy Exp $
+// $Id: SensitiveDetectorMessenger.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
#include "SensitiveDetectorMessenger.hh" // geant4
@@ -11,104 +11,97 @@
G4UIdirectory* SensitiveDetectorMessenger::m_detectorsDir = 0;
-SensitiveDetectorMessenger::SensitiveDetectorMessenger(G4SensitiveDetector* detector) - : m_detector(detector)
+SensitiveDetectorMessenger::SensitiveDetectorMessenger(G4SensitiveDetector* detector) : + m_detector(detector)
{
- if ( m_detectorsDir == 0 ) {
- makeDetectorsDir();
- }
+ if (m_detectorsDir == 0) {
+ makeDetectorsDir();
+ }
- defineCommands(m_detector);
+ defineCommands(m_detector);
}
- -SensitiveDetectorMessenger::~SensitiveDetectorMessenger()
+ +SensitiveDetectorMessenger::~SensitiveDetectorMessenger()
{
- // TODO: put command deletes here
+ // TODO: put command deletes here
}
void SensitiveDetectorMessenger::SetNewValue(G4UIcommand* cmd, G4String newVals)
{
- if ( cmd == m_printInfoCmd ) {
- m_detector->printBasicInfo( std::cout );
- }
- else if ( cmd == m_printNHitsCmd ) {
- m_detector->printNumberOfHits( std::cout );
- }
- else if ( cmd == m_printTotalEdepCmd ) {
- m_detector->printEdep( std::cout );
- }
- else if ( cmd == m_printVolumesCmd ) {
- m_detector->printVolumes( std::cout );
- }
- else if ( cmd == m_printHitsCmd ) {
- m_detector->printHits( std::cout );
- }
- else if ( cmd == m_verboseCmd ) {
- m_detector->setVerbose( m_verboseCmd->GetNewIntValue( newVals ) );
- }
- else if ( cmd == m_activateCmd ) {
- m_detector->Activate( m_activateCmd->GetNewBoolValue( newVals ) );
- }
- else if ( cmd == m_ecutCmd ) {
- m_detector->setEcut( m_ecutCmd->GetNewDoubleValue( newVals ) );
- }
+ if (cmd == m_printInfoCmd) {
+ m_detector->printBasicInfo(std::cout);
+ } else if (cmd == m_printNHitsCmd) {
+ m_detector->printNumberOfHits(std::cout);
+ } else if (cmd == m_printTotalEdepCmd) {
+ m_detector->printEdep(std::cout);
+ } else if (cmd == m_printVolumesCmd) {
+ m_detector->printVolumes(std::cout);
+ } else if (cmd == m_printHitsCmd) {
+ m_detector->printHits(std::cout);
+ } else if (cmd == m_verboseCmd) {
+ m_detector->setVerbose(m_verboseCmd->GetNewIntValue(newVals));
+ } else if (cmd == m_activateCmd) {
+ m_detector->Activate(m_activateCmd->GetNewBoolValue(newVals));
+ } else if (cmd == m_ecutCmd) {
+ m_detector->setEcut(m_ecutCmd->GetNewDoubleValue(newVals));
+ }
}
void SensitiveDetectorMessenger::makeDetectorsDir()
{
- m_detectorsDir = new G4UIdirectory( "/detectors/" );
- m_detectorsDir->SetGuidance("Commands for sensitive detectors. [LCDD]");
+ m_detectorsDir = new G4UIdirectory("/detectors/");
+ m_detectorsDir->SetGuidance("Commands for sensitive detectors. [LCDD]");
}
void SensitiveDetectorMessenger::defineCommands(G4VSensitiveDetector* sd)
{
- // Name of the sensitive detector. - const G4String& name = sd->GetName();
+ // Name of the sensitive detector. + const G4String& name = sd->GetName();
- // Name of the sensitive detector's command directory.
- const G4String& dirName = G4String("/detectors/" + name + "/");
+ // Name of the sensitive detector's command directory.
+ const G4String& dirName = G4String("/detectors/" + name + "/");
- // Create the sensitive detector's Geant4 macro command directory. - m_detectorDir = new G4UIdirectory( dirName.c_str() ); - m_detectorDir->SetGuidance( G4String( "Commands for the sensitive detector " + name ).c_str() ); - - // Print command. - m_printInfoCmd = new G4UIcommand( G4String( dirName + "print" ).c_str(), this ); - m_printInfoCmd->SetGuidance( G4String( "Print basic information about the sensitive detector " + name ).c_str() ); - - // Print number of hits command. - m_printNHitsCmd = new G4UIcommand( G4String( dirName + "printNumberOfHits" ).c_str(), this ); - m_printInfoCmd->SetGuidance( G4String( "Print the number of hits from the detector " + name ).c_str() ); - - // Print energy deposition. - m_printTotalEdepCmd = new G4UIcommand( G4String( dirName + "printEdep" ).c_str(), this ); - m_printTotalEdepCmd->SetGuidance( G4String( "Print the total energy deposition from the detector " + name ).c_str() ); - - // Print energy deposition. - m_printVolumesCmd = new G4UIcommand( G4String( dirName + "printVolumes" ).c_str(), this ); - m_printVolumesCmd->SetGuidance( G4String( "Print a list of logical volume names associated with the detector " + name ).c_str() ); - - // Print energy deposition. - m_printHitsCmd = new G4UIcommand( G4String( dirName + "printHits" ).c_str(), this ); - m_printHitsCmd->SetGuidance( G4String( "Print a list of hits from the detector " + name ).c_str() ); - - // Set the verbosity. - m_verboseCmd = new G4UIcmdWithAnInteger( G4String( dirName + "setVerbose" ).c_str(), this ); - m_verboseCmd->SetGuidance( G4String( "Set the verbosity of the detector " + name ).c_str() ); - m_verboseCmd->SetDefaultValue( 2 ); - m_verboseCmd->SetParameterName( "verbose", true, true ); - - // Activate or deactive this detector. - m_activateCmd = new G4UIcmdWithABool( G4String( dirName + "setActive" ).c_str(), this ); - m_activateCmd->SetGuidance( G4String( "Set whether the detector " + name + " is active.").c_str() ); - m_activateCmd->SetDefaultValue( true ); - m_activateCmd->SetParameterName( "active", true, true ); - - // Set the ecut with unit. - m_ecutCmd = new G4UIcmdWithADoubleAndUnit( G4String( dirName + "setHitEnergyCut").c_str(), this); - m_ecutCmd->SetGuidance( G4String( "Set the single hit energy cut for detector " + name).c_str() ); - m_ecutCmd->SetDefaultValue( 0.0 ); - m_ecutCmd->SetDefaultUnit ( "GeV" ); - m_ecutCmd->SetParameterName( "cut", true, true );
+ // Create the sensitive detector's Geant4 macro command directory.
+ m_detectorDir = new G4UIdirectory(dirName.c_str());
+ m_detectorDir->SetGuidance(G4String("Commands for the sensitive detector " + name).c_str());
+
+ // Print command.
+ m_printInfoCmd = new G4UIcommand(G4String(dirName + "print").c_str(), this);
+ m_printInfoCmd->SetGuidance(G4String("Print basic information about the sensitive detector " + name).c_str());
+
+ // Print number of hits command.
+ m_printNHitsCmd = new G4UIcommand(G4String(dirName + "printNumberOfHits").c_str(), this);
+ m_printInfoCmd->SetGuidance(G4String("Print the number of hits from the detector " + name).c_str());
+
+ // Print energy deposition.
+ m_printTotalEdepCmd = new G4UIcommand(G4String(dirName + "printEdep").c_str(), this);
+ m_printTotalEdepCmd->SetGuidance(G4String("Print the total energy deposition from the detector " + name).c_str());
+
+ // Print energy deposition.
+ m_printVolumesCmd = new G4UIcommand(G4String(dirName + "printVolumes").c_str(), this);
+ m_printVolumesCmd->SetGuidance(G4String("Print a list of logical volume names associated with the detector " + name).c_str());
+
+ // Print energy deposition.
+ m_printHitsCmd = new G4UIcommand(G4String(dirName + "printHits").c_str(), this);
+ m_printHitsCmd->SetGuidance(G4String("Print a list of hits from the detector " + name).c_str());
+
+ // Set the verbosity.
+ m_verboseCmd = new G4UIcmdWithAnInteger(G4String(dirName + "setVerbose").c_str(), this);
+ m_verboseCmd->SetGuidance(G4String("Set the verbosity of the detector " + name).c_str());
+ m_verboseCmd->SetDefaultValue(2);
+ m_verboseCmd->SetParameterName("verbose", true, true);
+
+ // Activate or deactive this detector.
+ m_activateCmd = new G4UIcmdWithABool(G4String(dirName + "setActive").c_str(), this);
+ m_activateCmd->SetGuidance(G4String("Set whether the detector " + name + " is active.").c_str());
+ m_activateCmd->SetDefaultValue(true);
+ m_activateCmd->SetParameterName("active", true, true);
+
+ // Set the ecut with unit.
+ m_ecutCmd = new G4UIcmdWithADoubleAndUnit(G4String(dirName + "setHitEnergyCut").c_str(), this);
+ m_ecutCmd->SetGuidance(G4String("Set the single hit energy cut for detector " + name).c_str());
+ m_ecutCmd->SetDefaultValue(0.0);
+ m_ecutCmd->SetDefaultUnit("GeV");
+ m_ecutCmd->SetParameterName("cut", true, true);
}
diff -u -r1.3 -r1.4 --- StepReadout.cc 10 Oct 2007 22:38:10 -0000 1.3 +++ StepReadout.cc 24 Jun 2013 22:10:37 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/StepReadout.cc,v 1.3 2007/10/10 22:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/StepReadout.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
#include "StepReadout.hh" // LCDD
@@ -17,195 +17,197 @@
#include "G4Material.hh" #include "G4LogicalVolume.hh"
-StepReadout::StepReadout()
- : m_step(0)
-{}
+StepReadout::StepReadout() :
+ m_step(0)
+{
+}
StepReadout::~StepReadout()
-{}
+{
+}
-void StepReadout::setStep(G4Step* s)
+void StepReadout::setStep(G4Step* s)
{
- m_step = s;
+ m_step = s;
}
-G4Step* StepReadout::step() const
+G4Step* StepReadout::step() const
{
- return m_step; -}
+ return m_step; +}
-bool StepReadout::hasStep() const
+bool StepReadout::hasStep() const
{
- return ( 0 != m_step );
+ return (0 != m_step);
}
G4StepPoint* StepReadout::pre() const
{
- return step()->GetPreStepPoint();
+ return step()->GetPreStepPoint();
}
G4StepPoint* StepReadout::post() const
{
- return step()->GetPostStepPoint();
+ return step()->GetPostStepPoint();
}
-G4VPhysicalVolume* StepReadout::prePV() const
+G4VPhysicalVolume* StepReadout::prePV() const
{
- return preTouchableHandle()->GetVolume();
+ return preTouchableHandle()->GetVolume();
}
-G4VPhysicalVolume* StepReadout::postPV() const
+G4VPhysicalVolume* StepReadout::postPV() const
{
- return postTouchableHandle()->GetVolume();
+ return postTouchableHandle()->GetVolume();
}
G4VSolid* StepReadout::preSolid() const
{
- return preLV()->GetSolid();
+ return preLV()->GetSolid();
}
G4VSolid* StepReadout::postSolid() const
{
- return postLV()->GetSolid();
+ return postLV()->GetSolid();
}
G4LogicalVolume* StepReadout::preLV() const
{
- return prePV()->GetLogicalVolume();
+ return prePV()->GetLogicalVolume();
}
G4LogicalVolume* StepReadout::postLV() const
{
- return postPV()->GetLogicalVolume();
+ return postPV()->GetLogicalVolume();
}
G4Material* StepReadout::preMaterial() const
{
- return pre()->GetMaterial();
+ return pre()->GetMaterial();
}
G4Material* StepReadout::postMaterial() const
{
- return post()->GetMaterial();
+ return post()->GetMaterial();
}
-G4VSensitiveDetector* StepReadout::preSD() const
+G4VSensitiveDetector* StepReadout::preSD() const
{
- return getSD(pre());
+ return getSD(pre());
}
-G4VSensitiveDetector* StepReadout::postSD() const
+G4VSensitiveDetector* StepReadout::postSD() const
{
- return getSD(post());
+ return getSD(post());
}
G4VSensitiveDetector* StepReadout::getSD(G4StepPoint* stepPoint) const
{
- return stepPoint->GetPhysicalVolume()->GetLogicalVolume()->GetSensitiveDetector();
+ return stepPoint->GetPhysicalVolume()->GetLogicalVolume()->GetSensitiveDetector();
}
bool StepReadout::hasSameSD() const
{
- bool r = false;
+ bool r = false;
- // post vol has an SD
- if ( 0 != postSD() ) {
+ // post vol has an SD
+ if (0 != postSD()) {
- // post SD same as pre SD
- if ( preSD() == postSD() ) {
- r = true;
+ // post SD same as pre SD
+ if (preSD() == postSD()) {
+ r = true;
+ }
}
- }
- return r;
+ return r;
}
G4ThreeVector StepReadout::volumePosition(G4TouchableHandle theTouchable) const
{
- return theTouchable->GetHistory()->GetTopTransform().Inverse().TransformPoint( m_origin );
+ return theTouchable->GetHistory()->GetTopTransform().Inverse().TransformPoint(m_origin);
}
-G4ThreeVector StepReadout::preVolumePosition() const
+G4ThreeVector StepReadout::preVolumePosition() const
{
- return volumePosition( preTouchableHandle() );
+ return volumePosition(preTouchableHandle());
}
-G4ThreeVector StepReadout::postVolumePosition() const
+G4ThreeVector StepReadout::postVolumePosition() const
{
- return volumePosition( postTouchableHandle() );
+ return volumePosition(postTouchableHandle());
}
-double StepReadout::edep() const
+double StepReadout::edep() const
{
- return step()->GetTotalEnergyDeposit();
+ return step()->GetTotalEnergyDeposit();
}
-G4Track* StepReadout::track() const
+G4Track* StepReadout::track() const
{
- return step()->GetTrack();
+ return step()->GetTrack();
}
-double StepReadout::globalTime() const
+double StepReadout::globalTime() const
{
- return track()->GetGlobalTime();
+ return track()->GetGlobalTime();
}
-int StepReadout::trackID() const
+int StepReadout::trackID() const
{
- return track()->GetTrackID(); -}
+ return track()->GetTrackID(); +}
-G4ThreeVector StepReadout::momentum() const
+G4ThreeVector StepReadout::momentum() const
{
- return track()->GetMomentum();
+ return track()->GetMomentum();
}
-TrackInformation* StepReadout::trackInformation() const
+TrackInformation* StepReadout::trackInformation() const
{
- return TrackInformation::getTrackInformation( track() );
+ return TrackInformation::getTrackInformation(track());
}
-G4ThreeVector StepReadout::prePosition() const
+G4ThreeVector StepReadout::prePosition() const
{
- return pre()->GetPosition();
+ return pre()->GetPosition();
}
-G4ThreeVector StepReadout::midPosition() const
+G4ThreeVector StepReadout::midPosition() const
{
- return ReadoutUtil::computeThreeVectorMean( prePosition(), postPosition() );
+ return ReadoutUtil::computeThreeVectorMean(prePosition(), postPosition());
}
-G4ThreeVector StepReadout::postPosition() const
+G4ThreeVector StepReadout::postPosition() const
{
- return post()->GetPosition();
+ return post()->GetPosition();
}
G4ThreeVector StepReadout::preMomentum() const
{
- return pre()->GetMomentum();
+ return pre()->GetMomentum();
}
G4ThreeVector StepReadout::postMomentum() const
{
- return post()->GetMomentum();
+ return post()->GetMomentum();
}
G4ThreeVector StepReadout::meanMomentum() const
{
- return ReadoutUtil::computeThreeVectorMean( preMomentum(), postMomentum() );
+ return ReadoutUtil::computeThreeVectorMean(preMomentum(), postMomentum());
}
-G4TouchableHandle StepReadout::preTouchableHandle() const
+G4TouchableHandle StepReadout::preTouchableHandle() const
{
- return pre()->GetTouchableHandle();
+ return pre()->GetTouchableHandle();
}
-G4TouchableHandle StepReadout::postTouchableHandle() const
+G4TouchableHandle StepReadout::postTouchableHandle() const
{
- return post()->GetTouchableHandle();
+ return post()->GetTouchableHandle();
}
bool StepReadout::isGeantino()
{
- return ReadoutUtil::isGeantino(step());
+ return ReadoutUtil::isGeantino(step());
}
diff -u -r1.10 -r1.11 --- StringUtil.cc 17 May 2006 02:52:48 -0000 1.10 +++ StringUtil.cc 24 Jun 2013 22:10:37 -0000 1.11 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/StringUtil.cc,v 1.10 2006/05/17 02:52:48 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/StringUtil.cc,v 1.11 2013/06/24 22:10:37 jeremy Exp $
#include "StringUtil.hh"
@@ -8,10 +8,10 @@
#include <sstream> #include <vector>
-const std::string StringUtil::ALPHA_STR="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; -const std::string StringUtil::NUM_STR="1234567890"; -const std::string StringUtil::WS_STR="\x20\x09\x0A\x0B\x0C\x0D"; -const std::string StringUtil::NULL_STR="";
+const std::string StringUtil::ALPHA_STR = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; +const std::string StringUtil::NUM_STR = "1234567890"; +const std::string StringUtil::WS_STR = "\x20\x09\x0A\x0B\x0C\x0D"; +const std::string StringUtil::NULL_STR = "";
using std::string; using std::stringstream;
@@ -20,125 +20,124 @@
string StringUtil::toString(double d)
{
- stringstream ostr; - ostr << d; - return ostr.str();
+ stringstream ostr; + ostr << d; + return ostr.str();
}
string StringUtil::toString(float f)
{
- stringstream ostr; - ostr << f; - return ostr.str();
+ stringstream ostr; + ostr << f; + return ostr.str();
}
string StringUtil::toString(bool b)
{
- if ( b ) {
- return "1";
- }
+ if (b) {
+ return "1";
+ }
- return "0";
+ return "0";
}
string StringUtil::toString(int i)
{
- stringstream ostr; - ostr << i; - return ostr.str();
+ stringstream ostr; + ostr << i; + return ostr.str();
}
string& StringUtil::toLower(string& s)
{
- std::transform( s.begin(), s.end(), s.begin(), tolower ); - return s;
+ std::transform(s.begin(), s.end(), s.begin(), tolower); + return s;
}
string& StringUtil::toLower(const string& s)
{
- return StringUtil::toLower( const_cast<string&> ( s ) );
+ return StringUtil::toLower(const_cast<string&>(s));
}
double StringUtil::toDouble(string& s)
{
- std::istringstream is( s.c_str() ); - double d; - is >> d; - return d;
+ std::istringstream is(s.c_str()); + double d; + is >> d; + return d;
}
int StringUtil::toInt(string& s)
{
- std::istringstream is( s.c_str() ); - int i; - is >> i; - return i;
+ std::istringstream is(s.c_str()); + int i; + is >> i; + return i;
}
bool StringUtil::toBool(string& s)
{
- if ( StringUtil::toLower( s ) == "true" || s == "1" ) {
- return true;
- }
- else {
- return false;
- }
+ if (StringUtil::toLower(s) == "true" || s == "1") {
+ return true;
+ } else {
+ return false;
+ }
}
bool StringUtil::toBool(const string& s)
{
- return StringUtil::toBool( const_cast<string&> ( s ) );
+ return StringUtil::toBool(const_cast<string&>(s));
}
-double StringUtil::toDouble(const string& s) {
- return StringUtil::toDouble( const_cast<string&> ( s ) );
+double StringUtil::toDouble(const string& s)
+{
+ return StringUtil::toDouble(const_cast<string&>(s));
}
void StringUtil::trim(string& str)
{
- string::size_type pos = str.find_last_not_of(' ');
- if(pos != string::npos) {
- str.erase(pos + 1);
- pos = str.find_first_not_of(' ');
- if(pos != string::npos) str.erase(0, pos);
- }
- else str.erase(str.begin(), str.end());
+ string::size_type pos = str.find_last_not_of(' ');
+ if (pos != string::npos) {
+ str.erase(pos + 1);
+ pos = str.find_first_not_of(' ');
+ if (pos != string::npos)
+ str.erase(0, pos);
+ } else
+ str.erase(str.begin(), str.end());
}
string StringUtil::concatStrVec(const vector<string>& s_vec, const string& sep)
{
- string r;
+ string r;
- // concat w/ a space in between
- for ( vector<string>::const_iterator iter = s_vec.begin();
- iter != s_vec.end();
- iter++ ) {
- r += (*iter) + string( sep );
- }
+ // concat w/ a space in between
+ for (vector<string>::const_iterator iter = s_vec.begin(); iter != s_vec.end(); iter++) {
+ r += (*iter) + string(sep);
+ }
- // lop off dangling space - r.erase( r.end() - 1, r.end() );
+ // lop off dangling space + r.erase(r.end() - 1, r.end());
- return r;
+ return r;
}
void StringUtil::split(const string& str, const string& delimiters, vector<string>& tokens)
{
- // Skip delimiters at beginning. - string::size_type lastPos = str.find_first_not_of(delimiters, 0);
+ // Skip delimiters at beginning. + string::size_type lastPos = str.find_first_not_of(delimiters, 0);
- // Find first "non-delimiter". - string::size_type pos = str.find_first_of(delimiters, lastPos);
+ // Find first "non-delimiter". + string::size_type pos = str.find_first_of(delimiters, lastPos);
- while (string::npos != pos || string::npos != lastPos) {
+ while (string::npos != pos || string::npos != lastPos) {
- // Found a token, add it to the vector. - tokens.push_back(str.substr(lastPos, pos - lastPos));
+ // Found a token, add it to the vector. + tokens.push_back(str.substr(lastPos, pos - lastPos));
- // Skip delimiters. Note the "not_of" - lastPos = str.find_first_not_of(delimiters, pos);
+ // Skip delimiters. Note the "not_of" + lastPos = str.find_first_not_of(delimiters, pos);
- // Find next "non-delimiter" - pos = str.find_first_of(delimiters, lastPos); - }
+ // Find next "non-delimiter" + pos = str.find_first_of(delimiters, lastPos); + }
}
diff -u -r1.8 -r1.9 --- TrackInformation.cc 8 Mar 2005 06:31:36 -0000 1.8 +++ TrackInformation.cc 24 Jun 2013 22:10:37 -0000 1.9 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/TrackInformation.cc,v 1.8 2005/03/08 06:31:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/TrackInformation.cc,v 1.9 2013/06/24 22:10:37 jeremy Exp $
#include "TrackInformation.hh"
@@ -6,78 +6,76 @@
TrackInformation::TrackInformation()
{
- setDefaults();
+ setDefaults();
}
TrackInformation::TrackInformation(const G4Track* aTrack)
{
- setDefaults();
+ setDefaults();
- m_originalTrackID = aTrack->GetTrackID();
+ m_originalTrackID = aTrack->GetTrackID();
}
TrackInformation::TrackInformation(const TrackInformation* aTrackInfo)
{
- assert( aTrackInfo );
+ assert(aTrackInfo);
- setFromTrackInformation( aTrackInfo, this );
+ setFromTrackInformation(aTrackInfo, this);
}
-
+
TrackInformation::~TrackInformation()
-{}
-
+{
+}
+
TrackInformation& TrackInformation::operator =(const TrackInformation& right)
{
- setFromTrackInformation( &right, this ); - return *this;
+ setFromTrackInformation(&right, this); + return *this;
}
-void TrackInformation::setDefaults()
+void TrackInformation::setDefaults()
{
- // default to invalid trackID - m_originalTrackID = -1;
+ // default to invalid trackID + m_originalTrackID = -1;
- // default to tracking region in both current and orig - m_originalTrackingStatus = TrackInformation::eInTrackingRegion; - m_trackingStatus = TrackInformation::eInTrackingRegion;
+ // default to tracking region in both current and orig + m_originalTrackingStatus = TrackInformation::eInTrackingRegion; + m_trackingStatus = TrackInformation::eInTrackingRegion;
- // default flag vals - m_hasTrackerHit = false; - m_vertexIsNotEndpointOfParent = false; - m_backscatter = false; - m_belowThreshold = false;
+ // default flag vals + m_hasTrackerHit = false; + m_vertexIsNotEndpointOfParent = false; + m_backscatter = false; + m_belowThreshold = false;
}
-void TrackInformation::setFromTrackInformation(const TrackInformation* srcTrkInfo, - TrackInformation* trgtTrkInfo)
+void TrackInformation::setFromTrackInformation(const TrackInformation* srcTrkInfo, TrackInformation* trgtTrkInfo)
{
- trgtTrkInfo->setTrackID( srcTrkInfo->m_originalTrackID );
+ trgtTrkInfo->setTrackID(srcTrkInfo->m_originalTrackID);
- trgtTrkInfo->setOriginalTrackingStatus( srcTrkInfo->m_originalTrackingStatus ); - trgtTrkInfo->setTrackingStatus( srcTrkInfo->m_trackingStatus );
+ trgtTrkInfo->setOriginalTrackingStatus(srcTrkInfo->m_originalTrackingStatus); + trgtTrkInfo->setTrackingStatus(srcTrkInfo->m_trackingStatus);
- trgtTrkInfo->setHasTrackerHit( false ); - trgtTrkInfo->setVertexIsNotEndpointOfParent( false ); - trgtTrkInfo->setBackscatter( srcTrkInfo->getBackscatter() ); - trgtTrkInfo->setBelowThreshold( srcTrkInfo->getBelowThreshold() );
+ trgtTrkInfo->setHasTrackerHit(false); + trgtTrkInfo->setVertexIsNotEndpointOfParent(false); + trgtTrkInfo->setBackscatter(srcTrkInfo->getBackscatter()); + trgtTrkInfo->setBelowThreshold(srcTrkInfo->getBelowThreshold());
}
const std::string& TrackInformation::getTrackingStatusString(ETrackingStatus ts)
{
- static const std::string str_none = "None";
- static const std::string str_tracking = "InTrackingRegion";
- static const std::string str_nontracking = "InNontrackingRegion";
- static const std::string str_invalid = "Invalid";
-
- if ( ts == eNone ) {
- return str_none;
- }
- else if ( ts == eInTrackingRegion ) {
- return str_tracking;
- }
- else if ( ts == eInNontrackingRegion ) {
- return str_nontracking;
- }
+ static const std::string str_none = "None";
+ static const std::string str_tracking = "InTrackingRegion";
+ static const std::string str_nontracking = "InNontrackingRegion";
+ static const std::string str_invalid = "Invalid";
+
+ if (ts == eNone) {
+ return str_none;
+ } else if (ts == eInTrackingRegion) {
+ return str_tracking;
+ } else if (ts == eInNontrackingRegion) {
+ return str_nontracking;
+ }
- return str_invalid;
+ return str_invalid;
}
diff -u -r1.6 -r1.7 --- authorProcess.cc 5 Jun 2006 17:41:29 -0000 1.6 +++ authorProcess.cc 24 Jun 2013 22:10:37 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/authorProcess.cc,v 1.6 2006/06/05 17:41:29 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/authorProcess.cc,v 1.7 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -13,56 +13,59 @@
#include <iostream> /**
- @class authorProcess - @brief SAX process for author element. -*/ -class authorProcess : public SAXStateProcess
+ * @brief SAX process for author element. + */ +class authorProcess: public SAXStateProcess
{
public:
- authorProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
- virtual ~authorProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "authorProcess::StartElement" << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- author* a = new author;
-
- a->set_name( attrs.getValue( "name" ) );
- a->set_email( attrs.getValue( "email" ) );
-
- m_obj = a;
- *obj = a;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "author";
- return tag;
- }
+ authorProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+ virtual ~authorProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "authorProcess::StartElement" << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ author* a = new author;
+
+ a->set_name(attrs.getValue("name"));
+ a->set_email(attrs.getValue("email"));
+
+ m_obj = a;
+ *obj = a;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "author";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(authorProcess)
diff -u -r1.1 -r1.2 --- box_dipoleProcess.cc 23 Jun 2011 21:04:10 -0000 1.1 +++ box_dipoleProcess.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -11,55 +11,59 @@
#include <iostream>
-class box_dipoleProcess : public FieldTypeProcess
+class box_dipoleProcess: public FieldTypeProcess
{
- public:
+public:
- box_dipoleProcess(const ProcessingContext* context = 0)
- : FieldTypeProcess(context)
- {}
-
- virtual ~box_dipoleProcess()
- {}
-
- void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
-
- box_dipole* x = new box_dipole;
-
- x->set_x(attrs.getValue("x"));
- x->set_y(attrs.getValue("y"));
- x->set_z(attrs.getValue("z"));
- x->set_dx(attrs.getValue("dx"));
- x->set_dy(attrs.getValue("dy"));
- x->set_dz(attrs.getValue("dz"));
- x->set_bx(attrs.getValue("bx"));
- x->set_by(attrs.getValue("by"));
- x->set_bz(attrs.getValue("bz"));
-
- m_obj = x;
- *obj = x;
-
- FieldTypeProcess::StartElement(name, attrs);
- }
-
- void EndElement(const std::string&)
- {}
-
- void Characters(const std::string&)
- {}
-
- void StackPopNotify(const std::string&)
- {}
-
- const std::string& State() const
- {
- static std::string tag = "box_dipole";
- return tag;
- }
+ box_dipoleProcess(const ProcessingContext* context = 0) :
+ FieldTypeProcess(context)
+ {
+ }
+
+ virtual ~box_dipoleProcess()
+ {
+ }
+
+ void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ box_dipole* x = new box_dipole;
+
+ x->set_x(attrs.getValue("x"));
+ x->set_y(attrs.getValue("y"));
+ x->set_z(attrs.getValue("z"));
+ x->set_dx(attrs.getValue("dx"));
+ x->set_dy(attrs.getValue("dy"));
+ x->set_dz(attrs.getValue("dz"));
+ x->set_bx(attrs.getValue("bx"));
+ x->set_by(attrs.getValue("by"));
+ x->set_bz(attrs.getValue("bz"));
+
+ m_obj = x;
+ *obj = x;
+
+ FieldTypeProcess::StartElement(name, attrs);
+ }
+
+ void EndElement(const std::string&)
+ {
+ }
+
+ void Characters(const std::string&)
+ {
+ }
+
+ void StackPopNotify(const std::string&)
+ {
+ }
+
+ const std::string& State() const
+ {
+ static std::string tag = "box_dipole";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(box_dipoleProcess)
-
diff -u -r1.1 -r1.2 --- box_dipoleSubscriber.cc 23 Jun 2011 21:04:10 -0000 1.1 +++ box_dipoleSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -11,82 +11,82 @@
// element #include "box_dipole.hh"
-class box_dipoleSubscriber : virtual public SAXSubscriber
+class box_dipoleSubscriber: virtual public SAXSubscriber
{
- public:
+public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
- public:
+public:
- box_dipoleSubscriber()
- {
- Subscribe("box_dipole");
- }
+ box_dipoleSubscriber()
+ {
+ Subscribe("box_dipole");
+ }
+
+ virtual ~box_dipoleSubscriber()
+ {
+ }
+
+ virtual void Activate(const SAXObject* object)
+ {
+ GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
+
+ if (object != 0) {
+ const box_dipole* dipoleElement = dynamic_cast<const box_dipole*>(object);
+
+ double x, y, z, dx, dy, dz, bx, by, bz;
+ x = y = z = dx = dy = dz = bx = by = bz = 0;
+
+ std::string lunit = dipoleElement->get_lunit();
+ std::string funit = dipoleElement->get_funit();
+
+ std::string val = dipoleElement->get_x();
+ val += "*" + lunit;
+ x = calc->Eval(val);
+
+ val = dipoleElement->get_y();
+ val += "*" + lunit;
+ y = calc->Eval(val);
+
+ val = dipoleElement->get_z();
+ val += "*" + lunit;
+ z = calc->Eval(val);
+
+ val = dipoleElement->get_dx();
+ val += "*" + lunit;
+ dx = calc->Eval(val);
+
+ val = dipoleElement->get_dy();
+ val += "*" + lunit;
+ dy = calc->Eval(val);
+
+ val = dipoleElement->get_dz();
+ val += "*" + lunit;
+ dz = calc->Eval(val);
+
+ val = dipoleElement->get_bx();
+ val += "*" + funit;
+ bx = calc->Eval(val);
+
+ val = dipoleElement->get_by();
+ val += "*" + funit;
+ by = calc->Eval(val);
+
+ val = dipoleElement->get_bz();
+ val += "*" + funit;
+ bz = calc->Eval(val);
- virtual ~box_dipoleSubscriber()
- {}
+ G4BoxDipole* boxDipole = new G4BoxDipole(x, y, z, dx, dy, dz, bx, by, bz);
- virtual void Activate(const SAXObject* object)
- {
- GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
-
- if (object != 0)
- {
- const box_dipole* dipoleElement = dynamic_cast<const box_dipole*>(object);
-
- double x, y, z, dx, dy, dz, bx, by, bz;
- x = y = z = dx = dy = dz = bx = by = bz = 0;
-
- std::string lunit = dipoleElement->get_lunit();
- std::string funit = dipoleElement->get_funit();
-
- std::string val = dipoleElement->get_x();
- val += "*" + lunit;
- x = calc->Eval(val);
-
- val = dipoleElement->get_y();
- val += "*" + lunit;
- y = calc->Eval(val);
-
- val = dipoleElement->get_z();
- val += "*" + lunit;
- z = calc->Eval(val);
-
- val = dipoleElement->get_dx();
- val += "*" + lunit;
- dx = calc->Eval(val);
-
- val = dipoleElement->get_dy();
- val += "*" + lunit;
- dy = calc->Eval(val);
-
- val = dipoleElement->get_dz();
- val += "*" + lunit;
- dz = calc->Eval(val);
-
- val = dipoleElement->get_bx();
- val += "*" + funit;
- bx = calc->Eval(val);
-
- val = dipoleElement->get_by();
- val += "*" + funit;
- by = calc->Eval(val);
-
- val = dipoleElement->get_bz();
- val += "*" + funit;
- bz = calc->Eval(val);
-
- G4BoxDipole* boxDipole = new G4BoxDipole(x, y, z, dx, dy, dz, bx, by, bz);
-
- std::string fieldName = dipoleElement->get_name();
- LCDDProcessor::instance()->addMagneticField(fieldName, boxDipole);
- }
+ std::string fieldName = dipoleElement->get_name(); + LCDDProcessor::instance()->addMagneticField(fieldName, boxDipole);
}
+ }
}; DECLARE_SUBSCRIBER_FACTORY(box_dipoleSubscriber)
diff -u -r1.7 -r1.8 --- calorimeterProcess.cc 5 Jul 2007 22:27:36 -0000 1.7 +++ calorimeterProcess.cc 24 Jun 2013 22:10:37 -0000 1.8 @@ -1,48 +1,52 @@
-// $Header: /cvs/lcd/lcdd/src/calorimeterProcess.cc,v 1.7 2007/07/05 22:27:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/calorimeterProcess.cc,v 1.8 2013/06/24 22:10:37 jeremy Exp $
#include "calorimeterProcess.hh" /**
- @class calorimeterProcess
- @brief SAX process for calorimeter element.
- @note Calls SAX processor for SensitiveDetectorTypeProcess parent class.
-*/
-calorimeterProcess::calorimeterProcess(const ProcessingContext* context)
- : SensitiveDetectorTypeProcess(context)
-{}
+ @class calorimeterProcess
+ @brief SAX process for calorimeter element.
+ @note Calls SAX processor for SensitiveDetectorTypeProcess parent class.
+ */
+calorimeterProcess::calorimeterProcess(const ProcessingContext* context) :
+ SensitiveDetectorTypeProcess(context)
+{
+}
calorimeterProcess::~calorimeterProcess()
-{}
+{
+}
void calorimeterProcess::StartElement(const std::string& name, const ASCIIAttributeList& attrs)
{
- SAXObject** obj = Context()->GetTopObject(); - calorimeter* cal = new calorimeter; - - cal->set_compare( attrs.getValue( "hit_aggregation" ) ); - - m_obj = cal; - *obj = cal; - - // parent type to set name and hitsCollectionName - SensitiveDetectorTypeProcess::StartElement(name, attrs);
+ SAXObject** obj = Context()->GetTopObject();
+ calorimeter* cal = new calorimeter;
+
+ cal->set_compare(attrs.getValue("hit_aggregation"));
+
+ m_obj = cal;
+ *obj = cal;
+
+ // parent type to set name and hitsCollectionName
+ SensitiveDetectorTypeProcess::StartElement(name, attrs);
} void calorimeterProcess::EndElement(const std::string&)
-{}
+{
+}
void calorimeterProcess::Characters(const std::string&)
-{}
+{
+}
void calorimeterProcess::StackPopNotify(const std::string& name)
{
- SensitiveDetectorTypeProcess::StackPopNotify(name);
+ SensitiveDetectorTypeProcess::StackPopNotify(name);
}
const std::string& calorimeterProcess::State() const
{
- static std::string tag = "calorimeter"; - return tag;
+ static std::string tag = "calorimeter"; + return tag;
} DECLARE_PROCESS_FACTORY(calorimeterProcess)
diff -u -r1.1 -r1.2 --- cell_readout_2dProcess.cc 30 May 2013 00:04:12 -0000 1.1 +++ cell_readout_2dProcess.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/cell_readout_2dProcess.cc,v 1.1 2013/05/30 00:04:12 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/cell_readout_2dProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
// GDML #include "Saxana/ProcessingConfigurator.h"
@@ -20,8 +20,8 @@
public:
- cell_readout_2dProcess(const ProcessingContext* context = 0) - : SAXStateProcess(context), m_obj(0)
+ cell_readout_2dProcess(const ProcessingContext* context = 0) : + SAXStateProcess(context), m_obj(0)
{
}
diff -u -r1.4 -r1.5 --- colorProcess.cc 4 Mar 2005 22:51:13 -0000 1.4 +++ colorProcess.cc 24 Jun 2013 22:10:37 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/colorProcess.cc,v 1.4 2005/03/04 22:51:13 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/colorProcess.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h" #include "Saxana/SAXProcessor.h"
@@ -12,61 +12,65 @@
#include <iostream> /**
- @class colorProcess - @brief SAX process for color element. -*/ -class colorProcess : public SAXStateProcess
+ @class colorProcess + @brief SAX process for color element. + */ +class colorProcess: public SAXStateProcess
{
public:
- colorProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~colorProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "color::StartElement()" << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- color* c = new color;
-
- c->set_R( attrs.getValue("R") );
- c->set_G( attrs.getValue("G") );
- c->set_B( attrs.getValue("B") );
- c->set_alpha( attrs.getValue("alpha" ) );
-
- m_obj = c;
- *obj = c;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "color";
- return tag;
- }
+ colorProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~colorProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "color::StartElement()" << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ color* c = new color;
+
+ c->set_R(attrs.getValue("R"));
+ c->set_G(attrs.getValue("G"));
+ c->set_B(attrs.getValue("B"));
+ c->set_alpha(attrs.getValue("alpha"));
+
+ m_obj = c;
+ *obj = c;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "color";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(colorProcess)
diff -u -r1.5 -r1.6 --- commentProcess.cc 5 Jun 2006 17:41:29 -0000 1.5 +++ commentProcess.cc 24 Jun 2013 22:10:37 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/commentProcess.cc,v 1.5 2006/06/05 17:41:29 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/commentProcess.cc,v 1.6 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -13,57 +13,60 @@
#include <iostream> /**
- @class commentProcess - @brief SAX process for comment element. -*/ -class commentProcess : public SAXStateProcess
+ @class commentProcess + @brief SAX process for comment element. + */ +class commentProcess: public SAXStateProcess
{
public:
- commentProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
- virtual ~commentProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList&)
- {
- //std::cout << "commentProcess::StartElement" << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- comment* c = new comment;
-
- m_obj = c;
- *obj = c;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string& cdata)
- {
- //std::cout << "commentProcess::Characters() - <" << cdata << ">" << std::endl;
- comment* c = dynamic_cast<comment*> ( m_obj );
- c->set_comment( cdata );
- }
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "comment";
- return tag;
- }
+ commentProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+ virtual ~commentProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList&)
+ {
+ //std::cout << "commentProcess::StartElement" << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ comment* c = new comment;
+
+ m_obj = c;
+ *obj = c;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string& cdata)
+ {
+ //std::cout << "commentProcess::Characters() - <" << cdata << ">" << std::endl;
+ comment* c = dynamic_cast<comment*>(m_obj);
+ c->set_comment(cdata);
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "comment";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(commentProcess)
diff -u -r1.5 -r1.6 --- detectorProcess.cc 5 Jun 2006 17:41:29 -0000 1.5 +++ detectorProcess.cc 24 Jun 2013 22:10:37 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/detectorProcess.cc,v 1.5 2006/06/05 17:41:29 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/detectorProcess.cc,v 1.6 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -13,58 +13,62 @@
#include <iostream> /**
- @class detectorProcess - @brief SAX process for detector element. -*/ -class detectorProcess : public SAXStateProcess
+ @class detectorProcess + @brief SAX process for detector element. + */ +class detectorProcess: public SAXStateProcess
{
public:
- detectorProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~detectorProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "detectorProcess::StartElement" << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- detector* d = new detector;
-
- d->set_name( attrs.getValue( "name" ) );
- d->set_version( attrs.getValue( "version" ) );
- d->set_url( attrs.getValue( "url" ) );
-
- m_obj = d;
- *obj = d;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "detector";
- return tag;
- }
+ detectorProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~detectorProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "detectorProcess::StartElement" << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ detector* d = new detector;
+
+ d->set_name(attrs.getValue("name"));
+ d->set_version(attrs.getValue("version"));
+ d->set_url(attrs.getValue("url"));
+
+ m_obj = d;
+ *obj = d;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "detector";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(detectorProcess)
diff -u -r1.3 -r1.4 --- dipoleProcess.cc 5 Jun 2006 17:41:30 -0000 1.3 +++ dipoleProcess.cc 24 Jun 2013 22:10:37 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/dipoleProcess.cc,v 1.3 2006/06/05 17:41:30 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/dipoleProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
// gdml #include "Saxana/ProcessingConfigurator.h"
@@ -15,60 +15,63 @@
* @class dipoleProcess * @brief SAX process for the dipole element. */
-class dipoleProcess : public SAXStateProcess
+class dipoleProcess: public SAXStateProcess
{
public:
- dipoleProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~dipoleProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
-
- dipole* d = new dipole;
- d->set_name(attrs.getValue("name"));
- d->set_lunit(attrs.getValue("lunit"));
- d->set_funit(attrs.getValue("funit"));
- d->set_zmax(attrs.getValue("zmax"));
- d->set_zmin(attrs.getValue("zmin"));
- d->set_rmax(attrs.getValue("rmax"));
-
- m_obj = d;
- *obj = d;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string& name)
- {
- SAXObject** so = Context()->GetTopObject();
- dipole* d = dynamic_cast<dipole*>(m_obj);
- d->add_content(name,*so);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "dipole";
- return tag;
- }
+ dipoleProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~dipoleProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ dipole* d = new dipole;
+ d->set_name(attrs.getValue("name"));
+ d->set_lunit(attrs.getValue("lunit"));
+ d->set_funit(attrs.getValue("funit"));
+ d->set_zmax(attrs.getValue("zmax"));
+ d->set_zmin(attrs.getValue("zmin"));
+ d->set_rmax(attrs.getValue("rmax"));
+
+ m_obj = d;
+ *obj = d;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string& name)
+ {
+ SAXObject** so = Context()->GetTopObject();
+ dipole* d = dynamic_cast<dipole*>(m_obj);
+ d->add_content(name, *so);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "dipole";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(dipoleProcess)
diff -u -r1.4 -r1.5 --- dipoleSubscriber.cc 1 Aug 2006 23:52:08 -0000 1.4 +++ dipoleSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/dipoleSubscriber.cc,v 1.4 2006/08/01 23:52:08 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/dipoleSubscriber.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/SAXSubscriber.h" #include "Saxana/SAXComponentFactory.h"
@@ -19,89 +19,89 @@
* @class dipoleSubscriber * @brief Creates G4Dipole objects from dipole elements. */
-class dipoleSubscriber : virtual public SAXSubscriber
+class dipoleSubscriber: virtual public SAXSubscriber
{
public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- dipoleSubscriber()
- {
- Subscribe("dipole");
- }
-
- virtual ~dipoleSubscriber()
- {}
-
- virtual void Activate(const SAXObject* object)
- {
- GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
-
- if (object) {
- const dipole* d = dynamic_cast<const dipole*>(object);
-
- if (d) {
- double zmin, zmax, rmax;
-
- std::string lunit = d->get_lunit();
- std::string funit = d->get_funit();
-
- // Evaluate zmin with lunit.
- std::string sval = d->get_zmin();
- sval += "*" + lunit;
- zmin = calc->Eval(sval);
-
- // Evaluate zmax with lunit.
- sval = d->get_zmax();
- sval += "*" + lunit;
- zmax = calc->Eval(sval);
-
- // Evaluate rmax with lunit.
- sval = d->get_rmax();
- sval += "*" + lunit;
- rmax = calc->Eval(sval);
-
- // Create the Geant4 dipole object.
- G4Dipole* g4d = new G4Dipole();
-
- // Set the field unit's value.
- g4d->setFieldUnit(calc->Eval(funit));
-
- // Set the length unit's value.
- g4d->setLengthUnit(calc->Eval(lunit));
-
- // Set zmin and zmax.
- g4d->setZMax(zmax);
- g4d->setZMin(zmin);
- g4d->setRMax(rmax);
-
- // Add the dipole coefficients.
- ContentSequence* seq = const_cast<ContentSequence*> (d->get_content());
- size_t count = seq->size();
- for(size_t i=0; i<count; i++) {
- const ContentGroup::ContentItem& elem = seq->content(i);
- if (elem.tag == "dipole_coeff") {
- dipole_coeff* coeff = dynamic_cast<dipole_coeff*>(elem.object);
- g4d->addCoeff(calc->Eval(coeff->get_value()));
- }
- else {
- std::cerr << "dipoleSubscriber :: Activate - The child element " << elem.tag << " is not a dipole_coeff!" << std::endl;
- }
- }
-
- // Add the G4Dipole to the magnetic field store.
- std::string field_name = d->get_name();
- LCDDProcessor::instance()->addMagneticField(field_name, g4d);
- }
- else {
- std::cerr << "dipoleSubscriber :: Activate - Failed cast to dipole!" << std::endl;
- }
+ dipoleSubscriber()
+ {
+ Subscribe("dipole");
+ }
+
+ virtual ~dipoleSubscriber()
+ {
+ }
+
+ virtual void Activate(const SAXObject* object)
+ {
+ GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
+
+ if (object) {
+ const dipole* d = dynamic_cast<const dipole*>(object);
+
+ if (d) {
+ double zmin, zmax, rmax;
+
+ std::string lunit = d->get_lunit();
+ std::string funit = d->get_funit();
+
+ // Evaluate zmin with lunit.
+ std::string sval = d->get_zmin();
+ sval += "*" + lunit;
+ zmin = calc->Eval(sval);
+
+ // Evaluate zmax with lunit.
+ sval = d->get_zmax();
+ sval += "*" + lunit;
+ zmax = calc->Eval(sval);
+
+ // Evaluate rmax with lunit.
+ sval = d->get_rmax();
+ sval += "*" + lunit;
+ rmax = calc->Eval(sval);
+
+ // Create the Geant4 dipole object.
+ G4Dipole* g4d = new G4Dipole();
+
+ // Set the field unit's value.
+ g4d->setFieldUnit(calc->Eval(funit));
+
+ // Set the length unit's value.
+ g4d->setLengthUnit(calc->Eval(lunit));
+
+ // Set zmin and zmax.
+ g4d->setZMax(zmax);
+ g4d->setZMin(zmin);
+ g4d->setRMax(rmax);
+
+ // Add the dipole coefficients.
+ ContentSequence* seq = const_cast<ContentSequence*>(d->get_content());
+ size_t count = seq->size();
+ for (size_t i = 0; i < count; i++) {
+ const ContentGroup::ContentItem& elem = seq->content(i);
+ if (elem.tag == "dipole_coeff") {
+ dipole_coeff* coeff = dynamic_cast<dipole_coeff*>(elem.object);
+ g4d->addCoeff(calc->Eval(coeff->get_value()));
+ } else {
+ std::cerr << "dipoleSubscriber :: Activate - The child element " << elem.tag << " is not a dipole_coeff!" << std::endl;
+ }
+ }
+
+ // Add the G4Dipole to the magnetic field store.
+ std::string field_name = d->get_name();
+ LCDDProcessor::instance()->addMagneticField(field_name, g4d);
+ } else {
+ std::cerr << "dipoleSubscriber :: Activate - Failed cast to dipole!" << std::endl;
+ }
+ }
}
- };
+ ;
}; DECLARE_SUBSCRIBER_FACTORY(dipoleSubscriber)
diff -u -r1.1 -r1.2 --- dipole_coeffProcess.cc 21 Apr 2006 23:51:07 -0000 1.1 +++ dipole_coeffProcess.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/dipole_coeffProcess.cc,v 1.1 2006/04/21 23:51:07 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/dipole_coeffProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
// GDML #include "Saxana/ProcessingConfigurator.h"
@@ -19,52 +19,56 @@
* @class dipole_coeffProcess * @brief SAX process to create the dipole_coeff element. */
-class dipole_coeffProcess : public SAXStateProcess
+class dipole_coeffProcess: public SAXStateProcess
{
public:
- dipole_coeffProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~dipole_coeffProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
-
- dipole_coeff* dpc = new dipole_coeff;
-
- dpc->set_value( attrs.getValue( "value" ) );
-
- m_obj = dpc;
- *obj = dpc;
- }
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "dipole_coeff";
- return tag;
- }
+ dipole_coeffProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~dipole_coeffProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ dipole_coeff* dpc = new dipole_coeff;
+
+ dpc->set_value(attrs.getValue("value"));
+
+ m_obj = dpc;
+ *obj = dpc;
+ }
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "dipole_coeff";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(dipole_coeffProcess)
diff -u -r1.3 -r1.4 --- field_map_3dProcess.cc 3 Oct 2012 17:53:01 -0000 1.3 +++ field_map_3dProcess.cc 24 Jun 2013 22:10:37 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/field_map_3dProcess.cc,v 1.3 2012/10/03 17:53:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/field_map_3dProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
#include "FieldMapTypeProcess.hh" #include <iostream>
@@ -9,24 +9,28 @@
* @class * @brief */
-class field_map_3dProcess : public FieldMapTypeProcess {
+class field_map_3dProcess: public FieldMapTypeProcess
+{
public:
- field_map_3dProcess(const ProcessingContext* context = 0)
- : FieldMapTypeProcess(context) {
- }
+ field_map_3dProcess(const ProcessingContext* context = 0) :
+ FieldMapTypeProcess(context)
+ {
+ }
- virtual ~field_map_3dProcess() {
+ virtual ~field_map_3dProcess()
+ {
}
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs) {
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
- SAXObject** obj = Context()->GetTopObject();
+ SAXObject** obj = Context()->GetTopObject();
- field_map_3d* fmap = new field_map_3d;
+ field_map_3d* fmap = new field_map_3d;
- fmap->set_filename(attrs.getValue("filename"));
+ fmap->set_filename(attrs.getValue("filename"));
// Top-level caller needs to setup the SAXObject references.
m_obj = fmap;
@@ -36,18 +40,22 @@
FieldMapTypeProcess::StartElement(name, attrs);
}
- 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 << "field_map_3d::StackPopNotify" << std::endl;
FieldMapTypeProcess::StackPopNotify(name);
}
- virtual const std::string& State() const {
+ virtual const std::string& State() const
+ {
static std::string tag = "field_map_3d";
return tag;
}
diff -u -r1.2 -r1.3 --- field_map_3dSubscriber.cc 3 Oct 2012 17:53:01 -0000 1.2 +++ field_map_3dSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/field_map_3dSubscriber.cc,v 1.2 2012/10/03 17:53:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/field_map_3dSubscriber.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
// gdml #include "Saxana/SAXSubscriber.h"
@@ -16,48 +16,53 @@
* @class * @brief */
-class field_map_3dSubscriber: virtual public SAXSubscriber {
+class field_map_3dSubscriber: virtual public SAXSubscriber
+{
public:
- virtual const SAXComponentObject* Build() const {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- field_map_3dSubscriber() {
- Subscribe("field_map_3d");
- }
+ field_map_3dSubscriber()
+ {
+ Subscribe("field_map_3d");
+ }
- virtual ~field_map_3dSubscriber() {
- }
+ virtual ~field_map_3dSubscriber()
+ {
+ }
- virtual void Activate(const SAXObject* object) {
+ virtual void Activate(const SAXObject* object)
+ {
- //std::cout << "field_map_3d::Subscriber" << std::endl;
+ //std::cout << "field_map_3d::Subscriber" << std::endl;
- const field_map_3d* obj = dynamic_cast<const field_map_3d*>(object);
+ const field_map_3d* obj = dynamic_cast<const field_map_3d*>(object);
- if (object != 0) {
+ if (object != 0) {
- if (obj) {
+ if (obj) {
- if (obj) {
+ if (obj) {
- //GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator(); - //std::string lunit = obj->get_lunit(); - //std::string funit = obj->get_funit();
+ //GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator(); + //std::string lunit = obj->get_lunit(); + //std::string funit = obj->get_funit();
- std::string name = obj->get_name(); - std::string field_name = obj->get_filename();
+ std::string name = obj->get_name(); + std::string field_name = obj->get_filename();
- Cartesian3DMagneticFieldMap* fmap = new Cartesian3DMagneticFieldMap(field_name.c_str(), 0, 0, 0); - LCDDProcessor::instance()->addMagneticField(name, fmap); - } - } - } - }
+ Cartesian3DMagneticFieldMap* fmap = new Cartesian3DMagneticFieldMap(field_name.c_str(), 0, 0, 0); + LCDDProcessor::instance()->addMagneticField(name, fmap); + } + } + } + }
}; DECLARE_SUBSCRIBER_FACTORY(field_map_3dSubscriber)
diff -u -r1.5 -r1.6 --- fieldrefProcess.cc 5 Jun 2006 17:41:30 -0000 1.5 +++ fieldrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.6 @@ -1,46 +1,47 @@
-// $Header: /cvs/lcd/lcdd/src/fieldrefProcess.cc,v 1.5 2006/06/05 17:41:30 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/fieldrefProcess.cc,v 1.6 2013/06/24 22:10:37 jeremy Exp $
#include "Processes/ReferenceTypeProcess.h" #include "FieldType.hh" /**
- @class fieldrefProcess - @brief SAX process for fieldref element. -*/ -class fieldrefProcess : public ReferenceTypeProcess
+ @class fieldrefProcess + @brief SAX process for fieldref element. + */ +class fieldrefProcess: public ReferenceTypeProcess
{
public:
- fieldrefProcess(const ProcessingContext* context = 0)
- : ReferenceTypeProcess(context)
- {}
-
- virtual ~fieldrefProcess()
- {}
-
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
-
- FieldType::fieldref* fref =
- new FieldType::fieldref;
-
- *obj = fref;
- m_obj = fref;
-
- ReferenceTypeProcess::StartElement(name, attrs);
- }
-
- virtual void EndElement(const std::string& name)
- {
- ReferenceTypeProcess::EndElement(name);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "fieldref";
- return tag;
- }
+ fieldrefProcess(const ProcessingContext* context = 0) :
+ ReferenceTypeProcess(context)
+ {
+ }
+
+ virtual ~fieldrefProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ FieldType::fieldref* fref = new FieldType::fieldref;
+
+ *obj = fref;
+ m_obj = fref;
+
+ ReferenceTypeProcess::StartElement(name, attrs);
+ }
+
+ virtual void EndElement(const std::string& name)
+ {
+ ReferenceTypeProcess::EndElement(name);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "fieldref";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(fieldrefProcess)
diff -u -r1.6 -r1.7 --- generatorProcess.cc 5 Jun 2006 17:41:30 -0000 1.6 +++ generatorProcess.cc 24 Jun 2013 22:10:37 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/generatorProcess.cc,v 1.6 2006/06/05 17:41:30 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/generatorProcess.cc,v 1.7 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -13,59 +13,63 @@
#include <iostream> /**
- @class generatorProcess - @brief SAX process for generator element. -*/ -class generatorProcess : public SAXStateProcess
+ @class generatorProcess + @brief SAX process for generator element. + */ +class generatorProcess: public SAXStateProcess
{
public:
- generatorProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~generatorProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "generatorProcess::StartElement" << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- generator* g = new generator;
-
- g->set_name( attrs.getValue( "name" ) );
- g->set_version( attrs.getValue( "version" ) );
- g->set_file( attrs.getValue( "file" ) );
- g->set_checksum( attrs.getValue( "checksum" ) );
-
- m_obj = g;
- *obj = g;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "generator";
- return tag;
- }
+ generatorProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~generatorProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "generatorProcess::StartElement" << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ generator* g = new generator;
+
+ g->set_name(attrs.getValue("name"));
+ g->set_version(attrs.getValue("version"));
+ g->set_file(attrs.getValue("file"));
+ g->set_checksum(attrs.getValue("checksum"));
+
+ m_obj = g;
+ *obj = g;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "generator";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(generatorProcess)
diff -u -r1.3 -r1.4 --- global_fieldProcess.cc 4 May 2006 20:48:45 -0000 1.3 +++ global_fieldProcess.cc 24 Jun 2013 22:10:37 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/global_fieldProcess.cc,v 1.3 2006/05/04 20:48:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/global_fieldProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -14,59 +14,61 @@
#include <iostream> /**
- @class global_fieldProcess - @brief SAX process for global_field element. -*/ -class global_fieldProcess : public SAXStateProcess
+ @class global_fieldProcess + @brief SAX process for global_field element. + */ +class global_fieldProcess: public SAXStateProcess
{
public:
- global_fieldProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~global_fieldProcess()
- {}
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList&)
- {
- //std::cout << "global_fieldProcess::StartElement: " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- global_field* cal = new global_field;
-
- m_obj = cal;
- *obj = cal;
- }
-
- virtual void EndElement(const std::string&)
- {
- //std::cout << "global_fieldProcess::EndElement: " << name << " " << std::endl;
- }
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string& name)
- {
- //std::cout << "global_fieldProcess::StackPopNotify: " << name << std::endl;
-
- SAXObject** so = Context()->GetTopObject();
- global_field* fobj = dynamic_cast<global_field*>( m_obj );
-
- fobj->add_content( name, *so);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "global_field";
- return tag;
- }
+ global_fieldProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~global_fieldProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList&)
+ {
+ //std::cout << "global_fieldProcess::StartElement: " << name << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ global_field* cal = new global_field;
+
+ m_obj = cal;
+ *obj = cal;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ //std::cout << "global_fieldProcess::EndElement: " << name << " " << std::endl;
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string& name)
+ {
+ //std::cout << "global_fieldProcess::StackPopNotify: " << name << std::endl;
+
+ SAXObject** so = Context()->GetTopObject();
+ global_field* fobj = dynamic_cast<global_field*>(m_obj);
+
+ fobj->add_content(name, *so);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "global_field";
+ return tag;
+ }
protected:
- SAXObject* m_obj; -
+ SAXObject* m_obj; +
}; DECLARE_PROCESS_FACTORY(global_fieldProcess)
diff -u -r1.10 -r1.11 --- global_fieldSubscriber.cc 4 May 2006 22:22:18 -0000 1.10 +++ global_fieldSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.11 @@ -1,4 +1,4 @@
-// $Id: global_fieldSubscriber.cc,v 1.10 2006/05/04 22:22:18 jeremy Exp $
+// $Id: global_fieldSubscriber.cc,v 1.11 2013/06/24 22:10:37 jeremy Exp $
// lcdd #include "LCDDProcessor.hh"
@@ -17,64 +17,62 @@
#include "G4MagneticField.hh" /**
- @class global_fieldSubscriber - @brief SAX subscriber for global_field element. - @note Resolves fieldref and sets global field in LCDDProcessor. -*/ -class global_fieldSubscriber : virtual public SAXSubscriber
+ @class global_fieldSubscriber + @brief SAX subscriber for global_field element. + @note Resolves fieldref and sets global field in LCDDProcessor. + */ +class global_fieldSubscriber: virtual public SAXSubscriber
{
public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- global_fieldSubscriber()
- {
- Subscribe( "global_field" );
- }
-
- virtual ~global_fieldSubscriber()
- {}
-
- virtual void Activate( const SAXObject* object)
- {
- //std::cout << "global_field Subscriber" << std::endl;
-
- const global_field* fobj = 0;
- G4MagneticField* mag = 0;
- LCDDProcessor* proc = LCDDProcessor::instance();
-
- if ( object != 0 ) {
- fobj = dynamic_cast<const global_field*>( object );
-
- if ( fobj ) {
- const ContentSequence* seq = fobj->get_content();
-
- size_t count = seq->size();
-
- for ( size_t i = 0; i < count; i++ ) {
- if ( seq->content(i).tag == "fieldref" ) {
- FieldType::fieldref* fref =
- dynamic_cast<FieldType::fieldref*>( seq->content(i).object );
-
- mag = proc->getMagneticField( fref->get_ref() );
-
- if (mag != 0) {
- LCDDProcessor::instance()->addGlobalField(mag);
- }
- }
- }
-
- }
- else {
- std::cerr << "Failed cast to global_field!" << std::endl;
- }
+ global_fieldSubscriber()
+ {
+ Subscribe("global_field");
+ }
+
+ virtual ~global_fieldSubscriber()
+ {
+ }
+
+ virtual void Activate(const SAXObject* object)
+ {
+ //std::cout << "global_field Subscriber" << std::endl;
+
+ const global_field* fobj = 0;
+ G4MagneticField* mag = 0;
+ LCDDProcessor* proc = LCDDProcessor::instance();
+
+ if (object != 0) {
+ fobj = dynamic_cast<const global_field*>(object);
+
+ if (fobj) {
+ const ContentSequence* seq = fobj->get_content();
+
+ size_t count = seq->size();
+
+ for (size_t i = 0; i < count; i++) {
+ if (seq->content(i).tag == "fieldref") {
+ FieldType::fieldref* fref = dynamic_cast<FieldType::fieldref*>(seq->content(i).object);
+
+ mag = proc->getMagneticField(fref->get_ref());
+
+ if (mag != 0) {
+ LCDDProcessor::instance()->addGlobalField(mag);
+ }
+ }
+ }
+
+ } else {
+ std::cerr << "Failed cast to global_field!" << std::endl;
+ }
+ }
}
- }
}; DECLARE_SUBSCRIBER_FACTORY(global_fieldSubscriber)
-
diff -u -r1.1 -r1.2 --- global_grid_xyProcess.cc 30 Oct 2009 23:16:59 -0000 1.1 +++ global_grid_xyProcess.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/global_grid_xyProcess.cc,v 1.1 2009/10/30 23:16:59 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/global_grid_xyProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h" #include "Saxana/SAXProcessor.h"
@@ -12,60 +12,67 @@
#include <iostream> /**
- @class grid_xyzProcess - @brief SAX process for grid_xyz element. -*/ -class global_grid_xyProcess : public SAXStateProcess
+ @class grid_xyzProcess + @brief SAX process for grid_xyz element. + */ +class global_grid_xyProcess: public SAXStateProcess
{
- - public:
- global_grid_xyProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~global_grid_xyProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
-
- global_grid_xy* np = new global_grid_xy;
-
- np->set_lunit( attrs.getValue( "lunit" ) );
-
- np->set_gridSizeX( attrs.getValue( "grid_size_x" ) );
- np->set_gridSizeY( attrs.getValue( "grid_size_y" ) );
-
- m_obj = np;
- *obj = np;
- }
-
- virtual void EndElement(const std::string&)
- {;}
-
- virtual void Characters(const std::string&)
- {;}
-
- virtual void StackPopNotify(const std::string&)
- {;}
-
- virtual const std::string& State() const
- {
- static std::string tag = "global_grid_xy";
- return tag;
- }
-
- private:
-
- SAXObject* m_obj;
+public:
+
+ global_grid_xyProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~global_grid_xyProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ global_grid_xy* np = new global_grid_xy;
+
+ np->set_lunit(attrs.getValue("lunit"));
+
+ np->set_gridSizeX(attrs.getValue("grid_size_x"));
+ np->set_gridSizeY(attrs.getValue("grid_size_y"));
+
+ m_obj = np;
+ *obj = np;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ ;
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ ;
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ ;
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "global_grid_xy";
+ return tag;
+ }
+
+private:
+
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(global_grid_xyProcess)
diff -u -r1.2 -r1.3 --- grid_xyzProcess.cc 26 Apr 2005 18:33:16 -0000 1.2 +++ grid_xyzProcess.cc 24 Jun 2013 22:10:37 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/grid_xyzProcess.cc,v 1.2 2005/04/26 18:33:16 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/grid_xyzProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h" #include "Saxana/SAXProcessor.h"
@@ -12,67 +12,69 @@
#include <iostream> /**
- @class grid_xyzProcess - @brief SAX process for grid_xyz element. -*/ -class grid_xyzProcess : public SAXStateProcess
+ @class grid_xyzProcess + @brief SAX process for grid_xyz element. + */ +class grid_xyzProcess: public SAXStateProcess
{
public:
- grid_xyzProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~grid_xyzProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "grid_xyzProcess::StartElement: " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- grid_xyz* np = new grid_xyz;
-
- np->set_lunit( attrs.getValue( "lunit" ) );
-
- np->set_gridSizeX( attrs.getValue( "grid_size_x" ) );
- np->set_gridSizeY( attrs.getValue( "grid_size_y" ) );
- np->set_gridSizeZ( attrs.getValue( "grid_size_z" ) );
-
- m_obj = np;
- *obj = np;
- }
-
- virtual void EndElement(const std::string&)
- {
- //std::cout << "PROCESS::END OF TAG : " << name << " " << std::endl;
- }
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {
- //std::cout << "PROCESS::NOTIFIED AFTER THE TAG: " << name << std::endl;
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "grid_xyz";
- return tag;
- }
+ grid_xyzProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~grid_xyzProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "grid_xyzProcess::StartElement: " << name << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ grid_xyz* np = new grid_xyz;
+
+ np->set_lunit(attrs.getValue("lunit"));
+
+ np->set_gridSizeX(attrs.getValue("grid_size_x"));
+ np->set_gridSizeY(attrs.getValue("grid_size_y"));
+ np->set_gridSizeZ(attrs.getValue("grid_size_z"));
+
+ m_obj = np;
+ *obj = np;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ //std::cout << "PROCESS::END OF TAG : " << name << " " << std::endl;
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ //std::cout << "PROCESS::NOTIFIED AFTER THE TAG: " << name << std::endl;
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "grid_xyz";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(grid_xyzProcess)
diff -u -r1.5 -r1.6 --- headerProcess.cc 5 Jun 2006 17:41:30 -0000 1.5 +++ headerProcess.cc 24 Jun 2013 22:10:37 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/headerProcess.cc,v 1.5 2006/06/05 17:41:30 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/headerProcess.cc,v 1.6 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -13,62 +13,65 @@
#include <iostream> /**
- @class headerProcess - @brief SAX process for header element. -*/ -class headerProcess : public SAXStateProcess
+ @class headerProcess + @brief SAX process for header element. + */ +class headerProcess: public SAXStateProcess
{
public:
- headerProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
+ headerProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
- virtual ~headerProcess()
- {}
+ virtual ~headerProcess()
+ {
+ }
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
- virtual void StartElement(const std::string&, const ASCIIAttributeList&)
- {
- //std::cout << "headerProcess::StartElement" << std::endl;
+ virtual void StartElement(const std::string&, const ASCIIAttributeList&)
+ {
+ //std::cout << "headerProcess::StartElement" << std::endl;
- SAXObject** obj = Context()->GetTopObject();
+ SAXObject** obj = Context()->GetTopObject();
- header* h = new header;
+ header* h = new header;
- m_obj = h; - *obj = h; - }
+ m_obj = h; + *obj = h; + }
- 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)
- {
- //std::cout << "headerProcess::StackPopNotify" << std::endl;
+ virtual void StackPopNotify(const std::string& name)
+ {
+ //std::cout << "headerProcess::StackPopNotify" << std::endl;
- SAXObject** so = Context()->GetTopObject(); - header* h = dynamic_cast<header*>( m_obj );
+ SAXObject** so = Context()->GetTopObject(); + header* h = dynamic_cast<header*>(m_obj);
- h->add_content( name, *so );
+ h->add_content(name, *so);
- }
+ }
- virtual const std::string& State() const
- {
- static std::string tag = "header";
- return tag;
- }
+ virtual const std::string& State() const
+ {
+ static std::string tag = "header";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(headerProcess)
diff -u -r1.9 -r1.10 --- headerSubscriber.cc 5 Jun 2006 17:41:30 -0000 1.9 +++ headerSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.10 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/headerSubscriber.cc,v 1.9 2006/06/05 17:41:30 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/headerSubscriber.cc,v 1.10 2013/06/24 22:10:37 jeremy Exp $
// GDML #include "Saxana/SAXSubscriber.h"
@@ -19,85 +19,82 @@
#include <iostream> /**
- @class headerSubscriber - @brief SAX subscriber for header element. - @note Creates the LCDDHeaderRecord and sets in LCDDProcessor. -*/ -class headerSubscriber : virtual public SAXSubscriber
+ @class headerSubscriber + @brief SAX subscriber for header element. + @note Creates the LCDDHeaderRecord and sets in LCDDProcessor. + */ +class headerSubscriber: virtual public SAXSubscriber
{
public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- headerSubscriber()
- {
- Subscribe("header");
- }
-
- virtual ~headerSubscriber()
- {}
-
- virtual void Activate(const SAXObject* object)
- {
- LCDDProcessor* proc = LCDDProcessor::instance();
- const header* obj = dynamic_cast<const header*>( object );
- LCDDHeaderRecord* hdr = new LCDDHeaderRecord();
-
- // handle child element content
- ContentSequence* seq = const_cast<ContentSequence*>( obj->get_content() );
- size_t count = seq->size();
- for( size_t i=0; i<count; i++ ) {
-
- const ContentGroup::ContentItem& citem = seq->content( i );
- const std::string& tag = citem.tag;
- SAXObject* cobj = citem.object;
-
- if ( tag == "detector" ) {
-
- const detector* d = dynamic_cast<detector*>( cobj );
-
- hdr->setDetectorName( d->get_name() );
- hdr->setDetectorVersion( d->get_version() );
- hdr->setDetectorUrl( d->get_url() );
- }
- else if ( tag == "generator" ) {
-
- const generator* g = dynamic_cast<generator*>( cobj );
-
- hdr->setGeneratorName( g->get_name() );
- hdr->setGeneratorVersion( g->get_version() );
- hdr->setGeneratorFile( g->get_file() );
- hdr->setGeneratorChecksum( g->get_checksum() );
- }
- else if ( tag == "author" ) {
-
- const author* a = dynamic_cast<author*> ( cobj );
-
- hdr->setAuthorName( a->get_name() );
- hdr->setAuthorEmail( a->get_email() );
-
- }
- else if ( tag == "comment" ) {
-
- const comment* c = dynamic_cast<comment*> ( cobj );
- hdr->setComment( c->get_comment() );
- }
- else {
- std::cerr << "Unknown content for header element." << std::endl;
- }
+ headerSubscriber()
+ {
+ Subscribe("header");
+ }
+
+ virtual ~headerSubscriber()
+ {
}
- // set header in LCDDProc - proc->setHeader( hdr );
+ virtual void Activate(const SAXObject* object)
+ {
+ LCDDProcessor* proc = LCDDProcessor::instance();
+ const header* obj = dynamic_cast<const header*>(object);
+ LCDDHeaderRecord* hdr = new LCDDHeaderRecord();
+
+ // handle child element content
+ ContentSequence* seq = const_cast<ContentSequence*>(obj->get_content());
+ size_t count = seq->size();
+ for (size_t i = 0; i < count; i++) {
+
+ const ContentGroup::ContentItem& citem = seq->content(i);
+ const std::string& tag = citem.tag;
+ SAXObject* cobj = citem.object;
+
+ if (tag == "detector") {
+
+ const detector* d = dynamic_cast<detector*>(cobj);
+
+ hdr->setDetectorName(d->get_name());
+ hdr->setDetectorVersion(d->get_version());
+ hdr->setDetectorUrl(d->get_url());
+ } else if (tag == "generator") {
- // print header - hdr->printOut( std::cout );
+ const generator* g = dynamic_cast<generator*>(cobj);
- //delete object; - }
+ hdr->setGeneratorName(g->get_name());
+ hdr->setGeneratorVersion(g->get_version());
+ hdr->setGeneratorFile(g->get_file());
+ hdr->setGeneratorChecksum(g->get_checksum());
+ } else if (tag == "author") {
+
+ const author* a = dynamic_cast<author*>(cobj);
+
+ hdr->setAuthorName(a->get_name());
+ hdr->setAuthorEmail(a->get_email());
+
+ } else if (tag == "comment") {
+
+ const comment* c = dynamic_cast<comment*>(cobj);
+ hdr->setComment(c->get_comment());
+ } else {
+ std::cerr << "Unknown content for header element." << std::endl;
+ }
+ }
+
+ // set header in LCDDProc
+ proc->setHeader(hdr);
+
+ // print header
+ hdr->printOut(std::cout);
+
+ //delete object;
+ }
};
diff -u -r1.2 -r1.3 --- idspecProcess.cc 26 Apr 2005 18:33:16 -0000 1.2 +++ idspecProcess.cc 24 Jun 2013 22:10:37 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/idspecProcess.cc,v 1.2 2005/04/26 18:33:16 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/idspecProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h" #include "Saxana/SAXProcessor.h"
@@ -12,66 +12,66 @@
#include <iostream> /**
- @class idspecProcess - @brief SAX process for idspec element. -*/ -class idspecProcess : public SAXStateProcess
+ @class idspecProcess + @brief SAX process for idspec element. + */ +class idspecProcess: public SAXStateProcess
{
public:
- idspecProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
-
- virtual ~idspecProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "idspecProcess::StartElement() - " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- idspecElem* idspec = new idspecElem;
-
- idspec->set_name( attrs.getValue( "name" ) );
- idspec->set_length( attrs.getValue( "length" ) );
-
- m_obj = idspec;
- *obj = idspec;
- }
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string& name)
- {
- SAXObject** so = Context()->GetTopObject();
- idspecElem* idspec = dynamic_cast<idspecElem*>( m_obj );
- idspec->add_content( name, *so );
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "idspec";
- return tag;
- }
+ idspecProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~idspecProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "idspecProcess::StartElement() - " << name << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ idspecElem* idspec = new idspecElem;
+
+ idspec->set_name(attrs.getValue("name"));
+ idspec->set_length(attrs.getValue("length"));
+
+ m_obj = idspec;
+ *obj = idspec;
+ }
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string& name)
+ {
+ SAXObject** so = Context()->GetTopObject();
+ idspecElem* idspec = dynamic_cast<idspecElem*>(m_obj);
+ idspec->add_content(name, *so);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "idspec";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(idspecProcess)
-
-
diff -u -r1.8 -r1.9 --- idspecSubscriber.cc 1 Feb 2012 10:28:56 -0000 1.8 +++ idspecSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.9 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/idspecSubscriber.cc,v 1.8 2012/02/01 10:28:56 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/idspecSubscriber.cc,v 1.9 2013/06/24 22:10:37 jeremy Exp $
// GDML #include "Saxana/SAXSubscriber.h"
@@ -20,113 +20,107 @@
#include "StringUtil.hh" /**
- @class idspecSubscriber - @brief SAX subscriber for idspec element. - @note Creates an IdSpec object and registers with IdManager. - @note Also creates IdField objects from idfield child elements. -*/ -class idspecSubscriber : virtual public SAXSubscriber
+ @class idspecSubscriber + @brief SAX subscriber for idspec element. + @note Creates an IdSpec object and registers with IdManager. + @note Also creates IdField objects from idfield child elements. + */ +class idspecSubscriber: virtual public SAXSubscriber
{
public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- idspecSubscriber()
- {
- Subscribe("idspec");
- }
-
- virtual ~idspecSubscriber()
- {}
-
- virtual void Activate(const SAXObject* object)
- {
- //std::cout << "idspecSubscriber::Activate()" << std::endl;
-
- if ( object ) {
- const idspecElem* idspec_elem = dynamic_cast<const idspecElem*> ( object );
-
- if ( idspec_elem ) {
-
- std::string name = idspec_elem->get_name();
-
- std::string length = idspec_elem->get_length();
- IdSpec::SizeType length_s =
- (IdSpec::SizeType) StringUtil::toInt( length );
-
- // @todo support lengths over 64
- if ( length_s > 64 ) {
- std::cerr << "Number of bits cannot be greater than 64 at this time." << std::endl;
- assert( 0 );
- }
-
- IdSpec* idspec = new IdSpec;
- idspec->setName( name );
- idspec->setBitLength( length_s );
-
- IdManager::instance()->addIdSpec( name, idspec );
-
- // create fields
- ContentSequence* seq = const_cast<ContentSequence*> ( idspec_elem->get_content() );
- size_t count = seq->size();
-
- for ( size_t i = 0; i < count; i++ ) {
- const ContentGroup::ContentItem& segitem = seq->content(i);
- if ( segitem.tag == "idfield" ) {
- idfieldElem* idfield_elem = dynamic_cast<idfieldElem*> ( segitem.object );
-
- if ( idfield_elem ) {
-
- IdField* idfield = new IdField;
-
- // label
- std::string label = idfield_elem->get_label();
-
- // start
- std::string start = idfield_elem->get_start();
- IdField::SizeType start_s =
- (IdField::SizeType) StringUtil::toInt( start );
-
- // signed
- std::string signed_str = idfield_elem->get_signed();
- bool signed_bool = StringUtil::toBool( signed_str );
-
- // length
- std::string length = idfield_elem->get_length();
- IdField::SizeType length_s =
- (IdField::SizeType) StringUtil::toInt( length );
-
- // set in G4 object
- idfield->setLabel( label );
- idfield->setSigned( signed_bool );
- idfield->setStart( start_s );
- idfield->setLength( length_s );
-
- // add to spec
- idspec->addIdField( idfield );
- }
- else {
- G4Exception("", "", FatalException, "Failed cast to idfieldElem." );
- }
- }
- else {
- std::cerr << "Ignoring unknown child - " << segitem.tag << std::endl;
- }
- }
- }
- else {
- G4Exception("", "", FatalException, "Failed cast to idspecElem.");
- }
+ idspecSubscriber()
+ {
+ Subscribe("idspec");
}
- else {
- G4Exception("", "", FatalException, "SAXObject is null!");
+
+ virtual ~idspecSubscriber()
+ {
}
- //delete object; - }
+ virtual void Activate(const SAXObject* object)
+ {
+ //std::cout << "idspecSubscriber::Activate()" << std::endl;
+
+ if (object) {
+ const idspecElem* idspec_elem = dynamic_cast<const idspecElem*>(object);
+
+ if (idspec_elem) {
+
+ std::string name = idspec_elem->get_name();
+
+ std::string length = idspec_elem->get_length();
+ IdSpec::SizeType length_s = (IdSpec::SizeType) StringUtil::toInt(length);
+
+ // @todo support lengths over 64
+ if (length_s > 64) {
+ std::cerr << "Number of bits cannot be greater than 64 at this time." << std::endl;
+ assert(0);
+ }
+
+ IdSpec* idspec = new IdSpec;
+ idspec->setName(name);
+ idspec->setBitLength(length_s);
+
+ IdManager::instance()->addIdSpec(name, idspec);
+
+ // create fields
+ ContentSequence* seq = const_cast<ContentSequence*>(idspec_elem->get_content());
+ size_t count = seq->size();
+
+ for (size_t i = 0; i < count; i++) {
+ const ContentGroup::ContentItem& segitem = seq->content(i);
+ if (segitem.tag == "idfield") {
+ idfieldElem* idfield_elem = dynamic_cast<idfieldElem*>(segitem.object);
+
+ if (idfield_elem) {
+
+ IdField* idfield = new IdField;
+
+ // label
+ std::string label = idfield_elem->get_label();
+
+ // start
+ std::string start = idfield_elem->get_start();
+ IdField::SizeType start_s = (IdField::SizeType) StringUtil::toInt(start);
+
+ // signed
+ std::string signed_str = idfield_elem->get_signed();
+ bool signed_bool = StringUtil::toBool(signed_str);
+
+ // length
+ std::string length = idfield_elem->get_length();
+ IdField::SizeType length_s = (IdField::SizeType) StringUtil::toInt(length);
+
+ // set in G4 object
+ idfield->setLabel(label);
+ idfield->setSigned(signed_bool);
+ idfield->setStart(start_s);
+ idfield->setLength(length_s);
+
+ // add to spec
+ idspec->addIdField(idfield);
+ } else {
+ G4Exception("", "", FatalException, "Failed cast to idfieldElem.");
+ }
+ } else {
+ std::cerr << "Ignoring unknown child - " << segitem.tag << std::endl;
+ }
+ }
+ } else {
+ G4Exception("", "", FatalException, "Failed cast to idspecElem.");
+ }
+ } else {
+ G4Exception("", "", FatalException, "SAXObject is null!");
+ }
+
+ //delete object;
+ }
}; DECLARE_SUBSCRIBER_FACTORY(idspecSubscriber)
diff -u -r1.3 -r1.4 --- idspecrefProcess.cc 5 Jun 2006 17:41:30 -0000 1.3 +++ idspecrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/idspecrefProcess.cc,v 1.3 2006/06/05 17:41:30 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/idspecrefProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
// LCDD #include "IdSpecType.hh"
@@ -10,42 +10,43 @@
#include <iostream> /**
- @class idspecrefProcess - @brief SAX process for idspecref element. - @note Extends ReferenceTypeProcess for reference to idspec element. -*/ -class idspecrefProcess : public ReferenceTypeProcess
+ @class idspecrefProcess + @brief SAX process for idspecref element. + @note Extends ReferenceTypeProcess for reference to idspec element. + */ +class idspecrefProcess: public ReferenceTypeProcess
{
public:
- idspecrefProcess(const ProcessingContext* context = 0)
- : ReferenceTypeProcess(context)
- {}
-
- virtual ~idspecrefProcess()
- {}
-
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
- IdSpecType::idspecref* s =
- new IdSpecType::idspecref;
-
- *obj = s;
- m_obj = s;
-
- ReferenceTypeProcess::StartElement(name, attrs);
- }
-
- virtual void EndElement(const std::string& name)
- {
- ReferenceTypeProcess::EndElement(name);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "idspecref";
- return tag;
- }
+ idspecrefProcess(const ProcessingContext* context = 0) :
+ ReferenceTypeProcess(context)
+ {
+ }
+
+ virtual ~idspecrefProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+ IdSpecType::idspecref* s = new IdSpecType::idspecref;
+
+ *obj = s;
+ m_obj = s;
+
+ ReferenceTypeProcess::StartElement(name, attrs);
+ }
+
+ virtual void EndElement(const std::string& name)
+ {
+ ReferenceTypeProcess::EndElement(name);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "idspecref";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(idspecrefProcess)
diff -u -r1.4 -r1.5 --- limitProcess.cc 5 Jun 2006 17:41:30 -0000 1.4 +++ limitProcess.cc 24 Jun 2013 22:10:37 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/limitProcess.cc,v 1.4 2006/06/05 17:41:30 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitProcess.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h" #include "Saxana/SAXProcessor.h"
@@ -13,56 +13,60 @@
* */
-class limitProcess : public SAXStateProcess
+class limitProcess: public SAXStateProcess
{
public:
- limitProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~limitProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
-
- limit* lim = new limit;
-
- lim->set_name(attrs.getValue("name"));
- lim->set_value(attrs.getValue("value"));
- lim->set_particles(attrs.getValue("particles"));
- lim->set_unit(attrs.getValue("unit"));
-
- m_obj = lim;
- *obj = lim;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "limit";
- return tag;
- }
+ limitProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~limitProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ limit* lim = new limit;
+
+ lim->set_name(attrs.getValue("name"));
+ lim->set_value(attrs.getValue("value"));
+ lim->set_particles(attrs.getValue("particles"));
+ lim->set_unit(attrs.getValue("unit"));
+
+ m_obj = lim;
+ *obj = lim;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "limit";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
};
diff -u -r1.3 -r1.4 --- limitrefProcess.cc 9 Jul 2005 00:25:57 -0000 1.3 +++ limitrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.4 @@ -1,47 +1,49 @@
-// $Header: /cvs/lcd/lcdd/src/limitrefProcess.cc,v 1.3 2005/07/09 00:25:57 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitrefProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
#include "Processes/ReferenceTypeProcess.h" #include "LimitType.hh" /**
- @class limitrefProcess - @brief SAX process for limitref element. -*/ -class limitrefProcess : public ReferenceTypeProcess
+ @class limitrefProcess + @brief SAX process for limitref element. + */ +class limitrefProcess: public ReferenceTypeProcess
{
public:
- limitrefProcess(const ProcessingContext* context = 0)
- : ReferenceTypeProcess(context)
- {}
-
- virtual ~limitrefProcess()
- {}
-
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
- //std::cout << "limitrefProcess" << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- LimitType::limitref* lref = new LimitType::limitref;
-
- *obj = lref;
- m_obj = lref;
-
- ReferenceTypeProcess::StartElement(name, attrs);
- }
-
- virtual void EndElement(const std::string& name)
- {
- ReferenceTypeProcess::EndElement(name);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "limitref";
- return tag;
- }
+ limitrefProcess(const ProcessingContext* context = 0) :
+ ReferenceTypeProcess(context)
+ {
+ }
+
+ virtual ~limitrefProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "limitrefProcess" << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ LimitType::limitref* lref = new LimitType::limitref;
+
+ *obj = lref;
+ m_obj = lref;
+
+ ReferenceTypeProcess::StartElement(name, attrs);
+ }
+
+ virtual void EndElement(const std::string& name)
+ {
+ ReferenceTypeProcess::EndElement(name);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "limitref";
+ return tag;
+ }
}; //DECLARE_PROCESS_FACTORY(limitrefProcess);
diff -u -r1.3 -r1.4 --- limitsetProcess.cc 1 Feb 2012 10:28:56 -0000 1.3 +++ limitsetProcess.cc 24 Jun 2013 22:10:37 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/limitsetProcess.cc,v 1.3 2012/02/01 10:28:56 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitsetProcess.cc,v 1.4 2013/06/24 22:10:37 jeremy Exp $
#include "limitset.hh" #include "limit.hh"
@@ -14,66 +14,67 @@
// Geant4 #include "globals.hh"
-class limitsetProcess : public SAXStateProcess
+class limitsetProcess: public SAXStateProcess
{
public:
- limitsetProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~limitsetProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
-
- limitset* lim = new limitset;
- lim->set_name(attrs.getValue("name"));
-
- m_obj = lim;
- *obj = lim;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string& name)
- {
- if ( name == "limit" ) {
- SAXObject** so = Context()->GetTopObject();
- limitset* lim = dynamic_cast<limitset*>( m_obj );
-
- if ( lim != 0 ) {
- lim->add_content( name, *so);
- }
- else {
- G4Exception("limitsetProcess::StackPopNotify()", "", FatalException, "Failed cast to limitset.");
- }
- }
- else {
- std::cerr << "limitsetProcess::StackPopNotify() - Got limitset content that wasn't limit." << std::endl;
- }
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "limitset";
- return tag;
- }
+ limitsetProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~limitsetProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ limitset* lim = new limitset;
+ lim->set_name(attrs.getValue("name"));
+
+ m_obj = lim;
+ *obj = lim;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string& name)
+ {
+ if (name == "limit") {
+ SAXObject** so = Context()->GetTopObject();
+ limitset* lim = dynamic_cast<limitset*>(m_obj);
+
+ if (lim != 0) {
+ lim->add_content(name, *so);
+ } else {
+ G4Exception("limitsetProcess::StackPopNotify()", "", FatalException, "Failed cast to limitset.");
+ }
+ } else {
+ std::cerr << "limitsetProcess::StackPopNotify() - Got limitset content that wasn't limit." << std::endl;
+ }
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "limitset";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
};
diff -u -r1.4 -r1.5 --- limitsetSubscriber.cc 1 Feb 2012 10:28:56 -0000 1.4 +++ limitsetSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/limitsetSubscriber.cc,v 1.4 2012/02/01 10:28:56 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitsetSubscriber.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
// GDML #include "Saxana/SAXSubscriber.h"
@@ -21,85 +21,81 @@
/** */
-class limitsetSubscriber : virtual public SAXSubscriber
+class limitsetSubscriber: virtual public SAXSubscriber
{
public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- limitsetSubscriber()
- {
- Subscribe("limitset");
- }
-
- virtual void Activate(const SAXObject* object)
- {
- //std::cout << "limitsetSubscriber::Activate()" << std::endl;
- if ( object != 0 ) {
-
- GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
- const limitset* lsobj = dynamic_cast<const limitset*>(object);
-
- if ( lsobj != 0 ) {
- //std::cout << "got limitset: " << lsobj->get_name() << std::endl;
-
- G4LimitSet* ls = new G4LimitSet( lsobj->get_name() );
-
- const ContentSequence* seq = lsobj->get_content();
- size_t count = seq->size();
- for ( size_t i=0; i<count; i++ ) {
- if ( seq->content(i).tag == "limit" ) {
- limit* param = dynamic_cast<limit*>(seq->content(i).object);
-
- if ( param != 0 ) {
- //std::cout << "got limit: " << param->get_name() << std::endl;
-
- string unit = param->get_unit();
- string particles = param->get_particles();
- string limitName = param->get_name();
-
- string sval = param->get_value();
- sval += "*" + unit;
- double value = calc->Eval(sval);
-
- /* Process the comma-delimited list of particles. */
- vector<string> particleList;
- StringUtil::split(particles, ",", particleList);
-
- /* No specific particles so make an entry for all particles. */
- if ( particleList.end() == particleList.begin() ) {
- //std::cout << "adding limit with name, particle, value: <" << limitName << "> <" << G4LimitSet::ANY_PARTICLE << "> <" << value << ">" << std::endl;
- ls->setLimitForParticle(limitName, G4LimitSet::ANY_PARTICLE, value);
- }
- /* Insert the limit once for each particle. */
- else {
- for ( vector<string>::iterator iter = particleList.begin();
- iter != particleList.end();
- iter++ ) {
- string particle = (*iter);
- StringUtil::trim(particle);
- //std::cout << "adding limit with name, particle, value: <" << limitName << "> <" << particle << "> <" << value << ">" << std::endl;
- ls->setLimitForParticle(limitName, particle, value);
- }
- }
- }
- else {
- G4Exception("", "", FatalException, "Failed cast to limit.");
- }
- }
- }
-
- LCDDProcessor::instance()->addLimitSet(ls->getName(), ls);
- }
- else {
- G4Exception("", "", FatalException, "Failed cast to limitset.");
- }
+ limitsetSubscriber()
+ {
+ Subscribe("limitset");
+ }
+
+ virtual void Activate(const SAXObject* object)
+ {
+ //std::cout << "limitsetSubscriber::Activate()" << std::endl;
+ if (object != 0) {
+
+ GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
+ const limitset* lsobj = dynamic_cast<const limitset*>(object);
+
+ if (lsobj != 0) {
+ //std::cout << "got limitset: " << lsobj->get_name() << std::endl;
+
+ G4LimitSet* ls = new G4LimitSet(lsobj->get_name());
+
+ const ContentSequence* seq = lsobj->get_content();
+ size_t count = seq->size();
+ for (size_t i = 0; i < count; i++) {
+ if (seq->content(i).tag == "limit") {
+ limit* param = dynamic_cast<limit*>(seq->content(i).object);
+
+ if (param != 0) {
+ //std::cout << "got limit: " << param->get_name() << std::endl;
+
+ string unit = param->get_unit();
+ string particles = param->get_particles();
+ string limitName = param->get_name();
+
+ string sval = param->get_value();
+ sval += "*" + unit;
+ double value = calc->Eval(sval);
+
+ /* Process the comma-delimited list of particles. */
+ vector<string> particleList;
+ StringUtil::split(particles, ",", particleList);
+
+ /* No specific particles so make an entry for all particles. */
+ if (particleList.end() == particleList.begin()) {
+ //std::cout << "adding limit with name, particle, value: <" << limitName << "> <" << G4LimitSet::ANY_PARTICLE << "> <" << value << ">" << std::endl;
+ ls->setLimitForParticle(limitName, G4LimitSet::ANY_PARTICLE, value);
+ }
+ /* Insert the limit once for each particle. */
+ else {
+ for (vector<string>::iterator iter = particleList.begin(); iter != particleList.end(); iter++) {
+ string particle = (*iter);
+ StringUtil::trim(particle);
+ //std::cout << "adding limit with name, particle, value: <" << limitName << "> <" << particle << "> <" << value << ">" << std::endl;
+ ls->setLimitForParticle(limitName, particle, value);
+ }
+ }
+ } else {
+ G4Exception("", "", FatalException, "Failed cast to limit.");
+ }
+ }
+ }
+
+ LCDDProcessor::instance()->addLimitSet(ls->getName(), ls);
+ } else {
+ G4Exception("", "", FatalException, "Failed cast to limitset.");
+ }
+ }
}
- }
}; DECLARE_SUBSCRIBER_FACTORY(limitsetSubscriber)
diff -u -r1.2 -r1.3 --- limitsetrefProcess.cc 5 Jun 2006 17:41:30 -0000 1.2 +++ limitsetrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.3 @@ -1,47 +1,49 @@
-// $Header: /cvs/lcd/lcdd/src/limitsetrefProcess.cc,v 1.2 2006/06/05 17:41:30 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitsetrefProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
#include "Processes/ReferenceTypeProcess.h" #include "LimitSetType.hh" /**
- @class limitsetrefProcess - @brief SAX process for limitsetref element. -*/ -class limitsetrefProcess : public ReferenceTypeProcess
+ @class limitsetrefProcess + @brief SAX process for limitsetref element. + */ +class limitsetrefProcess: public ReferenceTypeProcess
{
public:
- limitsetrefProcess(const ProcessingContext* context = 0)
- : ReferenceTypeProcess(context)
- {}
-
- virtual ~limitsetrefProcess()
- {}
-
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
- //std::cout << "limitsetrefProcess" << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- LimitSetType::limitsetref* lref = new LimitSetType::limitsetref;
-
- *obj = lref;
- m_obj = lref;
-
- ReferenceTypeProcess::StartElement(name, attrs);
- }
-
- virtual void EndElement(const std::string& name)
- {
- ReferenceTypeProcess::EndElement(name);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "limitsetref";
- return tag;
- }
+ limitsetrefProcess(const ProcessingContext* context = 0) :
+ ReferenceTypeProcess(context)
+ {
+ }
+
+ virtual ~limitsetrefProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "limitsetrefProcess" << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ LimitSetType::limitsetref* lref = new LimitSetType::limitsetref;
+
+ *obj = lref;
+ m_obj = lref;
+
+ ReferenceTypeProcess::StartElement(name, attrs);
+ }
+
+ virtual void EndElement(const std::string& name)
+ {
+ ReferenceTypeProcess::EndElement(name);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "limitsetref";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(limitsetrefProcess)
diff -u -r1.2 -r1.3 --- nonprojective_cylinderProcess.cc 26 Apr 2005 18:33:16 -0000 1.2 +++ nonprojective_cylinderProcess.cc 24 Jun 2013 22:10:37 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/nonprojective_cylinderProcess.cc,v 1.2 2005/04/26 18:33:16 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/nonprojective_cylinderProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h" #include "Saxana/SAXProcessor.h"
@@ -12,61 +12,65 @@
#include <iostream> /**
- @class nonprojective_cylinderProcess - @brief SAX process for nonprojective_cylinder element. -*/ -class nonprojective_cylinderProcess : public SAXStateProcess
+ @class nonprojective_cylinderProcess + @brief SAX process for nonprojective_cylinder element. + */ +class nonprojective_cylinderProcess: public SAXStateProcess
{
public:
- nonprojective_cylinderProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~nonprojective_cylinderProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "nonprojective_cylinderProcess::StartElement: " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- nonprojective_cylinder* np = new nonprojective_cylinder;
-
- np->set_gridSizeZ( attrs.getValue( "grid_size_z" ) );
- np->set_gridSizePhi( attrs.getValue( "grid_size_phi" ) );
- np->set_lunit( attrs.getValue( "lunit" ) );
-
- m_obj = np;
- *obj = np;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "nonprojective_cylinder";
- return tag;
- }
+ nonprojective_cylinderProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~nonprojective_cylinderProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "nonprojective_cylinderProcess::StartElement: " << name << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ nonprojective_cylinder* np = new nonprojective_cylinder;
+
+ np->set_gridSizeZ(attrs.getValue("grid_size_z"));
+ np->set_gridSizePhi(attrs.getValue("grid_size_phi"));
+ np->set_lunit(attrs.getValue("lunit"));
+
+ m_obj = np;
+ *obj = np;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "nonprojective_cylinder";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(nonprojective_cylinderProcess)
diff -u -r1.1 -r1.2 --- optical_calorimeterProcess.cc 5 Jul 2007 22:27:36 -0000 1.1 +++ optical_calorimeterProcess.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/optical_calorimeterProcess.cc,v 1.1 2007/07/05 22:27:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/optical_calorimeterProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -14,25 +14,27 @@
#include <iostream> /**
- @class optical_calorimeterProcess - @brief SAX process for optical_calorimeter element. - @note Calls SAX processor for SensitiveDetectorTypeProcess parent class. -*/ -class optical_calorimeterProcess : public calorimeterProcess
+ @class optical_calorimeterProcess + @brief SAX process for optical_calorimeter element. + @note Calls SAX processor for SensitiveDetectorTypeProcess parent class. + */ +class optical_calorimeterProcess: public calorimeterProcess
{
public:
- optical_calorimeterProcess(const ProcessingContext* context = 0)
- : calorimeterProcess(context)
- {}
-
- virtual ~optical_calorimeterProcess()
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "optical_calorimeter";
- return tag;
- }
+ optical_calorimeterProcess(const ProcessingContext* context = 0) :
+ calorimeterProcess(context)
+ {
+ }
+
+ virtual ~optical_calorimeterProcess()
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "optical_calorimeter";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(optical_calorimeterProcess)
diff -u -r1.1 -r1.2 --- optical_calorimeterSubscriber.cc 5 Jul 2007 22:27:36 -0000 1.1 +++ optical_calorimeterSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/optical_calorimeterSubscriber.cc,v 1.1 2007/07/05 22:27:36 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/optical_calorimeterSubscriber.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
// GDML #include "Saxana/SAXSubscriber.h"
@@ -22,31 +22,32 @@
#include <sstream> /**
- @class calorimeterSubscriber
- @brief SAX subscriber for calorimeter element.
- @note Delegates to SensitiveDetectorFactory to create G4CalorimeterSD object.
-*/
-class optical_calorimeterSubscriber : virtual public SAXSubscriber
-{
+ @class calorimeterSubscriber
+ @brief SAX subscriber for calorimeter element.
+ @note Delegates to SensitiveDetectorFactory to create G4CalorimeterSD object.
+ */
+class optical_calorimeterSubscriber: virtual public SAXSubscriber
+{
public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- optical_calorimeterSubscriber()
- {
- Subscribe("optical_calorimeter");
- }
-
- virtual ~optical_calorimeterSubscriber()
- {}
-
- virtual void Activate(const SAXObject* object)
- {
- SensitiveDetectorFactory::createSensitiveDetector(object);
- }
+ optical_calorimeterSubscriber()
+ {
+ Subscribe("optical_calorimeter");
+ }
+
+ virtual ~optical_calorimeterSubscriber()
+ {
+ }
+
+ virtual void Activate(const SAXObject* object)
+ {
+ SensitiveDetectorFactory::createSensitiveDetector(object);
+ }
}; DECLARE_SUBSCRIBER_FACTORY(optical_calorimeterSubscriber)
diff -u -r1.7 -r1.8 --- physvolidProcess.cc 20 Apr 2005 19:04:41 -0000 1.7 +++ physvolidProcess.cc 24 Jun 2013 22:10:37 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/physvolidProcess.cc,v 1.7 2005/04/20 19:04:41 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/physvolidProcess.cc,v 1.8 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -13,55 +13,58 @@
#include <iostream> /**
- @class physvolidProcess - @brief SAX process for physvolid element. -*/ -class physvolidProcess : public SAXStateProcess
+ @class physvolidProcess + @brief SAX process for physvolid element. + */ +class physvolidProcess: public SAXStateProcess
{
public:
- physvolidProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~physvolidProcess()
- {}
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "physvolidProcess::StartElement: " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- physvolidElem* pvid = new physvolidElem;
-
- pvid->set_value( attrs.getValue( "value" ) );
- pvid->set_field_name( attrs.getValue( "field_name" ) );
-
- m_obj = pvid;
- *obj = pvid;
- }
-
- virtual void EndElement(const std::string&)
- {
- //std::cout << "physvolidProcess::EndElement: " << name << " " << std::endl;
- }
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "physvolid";
- return tag;
- }
+ physvolidProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~physvolidProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "physvolidProcess::StartElement: " << name << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ physvolidElem* pvid = new physvolidElem;
+
+ pvid->set_value(attrs.getValue("value"));
+ pvid->set_field_name(attrs.getValue("field_name"));
+
+ m_obj = pvid;
+ *obj = pvid;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ //std::cout << "physvolidProcess::EndElement: " << name << " " << std::endl;
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "physvolid";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(physvolidProcess)
diff -u -r1.1 -r1.2 --- projective_cylinderProcess.cc 4 Mar 2005 22:51:15 -0000 1.1 +++ projective_cylinderProcess.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/projective_cylinderProcess.cc,v 1.1 2005/03/04 22:51:15 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/projective_cylinderProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h" #include "Saxana/SAXProcessor.h"
@@ -12,60 +12,64 @@
#include <iostream> /**
- @class projective_cylinderProcess - @brief SAX process for projective_cylinder element.
+ @class projective_cylinderProcess + @brief SAX process for projective_cylinder element.
*/
-class projective_cylinderProcess : public SAXStateProcess
+class projective_cylinderProcess: public SAXStateProcess
{
public:
- projective_cylinderProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~projective_cylinderProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "projective_cylinderProcess::StartElement: " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- projective_cylinder* prj = new projective_cylinder;
-
- prj->set_ntheta( attrs.getValue( "ntheta" ) );
- prj->set_nphi( attrs.getValue( "nphi" ) );
-
- m_obj = prj;
- *obj = prj;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "projective_cylinder";
- return tag;
- }
+ projective_cylinderProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~projective_cylinderProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "projective_cylinderProcess::StartElement: " << name << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ projective_cylinder* prj = new projective_cylinder;
+
+ prj->set_ntheta(attrs.getValue("ntheta"));
+ prj->set_nphi(attrs.getValue("nphi"));
+
+ m_obj = prj;
+ *obj = prj;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "projective_cylinder";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(projective_cylinderProcess)
diff -u -r1.1 -r1.2 --- projective_zplaneProcess.cc 4 Mar 2005 22:51:15 -0000 1.1 +++ projective_zplaneProcess.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/projective_zplaneProcess.cc,v 1.1 2005/03/04 22:51:15 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/projective_zplaneProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -13,60 +13,64 @@
#include <iostream> /**
- @class projective_zplaneProcess - @brief SAX process for projective_zplane element. -*/ -class projective_zplaneProcess : public SAXStateProcess
+ @class projective_zplaneProcess + @brief SAX process for projective_zplane element. + */ +class projective_zplaneProcess: public SAXStateProcess
{
public:
- projective_zplaneProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~projective_zplaneProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "projective_zplaneProcess::StartElement: " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- projective_zplane* prj = new projective_zplane;
-
- prj->set_ntheta( attrs.getValue( "ntheta" ) );
- prj->set_nphi( attrs.getValue( "nphi" ) );
-
- m_obj = prj;
- *obj = prj;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "projective_zplane";
- return tag;
- }
+ projective_zplaneProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~projective_zplaneProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "projective_zplaneProcess::StartElement: " << name << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ projective_zplane* prj = new projective_zplane;
+
+ prj->set_ntheta(attrs.getValue("ntheta"));
+ prj->set_nphi(attrs.getValue("nphi"));
+
+ m_obj = prj;
+ *obj = prj;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "projective_zplane";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(projective_zplaneProcess)
diff -u -r1.8 -r1.9 --- regionProcess.cc 30 Apr 2013 23:04:44 -0000 1.8 +++ regionProcess.cc 24 Jun 2013 22:10:37 -0000 1.9 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/regionProcess.cc,v 1.8 2013/04/30 23:04:44 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/regionProcess.cc,v 1.9 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h" #include "Saxana/SAXProcessor.h"
@@ -15,59 +15,67 @@
* @class regionProcess * @brief SAX process for region element. */
-class regionProcess: public SAXStateProcess {
+class regionProcess: public SAXStateProcess
+{
public:
- regionProcess(const ProcessingContext* context = 0) :
- SAXStateProcess(context), m_obj(0) {
- }
-
- virtual ~regionProcess() {
- }
-
- virtual const SAXComponentObject* Build() const {
- return this;
- }
-
- virtual void StartElement(const std::string&,
- const ASCIIAttributeList& attrs) {
- SAXObject** obj = Context()->GetTopObject();
-
- region* reg = new region;
-
- reg->set_name(attrs.getValue("name"));
- reg->set_storeSecondaries(attrs.getValue("store_secondaries"));
- reg->set_killTracks(attrs.getValue("kill_tracks"));
- reg->set_cut(attrs.getValue("cut"));
- reg->set_lunit(attrs.getValue("lunit"));
- reg->set_threshold(attrs.getValue("threshold"));
- reg->set_eunit(attrs.getValue("eunit"));
-
- m_obj = reg;
- *obj = reg;
- }
-
- virtual void EndElement(const std::string&) {
- }
-
- virtual void Characters(const std::string&) {
- }
-
- virtual void StackPopNotify(const std::string& name) {
- SAXObject** so = Context()->GetTopObject();
- region* r = dynamic_cast<region*>(m_obj);
- r->add_content(name, *so);
- }
-
- virtual const std::string& State() const {
- static std::string tag = "region";
- return tag;
- }
+ regionProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~regionProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ region* reg = new region;
+
+ reg->set_name(attrs.getValue("name"));
+ reg->set_storeSecondaries(attrs.getValue("store_secondaries"));
+ reg->set_killTracks(attrs.getValue("kill_tracks"));
+ reg->set_cut(attrs.getValue("cut"));
+ reg->set_lunit(attrs.getValue("lunit"));
+ reg->set_threshold(attrs.getValue("threshold"));
+ reg->set_eunit(attrs.getValue("eunit"));
+
+ m_obj = reg;
+ *obj = reg;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string& name)
+ {
+ SAXObject** so = Context()->GetTopObject();
+ region* r = dynamic_cast<region*>(m_obj);
+ r->add_content(name, *so);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "region";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(regionProcess)
diff -u -r1.17 -r1.18 --- regionSubscriber.cc 23 May 2013 21:42:41 -0000 1.17 +++ regionSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.18 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/regionSubscriber.cc,v 1.17 2013/05/23 21:42:41 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/regionSubscriber.cc,v 1.18 2013/06/24 22:10:37 jeremy Exp $
// GDML #include "Saxana/SAXSubscriber.h"
@@ -19,116 +19,110 @@
#include <sstream> /**
- @class regionSubscriber - @brief SAX subscriber for region element. - @note Creates a G4Region with user information and registers with LCDDProcessor. -*/ -class regionSubscriber : virtual public SAXSubscriber
+ @class regionSubscriber + @brief SAX subscriber for region element. + @note Creates a G4Region with user information and registers with LCDDProcessor. + */ +class regionSubscriber: virtual public SAXSubscriber
{
- public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+public:
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
- public:
- regionSubscriber()
- {
- Subscribe("region");
- }
+public:
+ regionSubscriber()
+ {
+ Subscribe("region");
+ }
- virtual void Activate(const SAXObject* object)
- {
- if (object !=0 ) {
+ virtual void Activate(const SAXObject* object)
+ {
+ if (object != 0) {
- LCDDProcessor* proc = LCDDProcessor::instance();
+ LCDDProcessor* proc = LCDDProcessor::instance();
- const region* robj = dynamic_cast<const region*>( object );
+ const region* robj = dynamic_cast<const region*>(object);
- GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
- G4Region* reg = 0;
- if ( robj ) {
- std::string name = robj->get_name();
- reg = new G4Region( name );
+ GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
+ G4Region* reg = 0;
+ if (robj) {
+ std::string name = robj->get_name();
+ reg = new G4Region(name);
- // compute prod cut - std::string lunit = robj->get_lunit(); - std::string sval = robj->get_cut(); - sval += "*" + lunit; - double cut = calc->Eval( sval );
+ // compute prod cut + std::string lunit = robj->get_lunit(); + std::string sval = robj->get_cut(); + sval += "*" + lunit; + double cut = calc->Eval(sval);
- std::string eunit = robj->get_eunit(); - sval = robj->get_threshold(); - sval += "*" + eunit; - double threshold = calc->Eval( sval );
+ std::string eunit = robj->get_eunit(); + sval = robj->get_threshold(); + sval += "*" + eunit; + double threshold = calc->Eval(sval);
- // set production cut - std::string store_seco = robj->get_storeSecondaries(); - G4ProductionCuts* prod_cuts = new G4ProductionCuts(); - prod_cuts->SetProductionCut( cut ); - reg->SetProductionCuts( prod_cuts );
+ // set production cut + std::string store_seco = robj->get_storeSecondaries(); + G4ProductionCuts* prod_cuts = new G4ProductionCuts(); + prod_cuts->SetProductionCut(cut); + reg->SetProductionCuts(prod_cuts);
- // create region info with storeSecondaries flag - G4UserRegionInformation* reg_info = new G4UserRegionInformation();
+ // create region info with storeSecondaries flag + G4UserRegionInformation* reg_info = new G4UserRegionInformation();
- // set storeSeco - reg_info->setStoreSecondaries( StringUtil::toBool( store_seco ) );
+ // set storeSeco + reg_info->setStoreSecondaries(StringUtil::toBool(store_seco));
- std::string killTracks = robj->get_killTracks(); - //std::cout << "regionSubscriber.killTracks: " << killTracks << std::endl; - reg_info->setKillTracks(StringUtil::toBool(killTracks)); - //std::cout << "regInfo.killTracsk: " << reg_info << std::endl;
+ std::string killTracks = robj->get_killTracks(); + //std::cout << "regionSubscriber.killTracks: " << killTracks << std::endl; + reg_info->setKillTracks(StringUtil::toBool(killTracks)); + //std::cout << "regInfo.killTracsk: " << reg_info << std::endl;
- // set threshold - reg_info->setThreshold( threshold );
+ // set threshold + reg_info->setThreshold(threshold);
- // set info in region - reg->SetUserInformation( reg_info );
+ // set info in region + reg->SetUserInformation(reg_info);
- // get content - const ContentSequence* seq = robj->get_content();
+ // get content + const ContentSequence* seq = robj->get_content();
- // get size of content - size_t count = seq->size();
+ // get size of content + size_t count = seq->size();
- // iterate over and process content
- for ( size_t i =0; i < count; i++ ) {
+ // iterate over and process content
+ for (size_t i = 0; i < count; i++) {
- if ( seq->content(i).tag == "limitsetref" ) {
+ if (seq->content(i).tag == "limitsetref") {
- LimitSetType::limitsetref* limitsetref = - dynamic_cast<LimitSetType::limitsetref*> ( seq->content(i).object );
+ LimitSetType::limitsetref* limitsetref = dynamic_cast<LimitSetType::limitsetref*>(seq->content(i).object);
- G4UserLimits* ulim = - dynamic_cast<G4LimitSet*> ( proc->getLimitSet( limitsetref->get_ref() ) );
+ G4UserLimits* ulim = dynamic_cast<G4LimitSet*>(proc->getLimitSet(limitsetref->get_ref()));
- if ( ulim ) {
+ if (ulim) {
#ifdef HAVE_G4REGION_SETUSERLIMITS
- reg->SetUserLimits( ulim ); - std::cout << "Set user limits <" << limitsetref->get_ref() << "> on region <" << name << ">" << std::endl;
+ reg->SetUserLimits( ulim ); + std::cout << "Set user limits <" << limitsetref->get_ref() << "> on region <" << name << ">" << std::endl;
#else
- std::cerr << "WARNING: Ignoring limitsetref on region. The method G4Region::SetUserLimits is not supported by your Geant4 version." << std::endl;
+ std::cerr << "WARNING: Ignoring limitsetref on region. The method G4Region::SetUserLimits is not supported by your Geant4 version." << std::endl;
#endif
- }
- else {
- std::cerr << "FATAL ERROR: limit element not found - " << limitsetref->get_ref() << std::endl;
- G4Exception("", "", FatalException, "limitsetref not found.");
- }
- }
- else {
- std::cerr << "Bad content to region tag: " << seq->content(i).tag << std::endl;
+ } else {
+ std::cerr << "FATAL ERROR: limit element not found - " << limitsetref->get_ref() << std::endl;
+ G4Exception("", "", FatalException, "limitsetref not found.");
}
+ } else {
+ std::cerr << "Bad content to region tag: " << seq->content(i).tag << std::endl;
}
-
- // register with processor
- LCDDProcessor::instance()->addRegion( name, reg );
- }
- else
- {
- std::cerr << "Failed cast to region!" << std::endl;
}
+
+ // register with processor
+ LCDDProcessor::instance()->addRegion(name, reg);
+ } else {
+ std::cerr << "Failed cast to region!" << std::endl;
}
}
+ }
}; DECLARE_SUBSCRIBER_FACTORY(regionSubscriber)
diff -u -r1.4 -r1.5 --- regionrefProcess.cc 5 Jun 2006 17:41:30 -0000 1.4 +++ regionrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.5 @@ -1,47 +1,48 @@
-// $Header: /cvs/lcd/lcdd/src/regionrefProcess.cc,v 1.4 2006/06/05 17:41:30 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/regionrefProcess.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
#include "Processes/ReferenceTypeProcess.h" #include "RegionType.hh" /**
- @class regionrefProcess - @brief SAX process for regionref element. - @note Extends ReferenceTypeProcess for reference to region element.
+ @class regionrefProcess + @brief SAX process for regionref element. + @note Extends ReferenceTypeProcess for reference to region element.
*/
-class regionrefProcess : public ReferenceTypeProcess
+class regionrefProcess: public ReferenceTypeProcess
{
public:
- regionrefProcess(const ProcessingContext* context = 0)
- : ReferenceTypeProcess(context)
- {}
-
- virtual ~regionrefProcess()
- {}
-
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
-
- RegionType::regionref* regref =
- new RegionType::regionref;
-
- *obj = regref;
- m_obj = regref;
-
- ReferenceTypeProcess::StartElement(name, attrs);
- }
-
- virtual void EndElement(const std::string& name)
- {
- ReferenceTypeProcess::EndElement(name);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "regionref";
- return tag;
- }
+ regionrefProcess(const ProcessingContext* context = 0) :
+ ReferenceTypeProcess(context)
+ {
+ }
+
+ virtual ~regionrefProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ RegionType::regionref* regref = new RegionType::regionref;
+
+ *obj = regref;
+ m_obj = regref;
+
+ ReferenceTypeProcess::StartElement(name, attrs);
+ }
+
+ virtual void EndElement(const std::string& name)
+ {
+ ReferenceTypeProcess::EndElement(name);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "regionref";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(regionrefProcess)
diff -u -r1.4 -r1.5 --- rz_field_mapProcess.cc 5 Jun 2006 17:41:30 -0000 1.4 +++ rz_field_mapProcess.cc 24 Jun 2013 22:10:37 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/rz_field_mapProcess.cc,v 1.4 2006/06/05 17:41:30 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/rz_field_mapProcess.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
#include "FieldMapTypeProcess.hh" #include "rz_field_map.hh" #include <iostream>
@@ -8,61 +8,65 @@
* @class rz_field_map_Process * @brief Processor for rz_field_map elements. */
-class rz_field_mapProcess : public FieldMapTypeProcess
+class rz_field_mapProcess: public FieldMapTypeProcess
{
public:
- rz_field_mapProcess(const ProcessingContext* context = 0)
- : FieldMapTypeProcess(context)
- {}
-
- virtual ~rz_field_mapProcess()
- {}
-
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
- // std::cout << "rz_field_mapProcess::StartElement - " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- rz_field_map* rzmap = new rz_field_map;
+ rz_field_mapProcess(const ProcessingContext* context = 0) :
+ FieldMapTypeProcess(context)
+ {
+ }
- /* set attributes */
- rzmap->set_num_bins_r(attrs.getValue("num_bins_r"));
- rzmap->set_grid_size_r(attrs.getValue("grid_size_r"));
- rzmap->set_num_bins_z(attrs.getValue("num_bins_z"));
- rzmap->set_grid_size_z(attrs.getValue("grid_size_z"));
+ virtual ~rz_field_mapProcess()
+ {
+ }
- /* Top-level caller needs to setup the SAXObject references. */ - m_obj = rzmap; - *obj = rzmap;
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ // std::cout << "rz_field_mapProcess::StartElement - " << name << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ rz_field_map* rzmap = new rz_field_map;
+
+ /* set attributes */
+ rzmap->set_num_bins_r(attrs.getValue("num_bins_r"));
+ rzmap->set_grid_size_r(attrs.getValue("grid_size_r"));
+ rzmap->set_num_bins_z(attrs.getValue("num_bins_z"));
+ rzmap->set_grid_size_z(attrs.getValue("grid_size_z"));
+
+ /* Top-level caller needs to setup the SAXObject references. */
+ m_obj = rzmap;
+ *obj = rzmap;
- /* Call next process UP in inheritance chain, after the SAXObject is set. */ - FieldMapTypeProcess::StartElement(name, attrs); - }
+ /* Call next process UP in inheritance chain, after the SAXObject is set. */ + FieldMapTypeProcess::StartElement(name, attrs); + }
- 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)
- {
- // std::cout << "rz_field_mapProcess::StackPopNotify" << std::endl;
+ virtual void StackPopNotify(const std::string& name)
+ {
+ // std::cout << "rz_field_mapProcess::StackPopNotify" << std::endl;
+
+ if (name != "rzB") {
+ std::cerr << name << " is not a valid child element for rz_field_map." << std::endl;
+ exit(1);
+ }
- if ( name != "rzB" ) {
- std::cerr << name << " is not a valid child element for rz_field_map." << std::endl;
- exit(1);
+ FieldMapTypeProcess::StackPopNotify(name);
}
- FieldMapTypeProcess::StackPopNotify(name);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "rz_field_map";
- return tag;
- }
+ virtual const std::string& State() const
+ {
+ static std::string tag = "rz_field_map";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(rz_field_mapProcess)
diff -u -r1.7 -r1.8 --- rz_field_mapSubscriber.cc 1 Feb 2012 10:28:56 -0000 1.7 +++ rz_field_mapSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/rz_field_mapSubscriber.cc,v 1.7 2012/02/01 10:28:56 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/rz_field_mapSubscriber.cc,v 1.8 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/SAXSubscriber.h" #include "Saxana/SAXComponentFactory.h"
@@ -14,112 +14,109 @@
* @class rz_field_mapSubscriber * @brief Subscriber for rz_field_map elements. */
-class rz_field_mapSubscriber : virtual public SAXSubscriber
+class rz_field_mapSubscriber: virtual public SAXSubscriber
{
public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- rz_field_mapSubscriber()
- {
- Subscribe("rz_field_map");
- }
-
- virtual ~rz_field_mapSubscriber()
- {}
-
- /** Instantiates a G4RZFieldMap object into Geant4 runtime. */
- virtual void Activate(const SAXObject* object)
- {
- //std::cout << "rz_field_mapSubscriber" << std::endl;
-
- if ( object != 0 ) {
-
- GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
-
- const rz_field_map* obj = dynamic_cast<const rz_field_map*>(object);
-
- if ( obj ) {
- std::string lunit = obj->get_lunit();
- std::string funit = obj->get_funit();
- std::string name = obj->get_name();
-
- int numBinsR, numBinsZ;
- double gridSizeR, gridSizeZ;
-
- std::string sval = obj->get_num_bins_r();
- numBinsR = (int)calc->Eval(sval);
-
- sval = obj->get_num_bins_z();
- numBinsZ = (int)calc->Eval(sval);
-
- sval = obj->get_grid_size_r();
- sval += "*" + lunit;
- gridSizeR = calc->Eval(sval);
-
- sval = obj->get_grid_size_z();
- sval += "*" + lunit;
- gridSizeZ = calc->Eval(sval);
-
- /* Make list of RZB rows from content. */
- const ContentSequence* seq = obj->get_content();
- size_t count = seq->size();
- std::vector<RZBData> fieldData;
-
- for ( size_t i=0; i<count; i++ ) {
-
- if ( seq->content(i).tag == "rzB" ) {
-
- rzb* row = dynamic_cast<rzb*>(seq->content(i).object);
-
- if ( row != 0 ) {
-
- std::string sr = row->get_r();
- std::string sz = row->get_z();
- std::string sBr = row->get_Br();
- std::string sBz = row->get_Bz();
-
- std::string sval = sr;
- sval += "*" + lunit;
- double r = calc->Eval(sval);
-
- sval = sz;
- sval += "*" + lunit;
- double z = calc->Eval(sval);
-
- sval = sBr;
- sval += "*" + funit;
- double Br = calc->Eval(sval);
-
- sval = sBz;
- sval += "*" + funit;
- double Bz = calc->Eval(sval);
-
- fieldData.push_back(RZBData(r, z, Br, Bz));
- }
- else {
- G4Exception("", "", FatalException, "Failed cast to rzB.");
- }
- }
- else {
- G4cerr << "WARNING: Ignoring unknown element " << seq->content(i).tag << "." << std::endl;
- }
- }
-
- G4RZFieldMap* fmap = new G4RZFieldMap(numBinsR, numBinsZ, gridSizeR, gridSizeZ, fieldData);
- LCDDProcessor::instance()->addMagneticField(name, fmap);
- }
- else {
- G4Exception("", "", FatalException, "Failed cast to rz_field_map.");
- }
+ rz_field_mapSubscriber()
+ {
+ Subscribe("rz_field_map");
+ }
+
+ virtual ~rz_field_mapSubscriber()
+ {
}
- else {
- G4Exception("", "", FatalException, "SAXObject is null.");
+
+ /** Instantiates a G4RZFieldMap object into Geant4 runtime. */
+ virtual void Activate(const SAXObject* object)
+ {
+ //std::cout << "rz_field_mapSubscriber" << std::endl;
+
+ if (object != 0) {
+
+ GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
+
+ const rz_field_map* obj = dynamic_cast<const rz_field_map*>(object);
+
+ if (obj) {
+ std::string lunit = obj->get_lunit();
+ std::string funit = obj->get_funit();
+ std::string name = obj->get_name();
+
+ int numBinsR, numBinsZ;
+ double gridSizeR, gridSizeZ;
+
+ std::string sval = obj->get_num_bins_r();
+ numBinsR = (int) calc->Eval(sval);
+
+ sval = obj->get_num_bins_z();
+ numBinsZ = (int) calc->Eval(sval);
+
+ sval = obj->get_grid_size_r();
+ sval += "*" + lunit;
+ gridSizeR = calc->Eval(sval);
+
+ sval = obj->get_grid_size_z();
+ sval += "*" + lunit;
+ gridSizeZ = calc->Eval(sval);
+
+ /* Make list of RZB rows from content. */
+ const ContentSequence* seq = obj->get_content();
+ size_t count = seq->size();
+ std::vector<RZBData> fieldData;
+
+ for (size_t i = 0; i < count; i++) {
+
+ if (seq->content(i).tag == "rzB") {
+
+ rzb* row = dynamic_cast<rzb*>(seq->content(i).object);
+
+ if (row != 0) {
+
+ std::string sr = row->get_r();
+ std::string sz = row->get_z();
+ std::string sBr = row->get_Br();
+ std::string sBz = row->get_Bz();
+
+ std::string sval = sr;
+ sval += "*" + lunit;
+ double r = calc->Eval(sval);
+
+ sval = sz;
+ sval += "*" + lunit;
+ double z = calc->Eval(sval);
+
+ sval = sBr;
+ sval += "*" + funit;
+ double Br = calc->Eval(sval);
+
+ sval = sBz;
+ sval += "*" + funit;
+ double Bz = calc->Eval(sval);
+
+ fieldData.push_back(RZBData(r, z, Br, Bz));
+ } else {
+ G4Exception("", "", FatalException, "Failed cast to rzB.");
+ }
+ } else {
+ G4cerr << "WARNING: Ignoring unknown element " << seq->content(i).tag << "." << std::endl;
+ }
+ }
+
+ G4RZFieldMap* fmap = new G4RZFieldMap(numBinsR, numBinsZ, gridSizeR, gridSizeZ, fieldData);
+ LCDDProcessor::instance()->addMagneticField(name, fmap);
+ } else {
+ G4Exception("", "", FatalException, "Failed cast to rz_field_map.");
+ }
+ } else {
+ G4Exception("", "", FatalException, "SAXObject is null.");
+ }
}
- }
}; DECLARE_SUBSCRIBER_FACTORY(rz_field_mapSubscriber)
diff -u -r1.2 -r1.3 --- rzbProcess.cc 5 Jun 2006 17:41:31 -0000 1.2 +++ rzbProcess.cc 24 Jun 2013 22:10:37 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/rzbProcess.cc,v 1.2 2006/06/05 17:41:31 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/rzbProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h" #include "Saxana/SAXProcessor.h"
@@ -16,58 +16,62 @@
* @brief Processor for rzB elements. */
-class rzbProcess : public SAXStateProcess
+class rzbProcess: public SAXStateProcess
{
public:
- rzbProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~rzbProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "rzbProcess::StartElement" << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- rzb* row = new rzb;
-
- row->set_r(attrs.getValue("r"));
- row->set_z(attrs.getValue("z"));
- row->set_Br(attrs.getValue("Br"));
- row->set_Bz(attrs.getValue("Bz"));
-
- m_obj = row;
- *obj = row;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "rzB";
- return tag;
- }
+ rzbProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~rzbProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "rzbProcess::StartElement" << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ rzb* row = new rzb;
+
+ row->set_r(attrs.getValue("r"));
+ row->set_z(attrs.getValue("z"));
+ row->set_Br(attrs.getValue("Br"));
+ row->set_Bz(attrs.getValue("Bz"));
+
+ m_obj = row;
+ *obj = row;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "rzB";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
};
diff -u -r1.1 -r1.2 --- scorerProcess.cc 5 Jul 2005 20:35:54 -0000 1.1 +++ scorerProcess.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -12,55 +12,56 @@
#include <iostream> /**
- @class scorerProcess - @brief SAX process for scorer element. -*/ -class scorerProcess : public SensitiveDetectorTypeProcess
+ @class scorerProcess + @brief SAX process for scorer element. + */ +class scorerProcess: public SensitiveDetectorTypeProcess
{
public:
- scorerProcess( const ProcessingContext* context = 0)
- : SensitiveDetectorTypeProcess(context)
- {}
-
- virtual ~scorerProcess()
- {}
-
- virtual void StartElement( const std::string& name, const ASCIIAttributeList& attrs)
- {
- //std::cout << "PROCESS::START OF TAG : " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
-
- scorer* scr = new scorer;
- /*
- scr->set_kill_tracks(attrs.getValue("kill_tracks") );
- */
-
- m_obj = scr;
- *obj = scr;
-
- SensitiveDetectorTypeProcess::StartElement(name, attrs);
- }
-
- virtual void EndElement(const std::string&)
- {
- //std::cout << "PROCESS::END OF TAG : " << name << " " << std::endl;
-
- //SensitiveDetectorTypeProcess::EndElement( name );
- }
-
- virtual void StackPopNotify(const std::string& name)
- {
- SensitiveDetectorTypeProcess::StackPopNotify( name );
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "scorer";
- return tag;
- }
+ scorerProcess(const ProcessingContext* context = 0) :
+ SensitiveDetectorTypeProcess(context)
+ {
+ }
+
+ virtual ~scorerProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "PROCESS::START OF TAG : " << name << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ scorer* scr = new scorer;
+ /*
+ scr->set_kill_tracks(attrs.getValue("kill_tracks") );
+ */
+
+ m_obj = scr;
+ *obj = scr;
+
+ SensitiveDetectorTypeProcess::StartElement(name, attrs);
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ //std::cout << "PROCESS::END OF TAG : " << name << " " << std::endl;
+
+ //SensitiveDetectorTypeProcess::EndElement( name );
+ }
+
+ virtual void StackPopNotify(const std::string& name)
+ {
+ SensitiveDetectorTypeProcess::StackPopNotify(name);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "scorer";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(scorerProcess)
diff -u -r1.2 -r1.3 --- scorerSubscriber.cc 5 Jul 2007 22:27:18 -0000 1.2 +++ scorerSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.3 @@ -10,31 +10,32 @@
#include <iostream> /**
- @class scorerSubscriber - @brief SAX subscriber for scorer element. - @note Delegates to SensitiveDetectorFactory to create G4ScorerSD. -*/ -class scorerSubscriber : virtual public SAXSubscriber
+ @class scorerSubscriber + @brief SAX subscriber for scorer element. + @note Delegates to SensitiveDetectorFactory to create G4ScorerSD. + */ +class scorerSubscriber: virtual public SAXSubscriber
{
public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- scorerSubscriber()
- {
- Subscribe("scorer");
- }
+ scorerSubscriber()
+ {
+ Subscribe("scorer");
+ }
- virtual ~scorerSubscriber()
- {}
+ virtual ~scorerSubscriber()
+ {
+ }
- virtual void Activate(const SAXObject* object)
- {
- SensitiveDetectorFactory::createSensitiveDetector(object);
- }
+ virtual void Activate(const SAXObject* object)
+ {
+ SensitiveDetectorFactory::createSensitiveDetector(object);
+ }
}; DECLARE_SUBSCRIBER_FACTORY(scorerSubscriber)
diff -u -r1.5 -r1.6 --- sdrefProcess.cc 5 Jun 2006 17:41:31 -0000 1.5 +++ sdrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/sdrefProcess.cc,v 1.5 2006/06/05 17:41:31 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/sdrefProcess.cc,v 1.6 2013/06/24 22:10:37 jeremy Exp $
#include "Processes/ReferenceTypeProcess.h" #include "SensitiveDetectorType.hh"
@@ -6,43 +6,44 @@
#include <iostream> /**
- @class sdrefProcess - @brief SAX process for sdref element. - @note Extends ReferenceTypeProcess for reference to sd element. -*/ -class sdrefProcess : public ReferenceTypeProcess
+ @class sdrefProcess + @brief SAX process for sdref element. + @note Extends ReferenceTypeProcess for reference to sd element. + */ +class sdrefProcess: public ReferenceTypeProcess
{
public:
- sdrefProcess(const ProcessingContext* context = 0)
- : ReferenceTypeProcess(context)
- {}
-
- virtual ~sdrefProcess()
- {}
-
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
-
- SensitiveDetectorType::sdref* s =
- new SensitiveDetectorType::sdref;
-
- *obj = s;
- m_obj = s;
-
- ReferenceTypeProcess::StartElement(name, attrs);
- }
-
- virtual void EndElement(const std::string& name)
- {
- ReferenceTypeProcess::EndElement(name);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "sdref";
- return tag;
- }
+ sdrefProcess(const ProcessingContext* context = 0) :
+ ReferenceTypeProcess(context)
+ {
+ }
+
+ virtual ~sdrefProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ SensitiveDetectorType::sdref* s = new SensitiveDetectorType::sdref;
+
+ *obj = s;
+ m_obj = s;
+
+ ReferenceTypeProcess::StartElement(name, attrs);
+ }
+
+ virtual void EndElement(const std::string& name)
+ {
+ ReferenceTypeProcess::EndElement(name);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "sdref";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(sdrefProcess)
diff -u -r1.4 -r1.5 --- solenoidProcess.cc 29 Aug 2005 23:22:08 -0000 1.4 +++ solenoidProcess.cc 24 Jun 2013 22:10:37 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/solenoidProcess.cc,v 1.4 2005/08/29 23:22:08 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/solenoidProcess.cc,v 1.5 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -14,60 +14,63 @@
#include <iostream> /**
- @class solenoidProcess - @brief SAX process for solenoid element. - @note Extends FieldTypeProcess. -*/ -class solenoidProcess : public FieldTypeProcess
+ @class solenoidProcess + @brief SAX process for solenoid element. + @note Extends FieldTypeProcess. + */ +class solenoidProcess: public FieldTypeProcess
{
public:
- solenoidProcess(const ProcessingContext* context = 0)
- : FieldTypeProcess(context)
- {}
-
- virtual ~solenoidProcess()
- {}
-
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
- //std::cout << "solenoidProcess::StartElement: " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- solenoid* sol = new solenoid;
-
- sol->set_innerField( attrs.getValue( "inner_field" ) );
- sol->set_outerField( attrs.getValue( "outer_field" ) );
- sol->set_zmin( attrs.getValue( "zmin" ) );
- sol->set_zmax( attrs.getValue( "zmax" ) );
- sol->set_innerRadius( attrs.getValue( "inner_radius" ) );
- sol->set_outerRadius( attrs.getValue( "outer_radius" ) );
-
- m_obj = sol;
- *obj = sol;
-
- FieldTypeProcess::StartElement(name, attrs);
- }
-
- virtual void EndElement(const std::string&)
- {
- //std::cout << "solenoidProcess::EndElement: " << name << " " << std::endl;
- }
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string&)
- {
- //std::cout << "calorimeterProcess::StackPopNotify: " << name << std::endl;
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "solenoid";
- return tag;
- }
+ solenoidProcess(const ProcessingContext* context = 0) :
+ FieldTypeProcess(context)
+ {
+ }
+
+ virtual ~solenoidProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "solenoidProcess::StartElement: " << name << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ solenoid* sol = new solenoid;
+
+ sol->set_innerField(attrs.getValue("inner_field"));
+ sol->set_outerField(attrs.getValue("outer_field"));
+ sol->set_zmin(attrs.getValue("zmin"));
+ sol->set_zmax(attrs.getValue("zmax"));
+ sol->set_innerRadius(attrs.getValue("inner_radius"));
+ sol->set_outerRadius(attrs.getValue("outer_radius"));
+
+ m_obj = sol;
+ *obj = sol;
+
+ FieldTypeProcess::StartElement(name, attrs);
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ //std::cout << "solenoidProcess::EndElement: " << name << " " << std::endl;
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string&)
+ {
+ //std::cout << "calorimeterProcess::StackPopNotify: " << name << std::endl;
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "solenoid";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(solenoidProcess)
diff -u -r1.7 -r1.8 --- solenoidSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.7 +++ solenoidSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/solenoidSubscriber.cc,v 1.7 2006/03/30 19:43:58 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/solenoidSubscriber.cc,v 1.8 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/SAXSubscriber.h" #include "Saxana/SAXComponentFactory.h"
@@ -16,90 +16,89 @@
#include "G4Solenoid.hh" /**
- @class solenoidSubscriber - @brief SAX subscriber for solenoid element. - @note Creates a G4Solenoid object and registers with LCDDProcessor. -*/ -class solenoidSubscriber : virtual public SAXSubscriber
+ @class solenoidSubscriber + @brief SAX subscriber for solenoid element. + @note Creates a G4Solenoid object and registers with LCDDProcessor. + */ +class solenoidSubscriber: virtual public SAXSubscriber
{
public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- solenoidSubscriber()
- {
- Subscribe("solenoid");
- }
-
- virtual ~solenoidSubscriber()
- {}
-
- virtual void Activate(const SAXObject* object)
- {
- //std::cout << "solenoidSubscriber" << std::endl;
-
- GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
- if ( object != 0 ) {
- const solenoid* obj = dynamic_cast<const solenoid*>( object );
-
- if ( obj ) {
- //std::cout << "GOT SOLENOID: " << obj->get_name() << std::endl;
-
- double outer_field, inner_field;
- double zmin, zmax;
- double inner_radius, outer_radius;
-
- std::string lunit = obj->get_lunit();
- std::string funit = obj->get_funit();
-
- std::string sval = obj->get_innerField();
- sval += "*" + funit;
- inner_field = calc->Eval( sval );
-
- sval = obj->get_outerField();
- sval += "*" + funit;
- outer_field = calc->Eval( sval );
-
- sval = obj->get_zmin();
- sval += "*" + lunit;
- zmin = calc->Eval( sval );
-
- sval = obj->get_zmax();
- sval += "*" + lunit;
- zmax = calc->Eval( sval );
-
- sval = obj->get_innerRadius();
- sval += "*" + lunit;
- inner_radius = calc->Eval( sval );
-
- sval = obj->get_outerRadius();
- sval += "*" + lunit;
- outer_radius = calc->Eval( sval );
-
- G4Solenoid* sol = new G4Solenoid();
-
- sol->setInnerField(inner_field);
- sol->setOuterField(outer_field);
- sol->setInnerZ(zmin);
- sol->setOuterZ(zmax);
- sol->setInnerR(inner_radius);
- sol->setOuterR(outer_radius);
-
- std::string field_name = obj->get_name();
- LCDDProcessor::instance()->addMagneticField( field_name, sol );
- }
- else {
- std::cerr << "Failed cast to solenoid!" << std::endl;
- }
+ solenoidSubscriber()
+ {
+ Subscribe("solenoid");
+ }
+
+ virtual ~solenoidSubscriber()
+ {
}
- //delete object; - }
+ virtual void Activate(const SAXObject* object)
+ {
+ //std::cout << "solenoidSubscriber" << std::endl;
+
+ GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
+ if (object != 0) {
+ const solenoid* obj = dynamic_cast<const solenoid*>(object);
+
+ if (obj) {
+ //std::cout << "GOT SOLENOID: " << obj->get_name() << std::endl;
+
+ double outer_field, inner_field;
+ double zmin, zmax;
+ double inner_radius, outer_radius;
+
+ std::string lunit = obj->get_lunit();
+ std::string funit = obj->get_funit();
+
+ std::string sval = obj->get_innerField();
+ sval += "*" + funit;
+ inner_field = calc->Eval(sval);
+
+ sval = obj->get_outerField();
+ sval += "*" + funit;
+ outer_field = calc->Eval(sval);
+
+ sval = obj->get_zmin();
+ sval += "*" + lunit;
+ zmin = calc->Eval(sval);
+
+ sval = obj->get_zmax();
+ sval += "*" + lunit;
+ zmax = calc->Eval(sval);
+
+ sval = obj->get_innerRadius();
+ sval += "*" + lunit;
+ inner_radius = calc->Eval(sval);
+
+ sval = obj->get_outerRadius();
+ sval += "*" + lunit;
+ outer_radius = calc->Eval(sval);
+
+ G4Solenoid* sol = new G4Solenoid();
+
+ sol->setInnerField(inner_field);
+ sol->setOuterField(outer_field);
+ sol->setInnerZ(zmin);
+ sol->setOuterZ(zmax);
+ sol->setInnerR(inner_radius);
+ sol->setOuterR(outer_radius);
+
+ std::string field_name = obj->get_name();
+ LCDDProcessor::instance()->addMagneticField(field_name, sol);
+ } else {
+ std::cerr << "Failed cast to solenoid!" << std::endl;
+ }
+ }
+
+ //delete object;
+ }
}; DECLARE_SUBSCRIBER_FACTORY(solenoidSubscriber)
-
diff -u -r1.6 -r1.7 --- trackerProcess.cc 7 Apr 2005 21:52:31 -0000 1.6 +++ trackerProcess.cc 24 Jun 2013 22:10:37 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/trackerProcess.cc,v 1.6 2005/04/07 21:52:31 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/trackerProcess.cc,v 1.7 2013/06/24 22:10:37 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h" #include "Saxana/ProcessingContext.h"
@@ -14,52 +14,54 @@
#include <iostream> /**
- @class trackerProcess - @brief SAX process for tracker element. -*/ -class trackerProcess : public SensitiveDetectorTypeProcess
+ @class trackerProcess + @brief SAX process for tracker element. + */ +class trackerProcess: public SensitiveDetectorTypeProcess
{
public:
- trackerProcess( const ProcessingContext* context = 0)
- : SensitiveDetectorTypeProcess(context)
- {}
-
- virtual ~trackerProcess()
- {}
-
- virtual void StartElement( const std::string& name, const ASCIIAttributeList& attrs)
- {
- //std::cout << "PROCESS::START OF TAG : " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- tracker* trk = new tracker;
- trk->set_combine_hits(attrs.getValue("combine_hits") );
-
- m_obj = trk;
- *obj = trk;
-
- SensitiveDetectorTypeProcess::StartElement(name, attrs);
- }
-
- virtual void EndElement(const std::string&)
- {
- //std::cout << "PROCESS::END OF TAG : " << name << " " << std::endl;
-
- //SensitiveDetectorTypeProcess::EndElement( name );
- }
-
- virtual void StackPopNotify(const std::string& name)
- {
- SensitiveDetectorTypeProcess::StackPopNotify( name );
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "tracker";
- return tag;
- }
+ trackerProcess(const ProcessingContext* context = 0) :
+ SensitiveDetectorTypeProcess(context)
+ {
+ }
+
+ virtual ~trackerProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "PROCESS::START OF TAG : " << name << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ tracker* trk = new tracker;
+ trk->set_combine_hits(attrs.getValue("combine_hits"));
+
+ m_obj = trk;
+ *obj = trk;
+
+ SensitiveDetectorTypeProcess::StartElement(name, attrs);
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ //std::cout << "PROCESS::END OF TAG : " << name << " " << std::endl;
+
+ //SensitiveDetectorTypeProcess::EndElement( name );
+ }
+
+ virtual void StackPopNotify(const std::string& name)
+ {
+ SensitiveDetectorTypeProcess::StackPopNotify(name);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "tracker";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(trackerProcess)
diff -u -r1.8 -r1.9 --- trackerSubscriber.cc 5 Jul 2005 20:35:16 -0000 1.8 +++ trackerSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.9 @@ -10,31 +10,32 @@
#include <iostream> /**
- @class trackerSubscriber - @brief SAX subscriber for tracker element. - @note Delegates to SensitiveDetectorFactory to create G4TrackerSD. -*/ -class trackerSubscriber : virtual public SAXSubscriber
+ @class trackerSubscriber + @brief SAX subscriber for tracker element. + @note Delegates to SensitiveDetectorFactory to create G4TrackerSD. + */ +class trackerSubscriber: virtual public SAXSubscriber
{
public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- trackerSubscriber()
- {
- Subscribe("tracker");
- }
+ trackerSubscriber()
+ {
+ Subscribe("tracker");
+ }
- virtual ~trackerSubscriber()
- {}
+ virtual ~trackerSubscriber()
+ {
+ }
- virtual void Activate(const SAXObject* object)
- {
- SensitiveDetectorFactory::createSensitiveDetector( object );
- }
+ virtual void Activate(const SAXObject* object)
+ {
+ SensitiveDetectorFactory::createSensitiveDetector(object);
+ }
}; DECLARE_SUBSCRIBER_FACTORY(trackerSubscriber)
diff -u -r1.1 -r1.2 --- unsegmented_calorimeterProcess.cc 7 Dec 2010 00:52:00 -0000 1.1 +++ unsegmented_calorimeterProcess.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/unsegmented_calorimeterProcess.cc,v 1.1 2010/12/07 00:52:00 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/unsegmented_calorimeterProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
#include "calorimeterProcess.hh"
@@ -15,25 +15,27 @@
#include <iostream> /**
- @class unsegmented_calorimeterProcess - @brief SAX process for unsegmented_calorimeter element. - @note Calls SAX processor for SensitiveDetectorTypeProcess parent class. -*/ -class unsegmented_calorimeterProcess : public calorimeterProcess
+ @class unsegmented_calorimeterProcess + @brief SAX process for unsegmented_calorimeter element. + @note Calls SAX processor for SensitiveDetectorTypeProcess parent class. + */ +class unsegmented_calorimeterProcess: public calorimeterProcess
{
public:
- unsegmented_calorimeterProcess(const ProcessingContext* context = 0)
- : calorimeterProcess(context)
- {}
-
- virtual ~unsegmented_calorimeterProcess()
- {}
-
- virtual const std::string& State() const
- {
- static std::string tag = "unsegmented_calorimeter";
- return tag;
- }
+ unsegmented_calorimeterProcess(const ProcessingContext* context = 0) :
+ calorimeterProcess(context)
+ {
+ }
+
+ virtual ~unsegmented_calorimeterProcess()
+ {
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "unsegmented_calorimeter";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(unsegmented_calorimeterProcess)
diff -u -r1.2 -r1.3 --- unsegmented_calorimeterSubscriber.cc 7 Dec 2010 01:03:50 -0000 1.2 +++ unsegmented_calorimeterSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/unsegmented_calorimeterSubscriber.cc,v 1.2 2010/12/07 01:03:50 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/unsegmented_calorimeterSubscriber.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
// GDML #include "Saxana/SAXSubscriber.h"
@@ -13,28 +13,28 @@
*/
class unsegmented_calorimeterSubscriber: virtual public SAXSubscriber
{
- public:
+public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- public:
-
- unsegmented_calorimeterSubscriber()
- {
- Subscribe( "unsegmented_calorimeter" );
- }
-
- virtual ~unsegmented_calorimeterSubscriber()
- {
- }
-
- virtual void Activate( const SAXObject* object )
- {
- SensitiveDetectorFactory::createSensitiveDetector( object );
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+public:
+
+ unsegmented_calorimeterSubscriber()
+ {
+ Subscribe("unsegmented_calorimeter");
+ }
+
+ virtual ~unsegmented_calorimeterSubscriber()
+ {
+ }
+
+ virtual void Activate(const SAXObject* object)
+ {
+ SensitiveDetectorFactory::createSensitiveDetector(object);
+ }
};
-DECLARE_SUBSCRIBER_FACTORY( unsegmented_calorimeterSubscriber )
+DECLARE_SUBSCRIBER_FACTORY(unsegmented_calorimeterSubscriber)
diff -u -r1.1 -r1.2 --- visProcess.cc 25 Mar 2005 01:20:07 -0000 1.1 +++ visProcess.cc 24 Jun 2013 22:10:37 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/visProcess.cc,v 1.1 2005/03/25 01:20:07 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/visProcess.cc,v 1.2 2013/06/24 22:10:37 jeremy Exp $
// LCDD #include "vis.hh"
@@ -16,67 +16,70 @@
#include <iostream> /**
- @class visProcess - @brief SAX process for vis element. -*/ -class visProcess : public SAXStateProcess
+ @class visProcess + @brief SAX process for vis element. + */ +class visProcess: public SAXStateProcess
{
public:
- visProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~visProcess()
- {}
-
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
- {
- //std::cout << "visProcess::StartElement()" << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- vis* v = new vis;
-
- v->set_name( attrs.getValue("name") );
- v->set_visible( attrs.getValue("visible" ) );
- v->set_show_daughters( attrs.getValue("show_daughters" ) );
- v->set_line_style( attrs.getValue("line_style" ) );
- v->set_drawing_style( attrs.getValue("drawing_style" ) );
-
- m_obj = v;
- *obj = v;
- }
-
- virtual void EndElement(const std::string&)
- {}
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string& name)
- {
- // add all content
- SAXObject** so = Context()->GetTopObject();
- vis* v = dynamic_cast<vis*>( m_obj );
- v->add_content( name, *so);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "vis";
- return tag;
- }
+ visProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~visProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "visProcess::StartElement()" << std::endl;
+
+ SAXObject** obj = Context()->GetTopObject();
+
+ vis* v = new vis;
+
+ v->set_name(attrs.getValue("name"));
+ v->set_visible(attrs.getValue("visible"));
+ v->set_show_daughters(attrs.getValue("show_daughters"));
+ v->set_line_style(attrs.getValue("line_style"));
+ v->set_drawing_style(attrs.getValue("drawing_style"));
+
+ m_obj = v;
+ *obj = v;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string& name)
+ {
+ // add all content
+ SAXObject** so = Context()->GetTopObject();
+ vis* v = dynamic_cast<vis*>(m_obj);
+ v->add_content(name, *so);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "vis";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
}; DECLARE_PROCESS_FACTORY(visProcess)
diff -u -r1.2 -r1.3 --- visSubscriber.cc 22 Apr 2005 18:39:07 -0000 1.2 +++ visSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/visSubscriber.cc,v 1.2 2005/04/22 18:39:07 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/visSubscriber.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
// GDML #include "Saxana/SAXSubscriber.h"
@@ -14,131 +14,123 @@
#include "StringUtil.hh" /**
- @class visSubscriber - @brief SAX subscriber for vis element. - @note Creates and registers a G4VisAttributes object with LCDDProcessor. -*/ -class visSubscriber : virtual public SAXSubscriber
+ @class visSubscriber + @brief SAX subscriber for vis element. + @note Creates and registers a G4VisAttributes object with LCDDProcessor. + */ +class visSubscriber: virtual public SAXSubscriber
{
public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
public:
- visSubscriber()
- {
- Subscribe("vis");
- }
-
- virtual ~visSubscriber()
- {}
-
- virtual void Activate(const SAXObject* object)
- {
- //std::cout << "visSubscriber::Activate()" << std::endl;
-
- if ( object != 0 ) {
- const vis* vobj = dynamic_cast<const vis*> ( object );
-
- if ( vobj ) {
- G4VisAttributes* g4vis = new G4VisAttributes;
-
- std::string name = vobj->get_name();
- bool visible = StringUtil::toBool( vobj->get_visible() );
- bool show_daughters = StringUtil::toBool( vobj->get_show_daughters() );
- G4VisAttributes::LineStyle line = convertLineStyle( vobj->get_line_style() );
- G4VisAttributes::ForcedDrawingStyle draw = convertDrawingStyle( vobj->get_drawing_style() );
-
- g4vis->SetVisibility(visible);
- g4vis->SetDaughtersInvisible(!show_daughters);
- g4vis->SetLineStyle(line);
-
- if ( draw == G4VisAttributes::wireframe ) {
- g4vis->SetForceWireframe(true);
- }
- else if ( draw == G4VisAttributes::solid) {
- g4vis->SetForceSolid(true);
- }
-
- // set color
- bool color_set = false;
- ContentSequence* seq = const_cast<ContentSequence*> ( vobj->get_content() );
- size_t count = seq->size();
- for ( size_t i = 0; i < count; i++ ) {
- std::string child_tag = seq->content(i).tag;
- SAXObject* child_obj = seq->content(i).object;
-
- if ( child_tag == "color" ) {
- //std::cout << "handling color" << std::endl;
- color* c = dynamic_cast<color*> ( child_obj );
-
- double r = StringUtil::toDouble( c->get_R() );
- double g = StringUtil::toDouble( c->get_G() );
- double b = StringUtil::toDouble( c->get_B() );
- double alpha = StringUtil::toDouble( c->get_alpha() );
-
- //std::cout << "r g b alpha: " << r << " " << g << " " << b << " " << alpha << std::endl;
-
- g4vis->SetColor( r,
- g,
- b,
- alpha);
-
- // should be only one
- color_set = true;
- break;
- }
- }
-
- if ( !color_set ) {
- std::cerr << "WARNING: Color was not explicitly set and got the default value." << std::endl;
- }
-
- // add to proc's map
- LCDDProcessor::instance()->addVisAttributes( name, g4vis );
- }
- }
-
- //delete object;
- }
-
- static G4VisAttributes::LineStyle convertLineStyle(const std::string& s)
- {
- G4VisAttributes::LineStyle l = G4VisAttributes::unbroken;
-
- if ( s == "unbroken" ) {
- l = G4VisAttributes::unbroken;
- }
- else if ( s == "dashed" ) {
- l = G4VisAttributes::dashed;
- }
- else if ( s == "dotted" ) {
- l = G4VisAttributes::dotted;
- }
- else {
- std::cerr << "WARNING: unknown LineStyle - " << s << std::endl;
- }
-
- return l;
- }
-
- static G4VisAttributes::ForcedDrawingStyle convertDrawingStyle(const std::string& s)
- {
- G4VisAttributes::ForcedDrawingStyle d = G4VisAttributes::wireframe;
- if ( s == "wireframe" ) {
- d = G4VisAttributes::wireframe;
- }
- else if ( s == "solid" ) {
- d = G4VisAttributes::solid;
- }
- else {
- std::cerr << "WARNING: unknown DrawingStyle - " << d << std::endl;
- }
-
- return d;
- }
+ visSubscriber()
+ {
+ Subscribe("vis");
+ }
+
+ virtual ~visSubscriber()
+ {
+ }
+
+ virtual void Activate(const SAXObject* object)
+ {
+ //std::cout << "visSubscriber::Activate()" << std::endl;
+
+ if (object != 0) {
+ const vis* vobj = dynamic_cast<const vis*>(object);
+
+ if (vobj) {
+ G4VisAttributes* g4vis = new G4VisAttributes;
+
+ std::string name = vobj->get_name();
+ bool visible = StringUtil::toBool(vobj->get_visible());
+ bool show_daughters = StringUtil::toBool(vobj->get_show_daughters());
+ G4VisAttributes::LineStyle line = convertLineStyle(vobj->get_line_style());
+ G4VisAttributes::ForcedDrawingStyle draw = convertDrawingStyle(vobj->get_drawing_style());
+
+ g4vis->SetVisibility(visible);
+ g4vis->SetDaughtersInvisible(!show_daughters);
+ g4vis->SetLineStyle(line);
+
+ if (draw == G4VisAttributes::wireframe) {
+ g4vis->SetForceWireframe(true);
+ } else if (draw == G4VisAttributes::solid) {
+ g4vis->SetForceSolid(true);
+ }
+
+ // set color
+ bool color_set = false;
+ ContentSequence* seq = const_cast<ContentSequence*>(vobj->get_content());
+ size_t count = seq->size();
+ for (size_t i = 0; i < count; i++) {
+ std::string child_tag = seq->content(i).tag;
+ SAXObject* child_obj = seq->content(i).object;
+
+ if (child_tag == "color") {
+ //std::cout << "handling color" << std::endl;
+ color* c = dynamic_cast<color*>(child_obj);
+
+ double r = StringUtil::toDouble(c->get_R());
+ double g = StringUtil::toDouble(c->get_G());
+ double b = StringUtil::toDouble(c->get_B());
+ double alpha = StringUtil::toDouble(c->get_alpha());
+
+ //std::cout << "r g b alpha: " << r << " " << g << " " << b << " " << alpha << std::endl;
+
+ g4vis->SetColor(r, g, b, alpha);
+
+ // should be only one
+ color_set = true;
+ break;
+ }
+ }
+
+ if (!color_set) {
+ std::cerr << "WARNING: Color was not explicitly set and got the default value." << std::endl;
+ }
+
+ // add to proc's map
+ LCDDProcessor::instance()->addVisAttributes(name, g4vis);
+ }
+ }
+
+ //delete object;
+ }
+
+ static G4VisAttributes::LineStyle convertLineStyle(const std::string& s)
+ {
+ G4VisAttributes::LineStyle l = G4VisAttributes::unbroken;
+
+ if (s == "unbroken") {
+ l = G4VisAttributes::unbroken;
+ } else if (s == "dashed") {
+ l = G4VisAttributes::dashed;
+ } else if (s == "dotted") {
+ l = G4VisAttributes::dotted;
+ } else {
+ std::cerr << "WARNING: unknown LineStyle - " << s << std::endl;
+ }
+
+ return l;
+ }
+
+ static G4VisAttributes::ForcedDrawingStyle convertDrawingStyle(const std::string& s)
+ {
+ G4VisAttributes::ForcedDrawingStyle d = G4VisAttributes::wireframe;
+ if (s == "wireframe") {
+ d = G4VisAttributes::wireframe;
+ } else if (s == "solid") {
+ d = G4VisAttributes::solid;
+ } else {
+ std::cerr << "WARNING: unknown DrawingStyle - " << d << std::endl;
+ }
+
+ return d;
+ }
}; DECLARE_SUBSCRIBER_FACTORY(visSubscriber)
diff -u -r1.2 -r1.3 --- visrefProcess.cc 5 Jun 2006 17:41:31 -0000 1.2 +++ visrefProcess.cc 24 Jun 2013 22:10:37 -0000 1.3 @@ -1,47 +1,48 @@
-// $Header: /cvs/lcd/lcdd/src/visrefProcess.cc,v 1.2 2006/06/05 17:41:31 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/visrefProcess.cc,v 1.3 2013/06/24 22:10:37 jeremy Exp $
#include "Processes/ReferenceTypeProcess.h" #include "VisType.hh" /**
- @class visrefProcess - @brief SAX process for visref element. - @note Extends ReferenceTypeProcess for referencing mechanism to vis. -*/ -class visrefProcess : public ReferenceTypeProcess
+ @class visrefProcess + @brief SAX process for visref element. + @note Extends ReferenceTypeProcess for referencing mechanism to vis. + */ +class visrefProcess: public ReferenceTypeProcess
{
public:
- visrefProcess(const ProcessingContext* context = 0)
- : ReferenceTypeProcess(context)
- {}
-
- virtual ~visrefProcess()
- {}
-
- virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
- {
- SAXObject** obj = Context()->GetTopObject();
-
- VisType::visref* visref =
- new VisType::visref;
-
- *obj = visref;
- m_obj = visref;
-
- ReferenceTypeProcess::StartElement(name, attrs);
- }
-
- virtual void EndElement(const std::string& name)
- {
- ReferenceTypeProcess::EndElement(name);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "visref";
- return tag;
- }
+ visrefProcess(const ProcessingContext* context = 0) :
+ ReferenceTypeProcess(context)
+ {
+ }
+
+ virtual ~visrefProcess()
+ {
+ }
+
+ virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
+ {
+ SAXObject** obj = Context()->GetTopObject();
+
+ VisType::visref* visref = new VisType::visref;
+
+ *obj = visref;
+ m_obj = visref;
+
+ ReferenceTypeProcess::StartElement(name, attrs);
+ }
+
+ virtual void EndElement(const std::string& name)
+ {
+ ReferenceTypeProcess::EndElement(name);
+ }
+
+ virtual const std::string& State() const
+ {
+ static std::string tag = "visref";
+ return tag;
+ }
}; DECLARE_PROCESS_FACTORY(visrefProcess)
diff -u -r1.7 -r1.8 --- volumeExtendedProcess.cc 6 Sep 2005 18:57:46 -0000 1.7 +++ volumeExtendedProcess.cc 24 Jun 2013 22:10:37 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/volumeExtendedProcess.cc,v 1.7 2005/09/06 18:57:46 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/volumeExtendedProcess.cc,v 1.8 2013/06/24 22:10:37 jeremy Exp $
#ifndef VolumeExtendedProcess_hh #define VolumeExtendedProcess_hh 1
@@ -13,67 +13,72 @@
#include "Schema/volume.h" /**
- @class volumeExtendedProcess - @brief SAX process for the volume element, as extended by LCDD. - @note This is mostly a cut and paste job of volumeProcess, - as this class does not appear to be extendable. It is - only defined in a cpp file with no include guards! -*/ -class volumeExtendedProcess : public SAXStateProcess
+ @class volumeExtendedProcess + @brief SAX process for the volume element, as extended by LCDD. + @note This is mostly a cut and paste job of volumeProcess, + as this class does not appear to be extendable. It is + only defined in a cpp file with no include guards! + */ +class volumeExtendedProcess: public SAXStateProcess
{
public:
- volumeExtendedProcess( const ProcessingContext* context = 0 )
- : SAXStateProcess( context ), m_obj( 0 ) {
- }
-
- virtual ~volumeExtendedProcess() {
- }
-
- virtual const SAXComponentObject* Build() const {
- return this;
- }
-
- // Analogical to SAX startElement callback
- virtual void StartElement( const std::string&,
- const ASCIIAttributeList& attrs )
- {
- //std::cout << "VOLUME EXTENDED PROCESS::START OF TAG : " << name << std::endl;
- SAXObject** obj = Context()->GetTopObject();
-
- volume* vo = new volume;
-
- vo->set_name( attrs.getValue( "name" ) );
-
- m_obj = vo;
- *obj = vo;
- }
-
- virtual void EndElement( const std::string& ) {
- //std::cout << "PROCESS::END OF TAG : " << name << " " << std::endl;
- }
-
- virtual void Characters( const std::string& ) {
- }
-
- virtual void StackPopNotify( const std::string& name ) {
- SAXObject** so = Context()->GetTopObject();
- volume* vobj = dynamic_cast<volume*>( m_obj );
- vobj->add_content( name, *so );
- }
-
- // The name of the state this object will process
- virtual const std::string& State() const
- {
- static std::string tag = "volume";
- return tag;
- }
+ volumeExtendedProcess(const ProcessingContext* context = 0) :
+ SAXStateProcess(context), m_obj(0)
+ {
+ }
+
+ virtual ~volumeExtendedProcess()
+ {
+ }
+
+ virtual const SAXComponentObject* Build() const
+ {
+ return this;
+ }
+
+ // Analogical to SAX startElement callback
+ virtual void StartElement(const std::string&, const ASCIIAttributeList& attrs)
+ {
+ //std::cout << "VOLUME EXTENDED PROCESS::START OF TAG : " << name << std::endl;
+ SAXObject** obj = Context()->GetTopObject();
+
+ volume* vo = new volume;
+
+ vo->set_name(attrs.getValue("name"));
+
+ m_obj = vo;
+ *obj = vo;
+ }
+
+ virtual void EndElement(const std::string&)
+ {
+ //std::cout << "PROCESS::END OF TAG : " << name << " " << std::endl;
+ }
+
+ virtual void Characters(const std::string&)
+ {
+ }
+
+ virtual void StackPopNotify(const std::string& name)
+ {
+ SAXObject** so = Context()->GetTopObject();
+ volume* vobj = dynamic_cast<volume*>(m_obj);
+ vobj->add_content(name, *so);
+ }
+
+ // The name of the state this object will process
+ virtual const std::string& State() const
+ {
+ static std::string tag = "volume";
+ return tag;
+ }
private:
- SAXObject* m_obj;
+ SAXObject* m_obj;
public:
- static SAXObject* m_volumeSaved;
+ static SAXObject* m_volumeSaved;
};
@@ -81,4 +86,3 @@
#endif
-
diff -u -r1.30 -r1.31 --- volumeExtendedSubscriber.cc 1 Feb 2012 10:28:56 -0000 1.30 +++ volumeExtendedSubscriber.cc 24 Jun 2013 22:10:37 -0000 1.31 @@ -1,194 +1,177 @@
-// $Header: /cvs/lcd/lcdd/src/volumeExtendedSubscriber.cc,v 1.30 2012/02/01 10:28:56 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/volumeExtendedSubscriber.cc,v 1.31 2013/06/24 22:10:37 jeremy Exp $
#include "volumeExtendedSubscriber.hh" /**
- @class volumeExtendedSubscriber - @brief SAX subscriber to handle extra LCDD tags on volume element. - @note This is the major subscriber extension class for the LCDD package. -*/
+ @class volumeExtendedSubscriber + @brief SAX subscriber to handle extra LCDD tags on volume element. + @note This is the major subscriber extension class for the LCDD package. + */
const SAXComponentObject* volumeExtendedSubscriber::Build() const
{
- return this;
+ return this;
}
volumeExtendedSubscriber::volumeExtendedSubscriber()
{
- Subscribe( "volume" );
+ Subscribe("volume");
} volumeExtendedSubscriber::~volumeExtendedSubscriber()
-{}
+{
+}
-void volumeExtendedSubscriber::Activate( const SAXObject* object)
+void volumeExtendedSubscriber::Activate(const SAXObject* object)
{
- LCDDProcessor* proc = LCDDProcessor::instance(); - const volume* vobj = 0;
+ LCDDProcessor* proc = LCDDProcessor::instance(); + const volume* vobj = 0;
G4SensitiveDetector* g4sd = 0;
G4LogicalVolume* lv;
int nchildren = 0;
- if ( object ) {
- vobj = dynamic_cast<const volume*>( object );
+ if (object) {
+ vobj = dynamic_cast<const volume*>(object);
- if ( vobj ) {
+ if (vobj) {
- // get LV
- lv = const_cast<G4LogicalVolume*>
- ( GDMLProcessor::GetInstance()->GetLogicalVolume(vobj->get_name() ) );
-
- if ( lv ) {
-
- // get content
- const ContentSequence* seq = vobj->get_content();
-
- // get size of content
- size_t count = seq->size();
-
- // iterate over and process content
- for ( size_t i =0; i < count; i++ ) {
-
- // handle sdref tag
- if ( seq->content(i).tag == "sdref" ) {
-
- SensitiveDetectorType::sdref* sd =
- dynamic_cast<SensitiveDetectorType::sdref*> ( seq->content(i).object );
-
- g4sd = proc->getSensitiveDetector( sd->get_ref() );
-
- if (g4sd) {
-
- if ( !g4sd->isValidVolume( lv ) ) {
- //G4Exception("FATAL ERROR: The G4LogicalVolume <" + lv->GetName() + "> is not valid for the SD <" + g4sd->GetName() + ">.");
- G4Exception("", "", FatalException, "LogVol not valid for the SD");
- }
-
- lv->SetSensitiveDetector(g4sd);
- }
- else {
- G4cerr << "SD not found: " << sd->get_ref() << "." << G4endl;
- G4Exception( "volumeExtendedSubscriber::Activate()", "", FatalException, "Invalid sdref.");
- }
- }
- // handle regionref
- else if ( seq->content(i).tag == "regionref" ) {
-
- // get regionref object
- RegionType::regionref* regref =
- dynamic_cast<RegionType::regionref*> ( seq->content(i).object );
-
- // get region from store
- G4Region* reg =
- dynamic_cast<G4Region*> ( proc->getRegion( regref->get_ref() ) );
-
- // add LV to region
- if ( reg ) {
- reg->AddRootLogicalVolume( lv );
- }
- else {
- G4cerr << "Failed to fetch and/or cast to region: " << regref->get_ref() << G4endl;
- G4Exception("volumeExtendedSubscriber::Activate()", "", FatalException, "Invalid regionref.");
- }
- }
- // handle limitsetref
- else if ( seq->content(i).tag == "limitsetref" ) {
-
- LimitSetType::limitsetref* limitsetref = dynamic_cast<LimitSetType::limitsetref*> ( seq->content(i).object );
-
- G4UserLimits* ulim = dynamic_cast<G4LimitSet*> ( proc->getLimitSet( limitsetref->get_ref() ) );
-
- if ( ulim ) {
- lv->SetUserLimits( ulim );
- std::cout << "Set user limits <" << limitsetref->get_ref() << "> on logical volume <" << lv->GetName() << ">" << std::endl;
- }
- else {
- std::cerr << "FATAL ERROR: limit element not found - " << limitsetref->get_ref() << std::endl;
- G4Exception("", "", FatalException, "limitsetref not found.");
- }
-
- }
- // handle visref
- else if ( seq->content(i).tag == "visref" ) {
-
- //std::cout << "handling visref" << std::endl;
-
- VisType::visref* visref =
- dynamic_cast<VisType::visref*> ( seq->content(i).object );
-
- G4VisAttributes* vis =
- dynamic_cast<G4VisAttributes*> ( proc->getVisAttributes( visref->get_ref() ) );
-
- if ( vis ) {
- //std::cout << "assigning vis: " << visref->get_ref() << std::endl;
- lv->SetVisAttributes( vis );
- }
- else {
- std::cerr << "FATAL ERROR: vis element not found - " << visref->get_ref() << std::endl;
- G4Exception("", "", FatalException, "vis element not found.");
- }
- }
- // handle physvols to look for physvolids
- if ( seq->content(i).tag == "physvol" ) {
-
- ++nchildren;
-
- // get physvol content sequence
- physvol* pv = dynamic_cast<physvol*>( seq->content(i).object );
- const ContentSequence* pv_seq = pv->get_content();
- size_t ccount = pv_seq->size();
-
- // iterate over physvol content
- for ( size_t pvidx = 0; pvidx < ccount; pvidx++ ) {
-
- // found "choice" tag?
- if( pv_seq->content(pvidx).tag == "choice" ) {
-
- const ContentChoice* pv_choice =
- dynamic_cast<const ContentChoice*>( pv_seq->content(pvidx).object );
-
- // found a physvolid?
- if ( pv_choice->content().tag == "physvolid" ) {
-
- // add the physvolid...
-
- physvolidElem* pvid_elem =
- dynamic_cast<physvolidElem*>( pv_choice->content().object );
-
- if ( pvid_elem == 0 ) {
- G4Exception("", "", FatalException, "Failed cast to physvolidElem.");
- }
-
- GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
-
- std::string strID = pvid_elem->get_value();
- std::string fld = pvid_elem->get_field_name();
-
- int intID = (int)calc->Eval( strID );
-
- PhysVolId pvid(intID,
- fld);
-
- // assign physvolid to lv's child by the in-order idx
- IdManager::instance()->addPhysVolId( lv, // LV mom
- nchildren - 1, // child idx in mom
- pvid ); // PhysVolId
- }
-
- }
- }
- }
- }
- }
- else {
- G4Exception("", "", FatalException, "Failed cast to G4LogicalVolume.");
- }
- }
- else {
- G4Exception("", "", FatalException, "Failed cast to volume.");
- }
- }
+ // get LV
+ lv = const_cast<G4LogicalVolume*>(GDMLProcessor::GetInstance()->GetLogicalVolume(vobj->get_name()));
+
+ if (lv) {
+
+ // get content
+ const ContentSequence* seq = vobj->get_content();
+
+ // get size of content
+ size_t count = seq->size();
+
+ // iterate over and process content
+ for (size_t i = 0; i < count; i++) {
+
+ // handle sdref tag
+ if (seq->content(i).tag == "sdref") {
+
+ SensitiveDetectorType::sdref* sd = dynamic_cast<SensitiveDetectorType::sdref*>(seq->content(i).object);
+
+ g4sd = proc->getSensitiveDetector(sd->get_ref());
+
+ if (g4sd) {
+
+ if (!g4sd->isValidVolume(lv)) {
+ //G4Exception("FATAL ERROR: The G4LogicalVolume <" + lv->GetName() + "> is not valid for the SD <" + g4sd->GetName() + ">.");
+ G4Exception("", "", FatalException, "LogVol not valid for the SD");
+ }
+
+ lv->SetSensitiveDetector(g4sd);
+ } else {
+ G4cerr << "SD not found: " << sd->get_ref() << "." << G4endl;
+ G4Exception( "volumeExtendedSubscriber::Activate()", "", FatalException, "Invalid sdref.");
+ }
+ } else if ( seq->content(i).tag == "regionref" ) {
+ // handle regionref
+
+ // get regionref object
+ RegionType::regionref* regref = dynamic_cast<RegionType::regionref*> ( seq->content(i).object );
+
+ // get region from store
+ G4Region* reg = dynamic_cast<G4Region*> ( proc->getRegion( regref->get_ref() ) );
+
+ // add LV to region
+ if ( reg ) {
+ reg->AddRootLogicalVolume( lv );
+ } else {
+ G4cerr << "Failed to fetch and/or cast to region: " << regref->get_ref() << G4endl;
+ G4Exception("volumeExtendedSubscriber::Activate()", "", FatalException, "Invalid regionref.");
+ }
+ } else if ( seq->content(i).tag == "limitsetref" ) {
+ // handle limitsetref
+
+ LimitSetType::limitsetref* limitsetref = dynamic_cast<LimitSetType::limitsetref*> ( seq->content(i).object );
+
+ G4UserLimits* ulim = dynamic_cast<G4LimitSet*> ( proc->getLimitSet( limitsetref->get_ref() ) );
+
+ if ( ulim ) {
+ lv->SetUserLimits( ulim );
+ std::cout << "Set user limits <" << limitsetref->get_ref() << "> on logical volume <" << lv->GetName() << ">" << std::endl;
+ } else {
+ std::cerr << "FATAL ERROR: limit element not found - " << limitsetref->get_ref() << std::endl;
+ G4Exception("", "", FatalException, "limitsetref not found.");
+ }
+ } else if ( seq->content(i).tag == "visref" ) {
+ // handle visref
+
+ //std::cout << "handling visref" << std::endl;
- //delete object; - }
+ VisType::visref* visref = dynamic_cast<VisType::visref*> ( seq->content(i).object );
+
+ G4VisAttributes* vis = dynamic_cast<G4VisAttributes*> ( proc->getVisAttributes( visref->get_ref() ) );
+
+ if ( vis ) {
+ //std::cout << "assigning vis: " << visref->get_ref() << std::endl;
+ lv->SetVisAttributes( vis );
+ } else {
+ std::cerr << "FATAL ERROR: vis element not found - " << visref->get_ref() << std::endl;
+ G4Exception("", "", FatalException, "vis element not found.");
+ }
+ }
+
+ if ( seq->content(i).tag == "physvol" ) {
+ // handle physvols to look for physvolids
+
+ ++nchildren;
+
+ // get physvol content sequence
+ physvol* pv = dynamic_cast<physvol*>( seq->content(i).object );
+ const ContentSequence* pv_seq = pv->get_content();
+ size_t ccount = pv_seq->size();
+
+ // iterate over physvol content
+ for ( size_t pvidx = 0; pvidx < ccount; pvidx++ ) {
+
+ // found "choice" tag?
+ if( pv_seq->content(pvidx).tag == "choice" ) {
+
+ const ContentChoice* pv_choice = dynamic_cast<const ContentChoice*>( pv_seq->content(pvidx).object );
+
+ // found a physvolid?
+ if ( pv_choice->content().tag == "physvolid" ) {
+
+ // add the physvolid...
+
+ physvolidElem* pvid_elem =
+ dynamic_cast<physvolidElem*>( pv_choice->content().object );
+
+ if ( pvid_elem == 0 ) {
+ G4Exception("", "", FatalException, "Failed cast to physvolidElem.");
+ }
+
+ GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();
+
+ std::string strID = pvid_elem->get_value();
+ std::string fld = pvid_elem->get_field_name();
+
+ int intID = (int)calc->Eval( strID );
+
+ PhysVolId pvid(intID, fld);
+
+ // assign physvolid to lv's child by the in-order idx
+ IdManager::instance()->addPhysVolId(
+ lv, // LV mom
+ nchildren - 1, // child idx in mom
+ pvid ); // PhysVolId
+ }
+
+ }
+ }
+ }
+ }
+ } else {
+ G4Exception("", "", FatalException, "Failed cast to G4LogicalVolume.");
+ }
+ } else {
+ G4Exception("", "", FatalException, "Failed cast to volume.");
+ }
+ }
+}
//DECLARE_SUBSCRIBER_FACTORY(volumeExtendedSubscriber)
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