lcdd/include
diff -u -r1.10 -r1.11
--- G4SensitiveDetector.hh 27 Jun 2005 20:40:34 -0000 1.10
+++ G4SensitiveDetector.hh 9 Dec 2005 01:57:14 -0000 1.11
@@ -19,7 +19,11 @@
class G4SensitiveDetector : public G4VSensitiveDetector, protected G4StepReadout
{
public:
- enum EType { eTracker=0, eCalorimeter };
+ 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,
@@ -38,6 +42,8 @@
public:
EType getType() const;
+ const std::string& getTypeString() const;
+
G4int getHCID() const;
virtual bool isValidVolume(G4LogicalVolume* lv);
lcdd/src
diff -u -r1.8 -r1.9
--- G4SensitiveDetector.cc 27 Jun 2005 20:40:35 -0000 1.8
+++ G4SensitiveDetector.cc 9 Dec 2005 01:57:15 -0000 1.9
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4SensitiveDetector.cc,v 1.8 2005/06/27 20:40:35 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4SensitiveDetector.cc,v 1.9 2005/12/09 01:57:15 jeremy Exp $
#include "G4SensitiveDetector.hh"
// LCDD
@@ -13,6 +13,10 @@
// std
#include <iostream>
+const std::string& G4SensitiveDetector::trackerStr = "tracker";
+const std::string& G4SensitiveDetector::calorimeterStr = "calorimeter";
+const std::string& G4SensitiveDetector::noneStr = "none";
+
G4SensitiveDetector::G4SensitiveDetector(G4String sdName,
G4String hcName,
EType sdType)
@@ -72,6 +76,18 @@
return m_type;
}
+const std::string& G4SensitiveDetector::getTypeString() const
+{
+ if ( m_type == eTracker ) {
+ return trackerStr;
+ }
+ else if ( m_type == eCalorimeter ) {
+ return calorimeterStr;
+ }
+ return noneStr;
+}
+
+
G4int G4SensitiveDetector::getHCID() const
{
return m_HCID;