LISTSERV 16.5 - LCD-CVS Archives

- * Add a bin name to the end of the list. - * @param[in] The name of the bin. - */ - void addBinName(const std::string& binName); - - /** - * Set the bin value. - * @param[in] binIdx The index of the bin. - * @param[in] binVal The value of the bin. - * @todo Change method name to "setBinValue". - */ - void setBin(int binIdx, int binVal); - - /**

+ * Set the valid bin names for this Segmentation. + * @note This should only be called once. + */ + virtual void setBinNames() = 0; + + /** + * Add a bin name to the end of the list. + * @param[in] The name of the bin. + */ + void addBinName(const std::string& binName); + + /** + * Set the bin value. + * @param[in] binIdx The index of the bin. + * @param[in] binVal The value of the bin. + * @todo Change method name to "setBinValue". + */ + void setBin(int binIdx, int binVal); + + /**

lcdd/include/lcdd/detectors

SensitiveDetector.hh 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- SensitiveDetector.hh	10 Jul 2013 18:06:17 -0000	1.4
+++ SensitiveDetector.hh	10 Jul 2013 22:39:26 -0000	1.5
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/SensitiveDetector.hh,v 1.4 2013/07/10 18:06:17 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/SensitiveDetector.hh,v 1.5 2013/07/10 22:39:26 jeremy Exp $

 
 #ifndef LCDD_DETECTORS_SENSITIVEDETECTOR_HH
 #define LCDD_DETECTORS_SENSITIVEDETECTOR_HH 1

@@ -21,7 +21,8 @@

  *        IdSpec,and hits collections.
  * @todo Move code to source file.
  */

-class SensitiveDetector: public G4VSensitiveDetector, protected StepReadout {

+class SensitiveDetector: public G4VSensitiveDetector, protected StepReadout
+{

 public:
 
 	/**

@@ -37,66 +38,75 @@

 
 public:

+	/**
+	 * Class constructor.
+	 * @param[in] sdName The name of the detector.
+	 * @param[in] hcName The name of the hit collection.
+	 * @param[in] sdType The type of the detector.
+	 */

 	SensitiveDetector(G4String sdName, G4String hcName, EType sdType);

-	SensitiveDetector(G4String sdName, const std::vector<G4String>& hcNames,
-			EType sdType);

+    /**
+     * Class constructor.
+     * @param[in] sdName  The name of the detector.
+     * @param[in] hcNames The names of the hit collections.
+     * @param[in] sdType  The type of the detector.
+     */
+	SensitiveDetector(G4String sdName, const std::vector<G4String>& hcNames, EType sdType);

+	/**
+	 * Class destructor.
+	 */

 	virtual ~SensitiveDetector();
 
 public:
 
 	/**
 	 * Geant4 initialization function called at beginning of event.

+	 * @param[in] hce The hit collections of this event.

*/

-	virtual void Initialize(G4HCofThisEvent *);

+	virtual void Initialize(G4HCofThisEvent* hce);

 
 	/**
 	 * Geant4 EndOfEvent hook.

+	 * @param[in] hce The hit collections of this event.

*/

-	virtual void EndOfEvent(G4HCofThisEvent *);

+	virtual void EndOfEvent(G4HCofThisEvent* hce);

 
 protected:
 
 	/**
 	 * Geant4 function to make hits from the step.

+	 * @param[in] step      The G4Step object.
+	 * @param[in] touchable The touchable handle to the current geometry.

*/

-	virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);

+	virtual G4bool ProcessHits(G4Step* step, G4TouchableHistory* touchable);

 
 public:
 
 	/**

-	 * Return the type of this detector encoded as an int.

+	 * Get the type of this detector encoded as an enum.
+	 * @return The type of this detector as an enum.

*/

-	inline SensitiveDetector::EType getType() const {
-		return _type;
-	}

+	SensitiveDetector::EType getType() const;

/**

-	 * Return the type of this detector encoded as a string.

+	 * Get the type of this detector encoded as a string.

*/

-	inline const std::string& getTypeString() const;

+	const std::string& getTypeString() const;

/**

-	 * Return the hits collection ID associated with this detector.

+	 * Get the hit collection ID associated with this detector.
+	 * @return The hit collection ID.

*/

-	inline G4int getHCID() const {
-		return _hcids[0];
-	}

+	G4int getHCID() const;

 
 	/**
 	 * Get the hit collection ID from the index.
 	 * @param[in] nHC The hit collection index.
 	 * @return The hit collection ID.
 	 */

-	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 _hcids[nHC];
-	}

+	G4int getHCID(G4int nHC) const;

 
 	/**
 	 * Check whether the G4LogicalVolume can be readout by this detector.

@@ -104,115 +114,73 @@

 	 * @param[in] lv The G4LogicalVolume object.
 	 * @return True if volume is valid; false if not.
 	 */

-	inline virtual bool isValidVolume(G4LogicalVolume* lv)
-	{
-		return lv != 0;
-	}

