lcdd/include

diff -u -r1.11 -r1.12
--- ReadoutUtil.hh	27 Jun 2005 21:45:20 -0000	1.11
+++ ReadoutUtil.hh	19 Jul 2005 02:11:47 -0000	1.12
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/include/ReadoutUtil.hh,v 1.11 2005/06/27 21:45:20 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/ReadoutUtil.hh,v 1.12 2005/07/19 02:11:47 jeremy Exp $

 #ifndef ReadoutUtil_hh
 #define ReadoutUtil_hh 1
 

@@ -66,6 +66,8 @@

 
   static int getVolumeNumber(G4TouchableHandle theTouchable, int historyDepth = -1);
 

+  static std::vector<G4VPhysicalVolume*> getPhysVolList( G4Step* aStep );
+

 public:
 
   static const double PI;

lcdd/src

diff -u -r1.21 -r1.22
--- IdFactory.cc	19 Jul 2005 02:02:33 -0000	1.21
+++ IdFactory.cc	19 Jul 2005 02:11:48 -0000	1.22
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/IdFactory.cc,v 1.21 2005/07/19 02:02:33 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/IdFactory.cc,v 1.22 2005/07/19 02:11:48 jeremy Exp $

 
 // set for verbose output from this class
 #define ID_DEBUG 1

@@ -392,28 +392,3 @@

 
   return fnd;
 }

-
-std::vector<G4VPhysicalVolume*> IdFactory::getPhysVolList( G4Step* aStep )
-{
-  std::vector<G4VPhysicalVolume*> physVols;
-
-  // get touchable from PreStepPoint
-  G4TouchableHandle theTouchable = aStep->GetPreStepPoint()->GetTouchableHandle();
-
-  G4int hdepth = theTouchable->GetHistoryDepth();
-
-  const G4NavigationHistory* theTouchableHistory = theTouchable->GetHistory();
-
-  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;
-#endif
-  }
-
-  return physVols;
-}

lcdd/src

diff -u -r1.8 -r1.9
--- ReadoutUtil.cc	27 Jun 2005 22:05:56 -0000	1.8
+++ ReadoutUtil.cc	19 Jul 2005 02:11:48 -0000	1.9
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/ReadoutUtil.cc,v 1.8 2005/06/27 22:05:56 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/ReadoutUtil.cc,v 1.9 2005/07/19 02:11:48 jeremy Exp $

 #include "ReadoutUtil.hh"
 
 #include <cmath>

@@ -101,6 +101,31 @@

   return localPos;
 }
 

+std::vector<G4VPhysicalVolume*> ReadoutUtil::getPhysVolList( G4Step* aStep )
+{
+  std::vector<G4VPhysicalVolume*> physVols;
+
+  // get touchable from PreStepPoint
+  G4TouchableHandle theTouchable = aStep->GetPreStepPoint()->GetTouchableHandle();
+
+  G4int hdepth = theTouchable->GetHistoryDepth();
+
+  const G4NavigationHistory* theTouchableHistory = theTouchable->GetHistory();
+
+  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;
+#endif
+  }
+
+  return physVols;
+}
+

 int ReadoutUtil::getVolumeNumber(G4TouchableHandle theTouchable, int historyDepth)
 {
   bool no_depth = false;