4 modified files
lcdd/include
diff -u -r1.11 -r1.12
--- G4CalorimeterSD.hh 12 Jul 2007 18:09:00 -0000 1.11
+++ G4CalorimeterSD.hh 12 Jul 2007 23:48:37 -0000 1.12
@@ -49,6 +49,8 @@
virtual double getEdep() const;
+ G4CalorimeterHitList getCalorimeterHitList();
+
protected:
virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
lcdd/include
diff -u -r1.16 -r1.17
--- G4TrackerSD.hh 12 Jul 2007 18:09:00 -0000 1.16
+++ G4TrackerSD.hh 12 Jul 2007 23:48:37 -0000 1.17
@@ -30,6 +30,8 @@
double getEdep() const;
void clearHits();
+
+ G4TrackerHitList getTrackerHitList();
protected:
virtual G4bool ProcessHits(G4Step*, G4TouchableHistory*);
lcdd/src
diff -u -r1.31 -r1.32
--- G4CalorimeterSD.cc 12 Jul 2007 18:09:01 -0000 1.31
+++ G4CalorimeterSD.cc 12 Jul 2007 23:48:38 -0000 1.32
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4CalorimeterSD.cc,v 1.31 2007/07/12 18:09:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4CalorimeterSD.cc,v 1.32 2007/07/12 23:48:38 jeremy Exp $
#include "G4CalorimeterSD.hh"
// lcdd
@@ -76,7 +76,7 @@
{
#ifdef G4VERBOSE
if ( getVerbose() > 0 ) {
- std::cout << "G4CalorimeterSD::ProcessHits - " << this->GetName() << std::endl;
+ std::cout << "G4CalorimeterSD::ProcessHits - " << this->GetName() << std::endl;
}
#endif
@@ -131,7 +131,7 @@
}
#endif
- // add it to lkp map
+ // add it to lkp map
m_hits.push_back(thisHit);
// add to the HC
@@ -233,12 +233,14 @@
return edep;
}
-void G4CalorimeterSD::clearHits() {
-// for ( G4CalorimeterHitList::iterator it = m_hits.begin();
-// it != m_hits.end();
-// it++ ) {
-// delete *it;
-// }
+void G4CalorimeterSD::clearHits()
+{
m_hits.clear();
m_nhits=0;
}
+
+G4CalorimeterSD::G4CalorimeterHitList G4CalorimeterSD::getCalorimeterHitList()
+{
+ return m_hits;
+}
+
lcdd/src
diff -u -r1.31 -r1.32
--- G4TrackerSD.cc 12 Jul 2007 18:09:01 -0000 1.31
+++ G4TrackerSD.cc 12 Jul 2007 23:48:38 -0000 1.32
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4TrackerSD.cc,v 1.31 2007/07/12 18:09:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4TrackerSD.cc,v 1.32 2007/07/12 23:48:38 jeremy Exp $
// LCDD
#include "IdManager.hh"
@@ -130,11 +130,11 @@
void G4TrackerSD::clearHits()
{
- //for ( G4TrackerHitList::iterator it = m_hits.begin();
- // it != m_hits.end();
- // it++ ) {
- // delete *it;
- // }
m_hits.clear();
m_nhits=0;
}
+
+G4TrackerSD::G4TrackerHitList G4TrackerSD::getTrackerHitList()
+{
+ return m_hits;
+}
CVSspam 0.2.8