+	virtual bool isValidVolume(G4LogicalVolume* lv);

 
 	/**
 	 * Get the hit collection name associated with this detector.
 	 * @return The name of the hit collection.
 	 */

-	inline const std::string& getHCName() const
-	{
-		return collectionName[0];
-	}

+	const std::string& getHCName() const;

 
 	/**
 	 * Get the hit collection by index.
 	 * @return The hit collection by index.
 	 */

-	inline const std::string& getHCName(G4int nHC) const
-	{
-		return collectionName[nHC];
-	}

+	const std::string& getHCName(G4int nHC) const;

 
 	/**
 	 * Set the verbosity level of this detector.
 	 * @param[in] v The verbosity level.
 	 */

-	inline void setVerbose(unsigned int v)
-	{
-		_verbose = v;
-	}

+	void setVerbose(unsigned int v);

 
 	/**
 	 * Get the verbosity level of this detector.
 	 * @return The verbosity level of this detector.
 	 */

-	inline unsigned int getVerbose() const
-	{
-		return _verbose;
-	}

+	unsigned int getVerbose() const;

 
 	/**
 	 * Get the hit energy cut of this detector (GeV).
 	 * @return The energy cut.
 	 */

-	inline G4double getEcut()
-	{
-		return _ecut;
-	}

+	G4double getEcut();

 
 	/**
 	 * Set the hit energy cut of this detector.
 	 * @param[in] ecut The energy cut.
 	 */

-	inline void setEcut(G4double ecut)
-	{
-		_ecut = ecut;
-	}

+	void setEcut(G4double ecut);

 
 	/**
 	 * Set the identifier specification for this detector.
 	 * @param[in] idspec The identifier specification.
 	 */

-	inline void setIdSpec(IdSpec* idspec)
-	{
-		_idspec = idspec;
-	}

+	void setIdSpec(IdSpec* idspec);

 
 	/**
 	 * Get the identifier specification for this detector.
 	 * @return The identifier specification.
 	 */

-	inline IdSpec* getIdSpec() const
-	{
-		return _idspec;
-	}

+	IdSpec* getIdSpec() const;

 
 	/**
 	 * Check whether this detector has an associated identifier specification.
 	 * @return True if detector has identifier specification; false if not.
 	 */

-	inline bool hasIdSpec() const
-	{
-		return _idspec != 0;
-	}
-
-	/**
-	 * Create a 64-bit identifier based on the current step information.
-	 * @return A 64-bit identifier from the current step.
-	 */
-	Id64bit makeId() const;

+	bool hasIdSpec() const;

 
 	/**
 	 * Set the endcap flag.
 	 * @param[in] ec Set the endcap flag.
 	 */

-	inline void setEndcapFlag(bool ec = true)
-	{
-		_endcap = ec;
-	}

+	void setEndcapFlag(bool ec = true);

 
 	/**
 	 * Get the endcap flag.
 	 * @return The flag indicating endcap or not.
 	 */

-	inline bool getEndcapFlag()
-	{
-		return _endcap;
-	}

+	bool getEndcapFlag();

 
 	/**
 	 * Print basic information about this detector.

@@ -247,31 +215,13 @@

 	 * @param[in] os The output stream.
 	 * @return The same output stream.
 	 */

-	virtual std::ostream& printHits(std::ostream& os)
-	{
-		return os;
-	}
-
-	/**
-	 * Get the (first) hit collection associated with this detector.
-	 * @return The hit collection associated with this detector.
-	 */
-	G4VHitsCollection* getHitsCollection() const;
-
-	/**
-	 * Get a hits collection, using the hits collection ID (HCID).
-	 * @return The hit collection from the HC ID.
-	 */
-	G4VHitsCollection* getHitsCollection(G4int) const;

+	virtual std::ostream& printHits(std::ostream& os);

 
 	/**
 	 * Get the number of hits collections associated to this detector.
 	 * @return The number of hit collections.
 	 */

-	inline int getNumberOfHitsCollections() const
-	{
-		return _hcids.size();
-	}

+	int getNumberOfHitsCollections() const;

 
     /**
      * Get the total energy deposition from the hits of this detector.

@@ -279,10 +229,7 @@

      *       so this function must be implemented by subclasses.
      * @return The total energy deposition of all the hits.
      */

-    virtual double getEdep() const
-    {
-    	return 0.0;
-    }

+    virtual double getEdep() const;

 
     /**
      * Get a list of G4LogicalVolume objects that have been assigned to this detector.

@@ -294,36 +241,40 @@

      * Clear the list of hits after event processing.
      * @note Sub-classes must implement this method.
      */

-    virtual void clearHits()
-    {
-    	;
-    }

