4 added + 20 modified, total 24 files
lcdd/include/lcdd/core
diff -u -r1.6 -r1.7
--- LCDDObjectStoreInspector.hh 10 Jul 2013 18:06:16 -0000 1.6
+++ LCDDObjectStoreInspector.hh 10 Jul 2013 20:49:05 -0000 1.7
@@ -1,4 +1,4 @@
-// $Id: LCDDObjectStoreInspector.hh,v 1.6 2013/07/10 18:06:16 jeremy Exp $
+// $Id: LCDDObjectStoreInspector.hh,v 1.7 2013/07/10 20:49:05 jeremy Exp $
#ifndef LCDD_CORE_LCDDOBJECTSTOREINSPECTOR_HH
#define LCDD_CORE_LCDDOBJECTSTOREINSPECTOR_HH 1
@@ -10,6 +10,8 @@
/**
* @brief Creates specific instances of the StoreInspector for looking at information
* in Geant4 and LCDD object stores.
+ * @bug For some reason moving the code to a source file results in duplicate symbols, so
+ * it is left here for now.
*/
class LCDDObjectStoreInspector
{
lcdd/include/lcdd/core
diff -u -r1.6 -r1.7
--- LCDDParser.hh 10 Jul 2013 18:06:16 -0000 1.6
+++ LCDDParser.hh 10 Jul 2013 20:49:05 -0000 1.7
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDParser.hh,v 1.6 2013/07/10 18:06:16 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDParser.hh,v 1.7 2013/07/10 20:49:05 jeremy Exp $
#ifndef LCDD_CORE_LCDDPARSER_HH
#define LCDD_CORE_LCDDPARSER_HH 1
@@ -10,9 +10,7 @@
class G4VPhysicalVolume;
/**
- * @brief The XML parser for reading in the LCDD format into Geant4.
- * @todo See https://jira.slac.stanford.edu/browse/LCDD-11
- * Make version and setup name supported parameters.
+ * @brief The parser for reading LCDD XML files into Geant4.
*/
class LCDDParser
{
lcdd/include/lcdd/detectors
diff -u -r1.4 -r1.5
--- NonprojectiveCylinderSegmentation.hh 10 Jul 2013 18:06:17 -0000 1.4
+++ NonprojectiveCylinderSegmentation.hh 10 Jul 2013 20:49:06 -0000 1.5
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/NonprojectiveCylinderSegmentation.hh,v 1.4 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/NonprojectiveCylinderSegmentation.hh,v 1.5 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_DETECTORS_G4NONPROJECTIVECYLINDERSEGMENTATION
#define LCDD_DETECTORS_G4NONPROJECTIVECYLINDERSEGMENTATION 1
@@ -70,18 +70,49 @@
*/
G4ThreeVector getLocalHitPos(const G4StepPoint* aPreStepPoint);
+ /**
+ * Check if a G4VSolid is valid for this segmentation.
+ * @return True if solid is valid; false if not.
+ */
bool isValidSolid(G4VSolid*);
private:
+ /**
+ * Computes the delta phi from a step.
+ * @param[in] aStep A G4Step object.
+ * @return The delta phi.
+ */
double computeDeltaPhi(const G4Step* aStep);
+ /**
+ * Compute the phi bin from a step.
+ * @param[in] aStep A G4Step object.
+ * @return The phi bin.
+ */
int computeBinPhi(const G4Step* aStep);
+ /**
+ * Compute the Z bin from a step.
+ * @param[in] aStep A G4Step object.
+ * @return The Z bin.
+ * @todo Remove this method.
+ */
int computeBinZ(const G4ThreeVector& localStepPos);
+ /**
+ * Compute the phi bin from a step point.
+ * @param[in] aPreStepPoint The G4StepPoint object.
+ * @return The phi bin.
+ * @todo Remove this method.
+ */
int computeBinPhi(const G4StepPoint* aPreStepPoint);
+ /**
+ * Compute the delta phi from a step point.
+ * @param[in] aPreStepPoint The G4StepPoint object.
+ * @return The delta phi.
+ */
double computeDeltaPhi(const G4StepPoint* aPreStepPoint);
private:
lcdd/include/lcdd/detectors
diff -u -r1.5 -r1.6
--- ProjectiveSegmentation.hh 10 Jul 2013 18:06:17 -0000 1.5
+++ ProjectiveSegmentation.hh 10 Jul 2013 20:49:06 -0000 1.6
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/ProjectiveSegmentation.hh,v 1.5 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/ProjectiveSegmentation.hh,v 1.6 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_DETECTORS_PROJECTIVESEGMENTATION_HH
#define LCDD_DETECTORS_PROJECTIVESEGMENTATION_HH 1
@@ -123,6 +123,9 @@
private:
+ /**
+ * Compute the size of the bins from the input parameters.
+ */
void computeDivisions();
private:
lcdd/include/lcdd/geant4
diff -u -r1.5 -r1.6
--- PhysVolIdMap.hh 10 Jul 2013 18:06:17 -0000 1.5
+++ PhysVolIdMap.hh 10 Jul 2013 20:49:06 -0000 1.6
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/geant4/PhysVolIdMap.hh,v 1.5 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/geant4/PhysVolIdMap.hh,v 1.6 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_GEANT4_PHYSVOLTOIDMAP_HH
#define LCDD_GEANT4_PHYSVOLTOIDMAP_HH 1
@@ -27,54 +27,40 @@
public:
/**
+ * Class constructor.
+ */
+ PhysVolIdMap();
+
+ /**
+ * Class destructor.
+ */
+ virtual ~PhysVolIdMap();
+
+ /**
* Add an ID with a volume key.
* @param[in] pv The G4VPhysicalVolume object.
* @param[in] id The ID associated with the volume.
*/
- void addPhysVolId(G4VPhysicalVolume* pv, PhysVolId id)
- {
- if (!hasPhysVolIds(pv)) {
- createPhysVolIds(pv);
- }
-
- PhysVolId::PhysVolIds& idvec = getPhysVolIds(pv);
- idvec.push_back(id);
- }
+ void addPhysVolId(G4VPhysicalVolume* pv, PhysVolId id);
/**
* Add an empty ID container for a volume key.
* @param[in] pv The volume key.
*/
- void createPhysVolIds(G4VPhysicalVolume* pv)
- {
- PhysVolId::PhysVolIds pvid;
- (*this)[pv] = pvid;
- }
+ void createPhysVolIds(G4VPhysicalVolume* pv);
/**
* Check whether the volume has a key in the map.
* @param[in] pv The G4VPhysicalVolume object.
* @return True if the volume has a key; false if not.
*/
- bool hasPhysVolIds(G4VPhysicalVolume* pv) const
- {
- return (this->find(pv) != this->end());
- }
+ bool hasPhysVolIds(G4VPhysicalVolume* pv) const;
/**
* Get the PhysVolId objects associated with the volume key.
* @return The list of PhysVolId objects associated with the volume key.
*/
- PhysVolId::PhysVolIds& getPhysVolIds(G4VPhysicalVolume* pv)
- {
- // create an empty one if not exists
- if (!hasPhysVolIds(pv)) {
- createPhysVolIds(pv);
- }
-
- // return ptr to vec
- return (*this)[pv];
- }
+ PhysVolId::PhysVolIds& getPhysVolIds(G4VPhysicalVolume* pv);
};
#endif
lcdd/include/lcdd/hits
diff -u -r1.5 -r1.6
--- CalorimeterHit.hh 10 Jul 2013 18:06:17 -0000 1.5
+++ CalorimeterHit.hh 10 Jul 2013 20:49:06 -0000 1.6
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/CalorimeterHit.hh,v 1.5 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/hits/CalorimeterHit.hh,v 1.6 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_HITS_CALORIMETERHIT_HH
#define LCDD_HITS_CALORIMETERHIT_HH 1
@@ -102,102 +102,68 @@
* Set the hit's position.
* @param[in] posXYZ The hit's global position.
*/
- void setPos(const G4ThreeVector& posXYZ)
- {
- _pos = posXYZ;
- }
+ void setPos(const G4ThreeVector& posXYZ);
/**
* Set the energy deposition.
* @param[in] ed The energy deposition (GeV).
*/
- void setEdep(const G4double ed)
- {
- _edep = ed;
- }
+ void setEdep(const G4double ed);
/**
* Increment the energy deposition by some amount.
* @param[in] edincr The amount to increment the energy (GeV).
*/
- void incrEdep(const G4double edincr)
- {
- _edep += edincr;
- }
+ void incrEdep(const G4double edincr);
/**
* Get the global position of the hit.
* @return The global position of the hit.
*/
- G4ThreeVector getPos() const
- {
- return _pos;
- }
+ G4ThreeVector getPos() const;
/**
* Get the energy deposition of this hit.
* @return The hit's energy deposition.
*/
- G4double getEdep() const
- {
- return _edep;
- }
+ G4double getEdep() const;
/**
* Add a hit contribution.
* @param[in] contrib The hit contribution.
*/
- void addHitContribution(HitContribution contrib)
- {
- _particleList.push_back(contrib);
- }
+ void addHitContribution(HitContribution contrib);
/**
* Get the list of hit contributions.
* @return The list of hit contributions.
*/
- const HitContributionList& getHitContributions() const
- {
- return _particleList;
- }
+ const HitContributionList& getHitContributions() const;
/**
* Set the value of the 64-bit ID.
* @param[in] id0 The first 32 bits of the ID.
* @param[in] id1 The second 32 bits of the ID.
*/
- void setId64bit(Id64bit::ElementType id0, Id64bit::ElementType id1)
- {
- _id64.setId0(id0);
- _id64.setId1(id1);
- }
+ void setId64bit(Id64bit::ElementType id0, Id64bit::ElementType id1);
/**
* Get the 64-bit ID.
* @return The 64-bit ID.
*/
- const Id64bit& getId64bit() const
- {
- return _id64;
- }
+ const Id64bit& getId64bit() const;
/**
* Set the endcap flag.
* @param[in] ec The endcap flag.
*/
- void setEndcapFlag(bool ec = true)
- {
- _endcap = ec;
- }
+ void setEndcapFlag(bool ec = true);
/**
* Get the endcap flag.
* @return The endcap flag.
*/
- bool getEndcapFlag()
- {
- return _endcap;
- }
+ bool getEndcapFlag();
private:
lcdd/include/lcdd/hits
diff -u -r1.4 -r1.5
--- HitContribution.hh 10 Jul 2013 18:06:17 -0000 1.4
+++ HitContribution.hh 10 Jul 2013 20:49:06 -0000 1.5
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/HitContribution.hh,v 1.4 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/hits/HitContribution.hh,v 1.5 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_HITS_HITCONTRIBUTION_HH
#define LCDD_HITS_HITCONTRIBUTION_HH 1
@@ -27,55 +27,77 @@
public:
- // no parameters
+ /**
+ * Class constructor.
+ */
HitContribution();
- // all parameters
+ /**
+ * Fully qualified constructor.
+ * @param[in] trackID The Geant4 track ID.
+ * @param[in] edep The energy deposition (GeV).
+ * @param[in] PDGID The PDG code of the contributing particle.
+ * @param[in] globalTime The global time of the contribution (ns).
+ */
HitContribution(G4int trackID, G4double edep, G4int PDGID, G4double globalTime);
- // parameters from step
+ /**
+ * Constructor based on step information.
+ */
HitContribution(const G4Step* aStep);
+ /**
+ * Class destructor.
+ */
virtual ~HitContribution();
- inline G4int getTrackID() const
- {
- return _trackID;
- }
-
- inline G4double getEdep() const
- {
- return _edep;
- }
-
- inline void incrEdep(G4double incr)
- {
- _edep += incr;
- }
-
- inline G4int getPDGID() const
- {
- return _PdgId;
- }
-
- inline G4double getGlobalTime() const
- {
- return _globalTime;
- }
-
- inline void setMinTime(G4double new_time)
- {
- if (new_time < _globalTime) {
- _globalTime = new_time;
- }
- }
-
- inline const float* getPosition() const
- {
- return _position;
- }
-
- void printOut(std::ostream&);
+ /**
+ * Get the track ID.
+ * @return The track ID.
+ */
+ G4int getTrackID() const;
+
+ /**
+ * Get the energy deposition.
+ * @return The energy deposition (GeV).
+ */
+ G4double getEdep() const;
+
+ /**
+ * Increment the current energy deposition.
+ * @param[in] incr The amount to increment by.
+ */
+ void incrEdep(G4double incr);
+
+ /**
+ * Get the PDG code.
+ * @return The PDG code.
+ */
+ G4int getPDGID() const;
+
+ /**
+ * Get the global time.
+ * @return The global time (ns).
+ */
+ G4double getGlobalTime() const;
+
+ /**
+ * Set the minimum e.g. global time.
+ * @param[in] newTime The minimum time.
+ */
+ void setMinTime(G4double newTime);
+
+ /**
+ * Get the position.
+ * @return The position as a float array of length 3.
+ */
+ const float* getPosition() const;
+
+ /**
+ * Print out the contribution information to an output stream.
+ * @param[in] os The output stream.
+ */
+ void printOut(std::ostream& os);
private:
lcdd/include/lcdd/hits
diff -u -r1.7 -r1.8
--- TrackInformation.hh 10 Jul 2013 18:06:17 -0000 1.7
+++ TrackInformation.hh 10 Jul 2013 20:49:06 -0000 1.8
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackInformation.hh,v 1.7 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackInformation.hh,v 1.8 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_HITS_TRACKINFORMATION_HH
#define LCDD_HITS_TRACKINFORMATION_HH 1
@@ -59,180 +59,125 @@
inline void operator delete(void *aTrackInfo);
/**
- * Overloaded equals operator.
+ * Overloaded assignment operator for copying.
*/
- inline int operator ==(const TrackInformation& right) const
- {
- return (this == &right);
- }
+ TrackInformation& operator =(const TrackInformation& right);
/**
- * Overloaded assignment operator for copying.
+ * Overloaded equals operator.
*/
- TrackInformation& operator =(const TrackInformation& right);
+ inline int operator ==(const TrackInformation& right) const;
/**
* Print out the track information.
* @todo Implement this method.
*/
- virtual void Print() const
- {
- }
+ virtual void Print() const;
/**
* Get the string of the status.
* @return The tracking status string.
*/
- const std::string& getTrackingStatusString() const
- {
- return TrackInformation::getTrackingStatusString(getTrackingStatus());
- }
+ const std::string& getTrackingStatusString() const;
/**
* Get the original track ID.
* @return The original track ID.
*/
- inline G4int getOriginalTrackID() const
- {
- return _originalTrackID;
- }
+ G4int getOriginalTrackID() const;
/**
* Get the original tracking status.
* @return The original tracking status.
*/
- inline ETrackingStatus getOriginalTrackingStatus() const
- {
- return _originalTrackingStatus;
- }
+ ETrackingStatus getOriginalTrackingStatus() const;
/**
* Get the tracking status.
* @return The tracking status.
*/
- inline ETrackingStatus getTrackingStatus() const
- {
- return _trackingStatus;
- }
+ ETrackingStatus getTrackingStatus() const;
/**
* Check if there is a hit on the track.
* @return True if this is a hit on the track; false if not.
*/
- inline bool hasTrackerHit() const
- {
- return _hasTrackerHit;
- }
+ bool hasTrackerHit() const;
/**
* Set has tracker hit.
* @param[in] hasHit Set has tracker hit.
*/
- inline void setHasTrackerHit(bool hasHit = true)
- {
- _hasTrackerHit = hasHit;
- }
+ void setHasTrackerHit(bool hasHit = true);
/**
* Set the track ID.
* @param[in] id The track ID.
*/
- inline void setTrackID(G4int id)
- {
- _originalTrackID = id;
- }
+ void setTrackID(G4int id);
/**
* Set the tracking status.
* @param[in] st The tracking status.
*/
- inline void setTrackingStatus(ETrackingStatus st)
- {
- _trackingStatus = st;
- }
+ void setTrackingStatus(ETrackingStatus st);
/**
* Set the original tracking status.
* @param[in] st The tracking status.
*/
- inline void setOriginalTrackingStatus(ETrackingStatus st)
- {
- _originalTrackingStatus = st;
- }
+ void setOriginalTrackingStatus(ETrackingStatus st);
/**
* Set vertex not endpoint of parent.
* @param[in] val Vertex not endpoint setting.
*/
- inline void setVertexIsNotEndpointOfParent(bool val = true)
- {
- _vertexIsNotEndpointOfParent = val;
- }
+ void setVertexIsNotEndpointOfParent(bool val = true);
/**
* Get vertex not endpoint of parent setting.
* @return True if vertex not endpoint of parent; false if not.
*/
- inline bool getVertexIsNotEndpointOfParent() const
- {
- return _vertexIsNotEndpointOfParent;
- }
+ bool getVertexIsNotEndpointOfParent() const;
/**
* Set backscatter setting.
* @param[in] val The backscatter setting.
*/
- inline void setBackscatter(bool val = true)
- {
- _backscatter = val;
- }
+ void setBackscatter(bool val = true);
/**
* Get the backscatter setting.
* @return The backscatter setting.
*/
- inline bool getBackscatter() const
- {
- return _backscatter;
- }
+ bool getBackscatter() const;
+
/**
* Set the below threshold setting.
* @param[in] val The below threshold setting.
*/
- inline void setBelowThreshold(bool val = true)
- {
- _belowThreshold = val;
- }
+ void setBelowThreshold(bool val = true);
/**
* Get the below threshold setting.
* @return True if below threshold; false if not.
*/
- inline bool getBelowThreshold() const
- {
- return _belowThreshold;
- }
+ bool getBelowThreshold() const;
/**
* Get the track information from a track.
* @param[in] aTrack The G4Track object.
* @return The track information of the track.
*/
- static inline TrackInformation* getTrackInformation(const G4Track* aTrack)
- {
- return static_cast<TrackInformation*>(aTrack->GetUserInformation());
- }
+ static TrackInformation* getTrackInformation(const G4Track* aTrack);
/**
* Get the track information a step.
* @param[in] aStep The G4Step object.
* @return The track information from the step.
*/
- static inline TrackInformation* getTrackInformation(const G4Step* aStep)
- {
- return getTrackInformation(aStep->GetTrack());
- }
+ static TrackInformation* getTrackInformation(const G4Step* aStep);
/**
* Convert a tracking status to a string.
lcdd/include/lcdd/hits
diff -u -r1.4 -r1.5
--- TrackerHit.hh 10 Jul 2013 18:06:17 -0000 1.4
+++ TrackerHit.hh 10 Jul 2013 20:49:06 -0000 1.5
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackerHit.hh,v 1.4 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackerHit.hh,v 1.5 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_HITS_TRACKERHIT_HH
#define LCDD_HITS_TRACKERHIT_HH 1
@@ -63,145 +63,97 @@
* Set the time of the hit.
* @param[in] tdep The time of the hit.
*/
- void setTdep(const G4double tdep)
- {
- _tdep = tdep;
- }
+ void setTdep(const G4double tdep);
/**
* Set the energy deposition.
* @param[in] edep The energy deposition.
*/
- void setEdep(const G4double edep)
- {
- _edep = edep;
- }
+ void setEdep(const G4double edep);
/**
* Set the global position.
* @param[in] posXYZ The position in global coordinates (mm).
*/
- void setPos(const G4ThreeVector& posXYZ)
- {
- _pos = posXYZ;
- }
+ void setPos(const G4ThreeVector& posXYZ);
/**
* Set the momentum.
* @param[in] mom The hit's momentum.
*/
- void setMomentum(const G4ThreeVector& mom)
- {
- _mom = mom;
- }
+ void setMomentum(const G4ThreeVector& mom);
/**
* Set the track ID.
* @param[in] trkID The track ID.
*/
- void setTrackID(const G4int trkID)
- {
- _trkID = trkID;
- }
+ void setTrackID(const G4int trkID);
/**
* Set the PDG.
* @param[in] pdg The PDG code.
*/
- void setPDG(const G4int pdg)
- {
- _PDG = pdg;
- }
+ void setPDG(const G4int pdg);
/**
* Set the length of the step.
* @param[in] l The length of the step.
*/
- void setLength(const G4double l)
- {
- _length = l;
- }
+ void setLength(const G4double l);
/**
* Get the global time of the hit.
* @return The global time of the hit (ns).
*/
- G4double getTdep() const
- {
- return _tdep;
- }
+ G4double getTdep() const;
/**
* Get the energy deposition.
* @return The energy deposition.
*/
- G4double getEdep() const
- {
- return _edep;
- }
+ G4double getEdep() const;
/**
* Set the global position.
* @return The global position.
*/
- G4ThreeVector getPos() const
- {
- return _pos;
- }
+ G4ThreeVector getPos() const;
/**
* Get the momentum.
* @return The momentum.
*/
- G4ThreeVector getMomentum() const
- {
- return _mom;
- }
+ G4ThreeVector getMomentum() const;
/**
* Get the track ID.
* @return The track ID.
*/
- G4int getTrackID() const
- {
- return _trkID;
- }
+ G4int getTrackID() const;
/**
* Get the PDG code.
* @return The PDG code.
*/
- G4int getPDG() const
- {
- return _PDG;
- }
+ G4int getPDG() const;
/**
* Get the step length.
* @return The length of the step.
*/
- G4double getLength() const
- {
- return _length;
- }
+ G4double getLength() const;
/**
* Set the ID.
* @param[id] id1 The ID.
*/
- void setId(Id64bit::ElementType id1)
- {
- _id64.setId1(id1);
- }
+ void setId(Id64bit::ElementType id1);
/**
* Get the ID.
* @return The ID as an int.
*/
- int getId()
- {
- return _id64.getId1();
- }
+ int getId();
public:
lcdd/include/lcdd/id
diff -u -r1.4 -r1.5
--- Id64bit.hh 10 Jul 2013 18:06:17 -0000 1.4
+++ Id64bit.hh 10 Jul 2013 20:49:06 -0000 1.5
@@ -1,9 +1,9 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/Id64bit.hh,v 1.4 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/id/Id64bit.hh,v 1.5 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_ID64BIT_HH
#define LCDD_ID64BIT_HH 1
/**
- * @brief A 64-bit bit ID.
+ * @brief A 64-bit ID composed of two 32-bit halves.
* @todo Move code to source file.
*/
class Id64bit
@@ -18,70 +18,46 @@
/**
* Class constructor.
*/
- Id64bit()
- {
- resetIds();
- }
+ Id64bit();
/**
* Class destructor.
*/
- virtual ~Id64bit()
- {
- }
+ virtual ~Id64bit();
/**
* Set to default values.
*/
- void resetIds()
- {
- _ids[0] = 0;
- _ids[1] = 0;
- }
+ void resetIds();
/**
* Set the first 32 bits of the ID.
* @param[id] id0 The first 32 bits of the ID.
*/
- void setId0(ElementType id0)
- {
- _ids[0] = id0;
- }
+ void setId0(ElementType id0);
/**
* Set the second 32 bits of the ID.
* @param[id] id1 The second 32 bits of the ID.
*/
- void setId1(ElementType id1)
- {
- _ids[1] = id1;
- }
+ void setId1(ElementType id1);
/**
* Get the first 32 bits of the ID.
* @return The first half of the ID.
*/
- ElementType getId0() const
- {
- return _ids[0];
- }
+ ElementType getId0() const;
/**
* Get the second 32 bits of the ID.
* @return The second half of the ID.
*/
- ElementType getId1() const
- {
- return _ids[1];
- }
+ ElementType getId1() const;
/**
* Overloaded equals operator.
*/
- bool operator==(const Id64bit& right) const
- {
- return (_ids[0] == right._ids[0] && _ids[1] == right._ids[1]);
- }
+ bool operator==(const Id64bit& right) const;
private:
ElementType _ids[2];
lcdd/include/lcdd/id
diff -u -r1.6 -r1.7
--- IdComparator.hh 10 Jul 2013 18:06:17 -0000 1.6
+++ IdComparator.hh 10 Jul 2013 20:49:06 -0000 1.7
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdComparator.hh,v 1.6 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdComparator.hh,v 1.7 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_IDCOMPARATOR_HH
#define LCDD_IDCOMPARATOR_HH 1
@@ -15,16 +15,12 @@
/**
* Class constructor.
*/
- IdComparator()
- {
- }
+ IdComparator();
/**
* Class destructor.
*/
- virtual ~IdComparator()
- {
- }
+ virtual ~IdComparator();
public:
@@ -34,10 +30,7 @@
* @param[id] hit2 The second hit.
* @return True if the hit's IDs are equal; false if not.
*/
- bool compare(const CalorimeterHit& hit1, const CalorimeterHit& hit2) const
- {
- return (hit1.getId64bit() == hit2.getId64bit());
- }
+ bool compare(const CalorimeterHit& hit1, const CalorimeterHit& hit2) const;
};
#endif
lcdd/include/lcdd/id
diff -u -r1.3 -r1.4
--- IdField.hh 10 Jul 2013 18:06:17 -0000 1.3
+++ IdField.hh 10 Jul 2013 20:49:06 -0000 1.4
@@ -1,13 +1,14 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdField.hh,v 1.3 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdField.hh,v 1.4 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_IDFIELD_HH
#define LCDD_IDFIELD_HH 1
+// STL
#include <string>
/**
* @brief An individual field in an identifier specification, including
- * start, length, label and signed flag.
+ * start position, length, label and signed flag.
*/
class IdField
{
@@ -20,16 +21,12 @@
/**
* Class constructor.
*/
- IdField()
- {
- }
+ IdField();
/**
* Class destructor.
*/
- virtual ~IdField()
- {
- }
+ virtual ~IdField();
/**
* Fully qualified constructor.
@@ -38,82 +35,55 @@
* @param[in] length The length.
* @param[in] isSigned Flag indiciating if signed or not.
*/
- IdField(const std::string& label, SizeType start, SizeType length, bool isSigned) :
- _label(label), _start(start), _length(length), _isSigned(isSigned)
- {
- }
+ IdField(const std::string& label, SizeType start, SizeType length, bool isSigned);
/**
* Set the label on the field.
* @param[in] l The label.
*/
- void setLabel(const std::string& l)
- {
- _label = l;
- }
+ void setLabel(const std::string& l);
/**
* Set the starting bit position of the field.
* @param[in] st The startng bit position.
*/
- void setStart(SizeType st)
- {
- _start = st;
- }
+ void setStart(SizeType st);
/**
* Set the length of the field.
* @param[in] st The length of the field.
*/
- void setLength(SizeType st)
- {
- _length = st;
- }
+ void setLength(SizeType st);
/**
* Set if the field is signed or not.
* @param[in] s The signed flag.
*/
- void setSigned(bool s)
- {
- _isSigned = s;
- }
+ void setSigned(bool s);
/**
* Get the label.
* @return The label.
*/
- const std::string& getLabel()
- {
- return _label;
- }
+ const std::string& getLabel();
/**
* Get the starting bit position.
* @return The starting position.
*/
- SizeType getStart()
- {
- return _start;
- }
+ SizeType getStart();
/**
* Get the length.
* @return The length.
*/
- SizeType getLength()
- {
- return _length;
- }
+ SizeType getLength();
/**
* Get the signed flag.
* @return True if field is signed; false if not.
*/
- bool getSigned()
- {
- return _isSigned;
- }
+ bool getSigned();
private:
lcdd/include/lcdd/id
diff -u -r1.4 -r1.5
--- IdManager.hh 10 Jul 2013 18:06:17 -0000 1.4
+++ IdManager.hh 10 Jul 2013 20:49:06 -0000 1.5
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdManager.hh,v 1.4 2013/07/10 18:06:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdManager.hh,v 1.5 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_IDMANAGER_HH
#define LCDD_IDMANAGER_HH 1
@@ -109,30 +109,21 @@
* @return True if volume has PhysVolId; false if not.
* @todo This method should be moved to another class.
*/
- bool hasPhysVolIds(G4VPhysicalVolume* pv) const
- {
- return _physVolIdMap.hasPhysVolIds(pv);
- }
+ bool hasPhysVolIds(G4VPhysicalVolume* pv) const;
/**
* Get the map of PhysVolId objects.
* @todo This method should be moved to another class.
* @return The map of PhysVolId objects.
*/
- const PhysVolIdMap& getPhysVolIdMap() const
- {
- return _physVolIdMap;
- }
+ const PhysVolIdMap& getPhysVolIdMap() const;
/**
* Get the PhysVolId objects for a given physical volume.
* @param[in] pv The G4VPhysicalVolume object.
* @return The PhysVolId objects associated to the volume.
*/
- PhysVolId::PhysVolIds& getPhysVolIds(G4VPhysicalVolume* pv)
- {
- return _physVolIdMap.getPhysVolIds(pv);
- }
+ PhysVolId::PhysVolIds& getPhysVolIds(G4VPhysicalVolume* pv);
/**
* Print out the IdVec.
lcdd/include/lcdd/util
diff -u -r1.5 -r1.6
--- NistElementsDump.hh 10 Jul 2013 18:06:19 -0000 1.5
+++ NistElementsDump.hh 10 Jul 2013 20:49:06 -0000 1.6
@@ -1,4 +1,4 @@
-// $Id: NistElementsDump.hh,v 1.5 2013/07/10 18:06:19 jeremy Exp $
+// $Id: NistElementsDump.hh,v 1.6 2013/07/10 20:49:06 jeremy Exp $
#ifndef LCDD_UTIL_NISTELEMENTSDUMP_HH
#define LCDD_UTIL_NISTELEMENTSDUMP_HH 1
@@ -24,10 +24,7 @@
* Class constructor.
* Should not be instantiated.
*/
- NistElementsDump()
- {
- ;
- }
+ NistElementsDump();
public:
lcdd/src/lcdd/geant4
diff -N PhysVolIdMap.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ PhysVolIdMap.cc 10 Jul 2013 20:49:06 -0000 1.1
@@ -0,0 +1,43 @@
+// $Header: /cvs/lcd/lcdd/src/lcdd/geant4/PhysVolIdMap.cc,v 1.1 2013/07/10 20:49:06 jeremy Exp $
+
+// LCDD
+#include "lcdd/geant4/PhysVolIdMap.hh"
+
+PhysVolIdMap::PhysVolIdMap()
+{}
+
+PhysVolIdMap::~PhysVolIdMap()
+{}
+
+void PhysVolIdMap::addPhysVolId(G4VPhysicalVolume* pv, PhysVolId id)
+{
+ if (!hasPhysVolIds(pv)) {
+ createPhysVolIds(pv);
+ }
+
+ PhysVolId::PhysVolIds& idvec = getPhysVolIds(pv);
+ idvec.push_back(id);
+}
+
+
+void PhysVolIdMap::createPhysVolIds(G4VPhysicalVolume* pv)
+{
+ PhysVolId::PhysVolIds pvid;
+ (*this)[pv] = pvid;
+}
+
+bool PhysVolIdMap::hasPhysVolIds(G4VPhysicalVolume* pv) const
+{
+ return (this->find(pv) != this->end());
+}
+
+PhysVolId::PhysVolIds& PhysVolIdMap::getPhysVolIds(G4VPhysicalVolume* pv)
+{
+ // create an empty one if not exists
+ if (!hasPhysVolIds(pv)) {
+ createPhysVolIds(pv);
+ }
+
+ // return ptr to vec
+ return (*this)[pv];
+}
lcdd/src/lcdd/hits
diff -u -r1.3 -r1.4
--- CalorimeterHit.cc 10 Jul 2013 16:49:47 -0000 1.3
+++ CalorimeterHit.cc 10 Jul 2013 20:49:06 -0000 1.4
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/hits/CalorimeterHit.cc,v 1.3 2013/07/10 16:49:47 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/hits/CalorimeterHit.cc,v 1.4 2013/07/10 20:49:06 jeremy Exp $
// LCDD
#include "lcdd/hits/CalorimeterHit.hh"
@@ -97,3 +97,65 @@
return os;
}
+
+void CalorimeterHit::setPos(const G4ThreeVector& posXYZ)
+{
+ _pos = posXYZ;
+}
+
+
+void CalorimeterHit::setEdep(const G4double ed)
+{
+ _edep = ed;
+}
+
+void CalorimeterHit::incrEdep(const G4double edincr)
+{
+ _edep += edincr;
+}
+
+
+G4ThreeVector CalorimeterHit::getPos() const
+{
+ return _pos;
+}
+
+G4double CalorimeterHit::getEdep() const
+{
+ return _edep;
+}
+
+
+void CalorimeterHit::addHitContribution(HitContribution contrib)
+{
+ _particleList.push_back(contrib);
+}
+
+
+const HitContributionList& CalorimeterHit::getHitContributions() const
+{
+ return _particleList;
+}
+
+
+void CalorimeterHit::setId64bit(Id64bit::ElementType id0, Id64bit::ElementType id1)
+{
+ _id64.setId0(id0);
+ _id64.setId1(id1);
+}
+
+
+const Id64bit& CalorimeterHit::getId64bit() const
+{
+ return _id64;
+}
+
+void CalorimeterHit::setEndcapFlag(bool ec)
+{
+ _endcap = ec;
+}
+
+bool CalorimeterHit::getEndcapFlag()
+{
+ return _endcap;
+}
lcdd/src/lcdd/hits
diff -u -r1.2 -r1.3
--- HitContribution.cc 10 Jul 2013 16:49:47 -0000 1.2
+++ HitContribution.cc 10 Jul 2013 20:49:06 -0000 1.3
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/hits/HitContribution.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/hits/HitContribution.cc,v 1.3 2013/07/10 20:49:06 jeremy Exp $
// LCDD
#include "lcdd/hits/HitContribution.hh"
@@ -62,3 +62,40 @@
{
os << _trackID << '\t' << _edep << '\t' << _PdgId << '\t' << _globalTime << std::endl;
}
+
+G4int HitContribution::getTrackID() const
+{
+ return _trackID;
+}
+
+G4double HitContribution::getEdep() const
+{
+ return _edep;
+}
+
+void HitContribution::incrEdep(G4double incr)
+{
+ _edep += incr;
+}
+
+G4int HitContribution::getPDGID() const
+{
+ return _PdgId;
+}
+
+G4double HitContribution::getGlobalTime() const
+{
+ return _globalTime;
+}
+
+void HitContribution::setMinTime(G4double new_time)
+{
+ if (new_time < _globalTime) {
+ _globalTime = new_time;
+ }
+}
+
+const float* HitContribution::getPosition() const
+{
+ return _position;
+}
lcdd/src/lcdd/hits
diff -u -r1.2 -r1.3
--- TrackInformation.cc 10 Jul 2013 16:49:47 -0000 1.2
+++ TrackInformation.cc 10 Jul 2013 20:49:06 -0000 1.3
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/hits/TrackInformation.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/hits/TrackInformation.cc,v 1.3 2013/07/10 20:49:06 jeremy Exp $
// LCDD
#include "lcdd/hits/TrackInformation.hh"
@@ -80,3 +80,97 @@
return str_invalid;
}
+
+int TrackInformation::operator ==(const TrackInformation& right) const
+{
+ return (this == &right);
+}
+
+void TrackInformation::Print() const
+{
+}
+
+const std::string& TrackInformation::getTrackingStatusString() const
+{
+ return TrackInformation::getTrackingStatusString(getTrackingStatus());
+}
+
+G4int TrackInformation::getOriginalTrackID() const
+{
+ return _originalTrackID;
+}
+
+TrackInformation::ETrackingStatus TrackInformation::getOriginalTrackingStatus() const
+{
+ return _originalTrackingStatus;
+}
+
+TrackInformation::ETrackingStatus TrackInformation::getTrackingStatus() const
+{
+ return _trackingStatus;
+}
+
+bool TrackInformation::hasTrackerHit() const
+{
+ return _hasTrackerHit;
+}
+
+void TrackInformation::setHasTrackerHit(bool hasHit)
+{
+ _hasTrackerHit = hasHit;
+}
+
+void TrackInformation::setTrackID(G4int id)
+{
+ _originalTrackID = id;
+}
+
+void TrackInformation::setTrackingStatus(ETrackingStatus st)
+{
+ _trackingStatus = st;
+}
+
+void TrackInformation::setOriginalTrackingStatus(ETrackingStatus st)
+{
+ _originalTrackingStatus = st;
+}
+
+void TrackInformation::setVertexIsNotEndpointOfParent(bool val)
+{
+ _vertexIsNotEndpointOfParent = val;
+}
+
+bool TrackInformation::getVertexIsNotEndpointOfParent() const
+{
+ return _vertexIsNotEndpointOfParent;
+}
+
+void TrackInformation::setBackscatter(bool val)
+{
+ _backscatter = val;
+}
+
+bool TrackInformation::getBackscatter() const
+{
+ return _backscatter;
+}
+
+void TrackInformation::setBelowThreshold(bool val)
+{
+ _belowThreshold = val;
+}
+
+bool TrackInformation::getBelowThreshold() const
+{
+ return _belowThreshold;
+}
+
+TrackInformation* TrackInformation::getTrackInformation(const G4Track* aTrack)
+{
+ return static_cast<TrackInformation*>(aTrack->GetUserInformation());
+}
+
+TrackInformation* TrackInformation::getTrackInformation(const G4Step* aStep)
+{
+ return getTrackInformation(aStep->GetTrack());
+}
lcdd/src/lcdd/hits
diff -u -r1.3 -r1.4
--- TrackerHit.cc 10 Jul 2013 18:06:19 -0000 1.3
+++ TrackerHit.cc 10 Jul 2013 20:49:06 -0000 1.4
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/hits/TrackerHit.cc,v 1.3 2013/07/10 18:06:19 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/hits/TrackerHit.cc,v 1.4 2013/07/10 20:49:06 jeremy Exp $
// LCDD
#include "lcdd/hits/TrackerHit.hh"
@@ -53,3 +53,83 @@
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;
}
+
+void TrackerHit::setTdep(const G4double tdep)
+{
+ _tdep = tdep;
+}
+
+void TrackerHit::setEdep(const G4double edep)
+{
+ _edep = edep;
+}
+
+void TrackerHit::setPos(const G4ThreeVector& posXYZ)
+{
+ _pos = posXYZ;
+}
+
+void TrackerHit::setMomentum(const G4ThreeVector& mom)
+{
+ _mom = mom;
+}
+
+void TrackerHit::setTrackID(const G4int trkID)
+{
+ _trkID = trkID;
+}
+
+void TrackerHit::setPDG(const G4int pdg)
+{
+ _PDG = pdg;
+}
+
+void TrackerHit::setLength(const G4double l)
+{
+ _length = l;
+}
+
+G4double TrackerHit::getTdep() const
+{
+ return _tdep;
+}
+
+G4double TrackerHit::getEdep() const
+{
+ return _edep;
+}
+
+G4ThreeVector TrackerHit::getPos() const
+{
+ return _pos;
+}
+
+G4ThreeVector TrackerHit::getMomentum() const
+{
+ return _mom;
+}
+
+G4int TrackerHit::getTrackID() const
+{
+ return _trkID;
+}
+
+G4int TrackerHit::getPDG() const
+{
+ return _PDG;
+}
+
+G4double TrackerHit::getLength() const
+{
+ return _length;
+}
+
+void TrackerHit::setId(Id64bit::ElementType id1)
+{
+ _id64.setId1(id1);
+}
+
+int TrackerHit::getId()
+{
+ return _id64.getId1();
+}
lcdd/src/lcdd/id
diff -N Id64bit.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Id64bit.cc 10 Jul 2013 20:49:06 -0000 1.1
@@ -0,0 +1,48 @@
+// $Header: /cvs/lcd/lcdd/src/lcdd/id/Id64bit.cc,v 1.1 2013/07/10 20:49:06 jeremy Exp $
+
+#include "lcdd/id/Id64bit.hh"
+
+
+Id64bit::Id64bit()
+{
+ resetIds();
+}
+
+
+Id64bit::~Id64bit()
+{
+}
+
+void Id64bit::resetIds()
+{
+ _ids[0] = 0;
+ _ids[1] = 0;
+}
+
+
+void Id64bit::setId0(ElementType id0)
+{
+ _ids[0] = id0;
+}
+
+
+void Id64bit::setId1(ElementType id1)
+{
+ _ids[1] = id1;
+}
+
+Id64bit::ElementType Id64bit::getId0() const
+{
+ return _ids[0];
+}
+
+
+Id64bit::ElementType Id64bit::getId1() const
+{
+ return _ids[1];
+}
+
+bool Id64bit::operator==(const Id64bit& right) const
+{
+ return (_ids[0] == right._ids[0] && _ids[1] == right._ids[1]);
+}
lcdd/src/lcdd/id
diff -N IdComparator.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ IdComparator.cc 10 Jul 2013 20:49:06 -0000 1.1
@@ -0,0 +1,17 @@
+// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdComparator.cc,v 1.1 2013/07/10 20:49:06 jeremy Exp $
+
+// LCDD
+#include "lcdd/id/IdComparator.hh"
+
+IdComparator::IdComparator()
+{
+}
+
+IdComparator::~IdComparator()
+{
+}
+
+bool IdComparator::compare(const CalorimeterHit& hit1, const CalorimeterHit& hit2) const
+{
+ return (hit1.getId64bit() == hit2.getId64bit());
+}
lcdd/src/lcdd/id
diff -N IdField.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ IdField.cc 10 Jul 2013 20:49:06 -0000 1.1
@@ -0,0 +1,59 @@
+// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdField.cc,v 1.1 2013/07/10 20:49:06 jeremy Exp $
+
+
+IdField::IdField()
+{
+}
+
+IdField::~IdField()
+{
+}
+
+
+IdField::IdField(const std::string& label, SizeType start, SizeType length, bool isSigned) :
+ _label(label), _start(start), _length(length), _isSigned(isSigned)
+{
+}
+
+
+void IdField::setLabel(const std::string& l)
+{
+ _label = l;
+}
+
+
+void IdField::setStart(SizeType st)
+{
+ _start = st;
+}
+
+void IdField::setLength(SizeType st)
+{
+ _length = st;
+}
+
+void IdField::setSigned(bool s)
+{
+ _isSigned = s;
+}
+
+const std::string& IdField::getLabel()
+{
+ return _label;
+}
+
+IdField::SizeType IdField::getStart()
+{
+ return _start;
+}
+
+
+IdField::SizeType IdField::getLength()
+{
+ return _length;
+}
+
+bool IdField::getSigned()
+{
+ return _isSigned;
+}
lcdd/src/lcdd/id
diff -u -r1.2 -r1.3
--- IdManager.cc 10 Jul 2013 16:49:47 -0000 1.2
+++ IdManager.cc 10 Jul 2013 20:49:06 -0000 1.3
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdManager.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdManager.cc,v 1.3 2013/07/10 20:49:06 jeremy Exp $
// LCDD
#include "lcdd/id/IdManager.hh"
@@ -86,3 +86,20 @@
os << std::endl;
}
+
+
+bool IdManager::hasPhysVolIds(G4VPhysicalVolume* pv) const
+{
+ return _physVolIdMap.hasPhysVolIds(pv);
+}
+
+
+const PhysVolIdMap& IdManager::getPhysVolIdMap() const
+{
+ return _physVolIdMap;
+}
+
+PhysVolId::PhysVolIds& IdManager::getPhysVolIds(G4VPhysicalVolume* pv)
+{
+ return _physVolIdMap.getPhysVolIds(pv);
+}
lcdd/src/lcdd/util
diff -u -r1.1 -r1.2
--- NistElementsDump.cc 26 Jun 2013 23:51:02 -0000 1.1
+++ NistElementsDump.cc 10 Jul 2013 20:49:06 -0000 1.2
@@ -1,4 +1,4 @@
-// $Id: NistElementsDump.cc,v 1.1 2013/06/26 23:51:02 jeremy Exp $
+// $Id: NistElementsDump.cc,v 1.2 2013/07/10 20:49:06 jeremy Exp $
// LCDD
#include "lcdd/util/NistElementsDump.hh"
@@ -21,6 +21,11 @@
#include "lcdd/util/ElementNames.icc"
+NistElementsDump::NistElementsDump()
+{
+}
+
+
void NistElementsDump::writeXml(const std::string& filename)
{
ofstream fstr;
CVSspam 0.2.12