+    virtual void clearHits();

 
 protected:
 
     /**

-     * Set the Hits Collection ID for a single collection.

+     * Get the (first) hit collection associated with this detector.
+     * @return The hit collection associated with this detector.
+     */
+    G4VHitsCollection* getHitsCollection() const;
+
+    /**
+     * Get a hits collection, using the hits collection ID (HCID).
+     * @return The hit collection from the HC ID.
+     */
+    G4VHitsCollection* getHitsCollection(G4int) const;
+
+    /**
+     * Create a 64-bit identifier based on the current step information.
+     * @return A 64-bit identifier from the current step.
+     */
+    Id64bit makeId() const;
+
+    /**
+     * Set the Hits Collection ID.

      * @param[in] The hit collection ID.
      */

-    inline void setHCID(G4int hcid)
-    {
-        _hcids[0] = hcid;
-    }

+    void setHCID(G4int hcid);

 
     /**
      * Set the Hits Collection ID for a given collection.
      * @param[in] hcid The hit collection ID.
      * @param[in] nHC  The numerical index of the hit 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.");
-        }
-        _hcids[nHC] = hcid;
-    }

+    void setHCID(G4int hcid, G4int nHC);

 
 protected:

+ /** + * Create an IdVec ordered by the SD's idspec, or an empty vec if the SD does not have one. + * @param[in] aStep A G4Step object. + * @param[in] sd The SensitiveDetector object. + * @return The vector of ID field values. + */ + static IdVec createOrderedIdVec(G4Step* aStep, const SensitiveDetector* sd); + +private: +

- * Create an IdVec ordered by the SD's idspec, or an empty vec if the SD does not have one. - * @param[in] aStep A G4Step object. - * @param[in] sd The SensitiveDetector object. - * @return The vector of ID field values. - */ - static IdVec createOrderedIdVec(G4Step* aStep, const SensitiveDetector* sd); - - /**

+ +SensitiveDetector::EType SensitiveDetector::getType() const +{ + return _type; +} + +G4int SensitiveDetector::getHCID() const +{ + return _hcids[0]; +} + +G4int SensitiveDetector::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 _hcids[nHC]; +} + + +bool SensitiveDetector::isValidVolume(G4LogicalVolume* lv) +{ + return lv != 0; +} + +const std::string& SensitiveDetector::getHCName() const +{ + return collectionName[0]; +} + +const std::string& SensitiveDetector::getHCName(G4int nHC) const +{ + return collectionName[nHC]; +} + +void SensitiveDetector::setVerbose(unsigned int v) +{ + _verbose = v; +} + +unsigned int SensitiveDetector::getVerbose() const +{ + return _verbose; +} + +G4double SensitiveDetector::getEcut() +{ + return _ecut; +} + +void SensitiveDetector::setEcut(G4double ecut) +{ + _ecut = ecut; +} + +void SensitiveDetector::setIdSpec(IdSpec* idspec) +{ + _idspec = idspec; +} + +IdSpec* SensitiveDetector::getIdSpec() const +{ + return _idspec; +} + +bool SensitiveDetector::hasIdSpec() const +{ + return _idspec != 0; +} + +void SensitiveDetector::setEndcapFlag(bool ec) +{ + _endcap = ec; +} + +bool SensitiveDetector::getEndcapFlag() +{ + return _endcap; +} + +std::ostream& printHits(std::ostream& os) +{ + return os; +} + +void SensitiveDetector::clearHits() +{ +} + +int SensitiveDetector::getNumberOfHitsCollections() const +{ + return _hcids.size(); +} + +double SensitiveDetector::getEdep() const +{ + return 0.0; +} + +void SensitiveDetector::setHCID(G4int hcid) +{ + _hcids[0] = hcid; +} + +void SensitiveDetector::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."); + } + _hcids[nHC] = hcid; +}

Commit in `lcdd` on MAIN
`include/lcdd/core/LCDDParser.hh`	+6	-8	1.7 -> 1.8
`include/lcdd/detectors/GridXYZSegmentation.hh`	+6	-6	1.5 -> 1.6
`/NonprojectiveCylinderSegmentation.hh`	+8	-10	1.5 -> 1.6
`/ProjectiveSegmentation.hh`	+3	-3	1.6 -> 1.7
`/Segmentation.hh`	+21	-21	1.7 -> 1.8
`/SensitiveDetector.hh`	+72	-121	1.4 -> 1.5
`/UnsegmentedCalorimeterSD.hh`	+2	-5	1.3 -> 1.4
`include/lcdd/geant4/PhysVolIdMap.hh`	+9	-7	1.6 -> 1.7
`include/lcdd/hits/CalorimeterHit.hh`	+1	-3	1.6 -> 1.7
`include/lcdd/id/IdFactory.hh`	+14	-11	1.4 -> 1.5
`/IdManager.hh`	+2	-5	1.5 -> 1.6
`src/lcdd/detectors/NonprojectiveCylinderSegmentation.cc`	+7	-1	1.3 -> 1.4
`/SensitiveDetector.cc`	+115	-1	1.2 -> 1.3
`/UnsegmentedCalorimeterSD.cc`	+6	-1	1.3 -> 1.4
`src/lcdd/id/IdManager.cc`	+6	-1	1.4 -> 1.5
	+278	-204