diff -u -r1.6 -r1.7
--- G4GridXYZSegmentation.hh	18 Dec 2006 22:49:01 -0000	1.6
+++ G4GridXYZSegmentation.hh	1 Apr 2008 19:53:02 -0000	1.7
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/include/G4GridXYZSegmentation.hh,v 1.6 2006/12/18 22:49:01 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/G4GridXYZSegmentation.hh,v 1.7 2008/04/01 19:53:02 wenzel Exp $

 #ifndef LCDD_G4GRIDXYZSEGMENTATION_HH
 #define LCDD_G4GRIDXYZSEGMENTATION_HH 1
 

@@ -27,12 +27,13 @@

 
   // from par class
   virtual G4ThreeVector getGlobalHitPos(const G4Step* aStep);

-

+  // hit position from step position
+  virtual G4ThreeVector getGlobalHitPos(const G4StepPoint* aPreStepPoint);

   // hit position from step position
   G4ThreeVector getLocalHitPos(const G4ThreeVector& localStepPos);
 
   virtual void setBins(const G4Step* aStep);

-

+  virtual void setBins(const G4StepPoint* aPreStepPoint);

   virtual void setBinNames()
   {
     addBinName("x");

diff -u -r1.6 -r1.7
--- G4NonprojectiveCylinderSegmentation.hh	16 Feb 2007 02:04:47 -0000	1.6
+++ G4NonprojectiveCylinderSegmentation.hh	1 Apr 2008 19:53:02 -0000	1.7
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/include/G4NonprojectiveCylinderSegmentation.hh,v 1.6 2007/02/16 02:04:47 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/G4NonprojectiveCylinderSegmentation.hh,v 1.7 2008/04/01 19:53:02 wenzel Exp $

 #ifndef LCDD_G4NONPROJECTIVECYLINDERSEGMENTATION
 #define LCDD_G4NONPROJECTIVECYLINDERSEGMENTATION 1
 

@@ -18,8 +18,9 @@

 public:
 
   virtual G4ThreeVector getGlobalHitPos(const G4Step* aStep);

+  virtual G4ThreeVector getGlobalHitPos(const G4StepPoint* aPreStepPoint);

   virtual void setBins(const G4Step* aStep);

-

+  virtual void setBins(const G4StepPoint* aPreStepPoint);

   virtual void setBinNames()
   {
     addBinName("phi");

@@ -27,13 +28,15 @@

   }
 
   G4ThreeVector getLocalHitPos(const G4Step* aStep);

-

+  G4ThreeVector getLocalHitPos(const G4StepPoint* aPreStepPoint);

   virtual bool isValidSolid(G4VSolid*);
 
 private:
 
   double computeDeltaPhi(const G4Step* aStep);

+  double computeDeltaPhi(const G4StepPoint* aPreStepPoint);

   int computeBinPhi( const G4Step* aStep );

+  int computeBinPhi( const G4StepPoint* aPreStepPoint);

   int computeBinZ(const G4ThreeVector& localStepPos);
 
 private:

diff -u -r1.8 -r1.9
--- G4ProjectiveCylinderSegmentation.hh	18 Dec 2006 22:49:01 -0000	1.8
+++ G4ProjectiveCylinderSegmentation.hh	1 Apr 2008 19:53:02 -0000	1.9
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/include/G4ProjectiveCylinderSegmentation.hh,v 1.8 2006/12/18 22:49:01 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/G4ProjectiveCylinderSegmentation.hh,v 1.9 2008/04/01 19:53:02 wenzel Exp $

 #ifndef LCDD_G4PROJECTIVECYLINDERSEGMENTATION_HH
 #define LCDD_G4PROJECTIVECYLINDERSEGMENTATION_HH 1
 

@@ -25,6 +25,8 @@

 
   virtual double getRadius(const G4Step* aStep);
   virtual double getZ(const G4Step* aStep);

+  virtual double getRadius(const G4StepPoint* aPreStepPoint);
+  virtual double getZ(const G4StepPoint* aPreStepPoint); 

 };
 
 #endif

diff -u -r1.9 -r1.10
--- G4ProjectiveSegmentation.hh	18 Dec 2006 22:49:01 -0000	1.9
+++ G4ProjectiveSegmentation.hh	1 Apr 2008 19:53:02 -0000	1.10
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/include/G4ProjectiveSegmentation.hh,v 1.9 2006/12/18 22:49:01 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/G4ProjectiveSegmentation.hh,v 1.10 2008/04/01 19:53:02 wenzel Exp $

 #ifndef LCDD_G4PROJECTIVESEGMENTATION_HH
 #define LCDD_G4PROJECTIVESEGMENTATION_HH 1
 

@@ -24,8 +24,9 @@

   // virtuals from G4Segmentation; should not be overridden
   // in subclasses
   G4ThreeVector getGlobalHitPos(const G4Step* aStep);

+  G4ThreeVector getGlobalHitPos(const G4StepPoint* aPreStepPoint);

   void setBins(const G4Step* aStep);

-

+  void setBins(const G4StepPoint* aPreStepPoint);

   virtual void setBinNames()
   {
     addBinName("theta");

@@ -47,13 +48,19 @@

 
   // dim from step
   double getThetaDim( const G4Step* aStep );

+  // dim from prestep
+  double getThetaDim( const G4StepPoint* aPreStepPoint );
+  

   double getPhiDim( const G4Step* aStep );

+  // dim from prestep point:
+  double getPhiDim( const G4StepPoint* aPreStepPoint );

 
   // These should be overridden in subclasses 
   // for a specific shape or orientation.
   virtual double getRadius(const G4Step* aStep);
   virtual double getZ(const G4Step* aStep);

-

+  virtual double getRadius(const G4StepPoint* aPreStepPoint);
+  virtual double getZ(const G4StepPoint* aPreStepPoint);

 private:
 
   void computeDivisions();

diff -u -r1.5 -r1.6
--- G4ProjectiveZPlaneSegmentation.hh	18 Dec 2006 22:49:01 -0000	1.5
+++ G4ProjectiveZPlaneSegmentation.hh	1 Apr 2008 19:53:02 -0000	1.6
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/include/G4ProjectiveZPlaneSegmentation.hh,v 1.5 2006/12/18 22:49:01 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/G4ProjectiveZPlaneSegmentation.hh,v 1.6 2008/04/01 19:53:02 wenzel Exp $

 #ifndef LCDD_G4PROJECTIVEZPLANESEGMENTATION_HH
 #define LCDD_G4PROJECTIVEZPLANESEGMENTATION_HH 1
 

@@ -25,6 +25,8 @@

 
   virtual double getRadius(const G4Step* aStep);
   virtual double getZ(const G4Step* aStep);

+  virtual double getRadius(const G4StepPoint* aPreStepPoint);
+  virtual double getZ(const G4StepPoint* aPreStepPoint);

 };
 
 #endif

diff -u -r1.15 -r1.16
--- G4Segmentation.hh	18 Dec 2006 22:49:01 -0000	1.15
+++ G4Segmentation.hh	1 Apr 2008 19:53:02 -0000	1.16
@@ -29,10 +29,10 @@

 
   // default = return step midpoint
   virtual G4ThreeVector getGlobalHitPos(const G4Step* aStep);

-

+  virtual G4ThreeVector getGlobalHitPos(const G4StepPoint* aPreStepPoint);

   // default = no op
   virtual void setBins(const G4Step*) {}

-

+  virtual void setBins(const G4StepPoint*) {}

   // call in child class ctors to setup bin name vec
   virtual void setBinNames()
   {}

diff -u -r1.17 -r1.18
--- ReadoutUtil.hh	10 Oct 2007 22:38:09 -0000	1.17
+++ ReadoutUtil.hh	1 Apr 2008 19:53:02 -0000	1.18
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/include/ReadoutUtil.hh,v 1.17 2007/10/10 22:38:09 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/ReadoutUtil.hh,v 1.18 2008/04/01 19:53:02 wenzel Exp $

 #ifndef LCDD_READOUTUTIL_HH
 #define LCDD_READOUTUTIL_HH 1
 

@@ -55,19 +55,24 @@

   static G4ThreeVector getVolumeGlobalPosition(const G4StepPoint* aStepPoint);
 
   static const G4Tubs* getTubs(const G4Step* aStep);

-

+  static const G4Tubs* getTubs(const G4StepPoint* aStepPoint);
+  

   static double computeTubsMidRadius(const G4Tubs* tubs);
 
   static double computeTubsMidRadius(const G4Step* aStep);

-

+  static double computeTubsMidRadius(const G4StepPoint* aStepPoint);
+  

   static double getTubsThickness(const G4Tubs* tubs);
 
   static G4ThreeVector transformLocalToGlobal(const G4Step* aStep,
 					      const G4ThreeVector& localPos);

-

+  static G4ThreeVector transformLocalToGlobal(const G4StepPoint* aPreStepPoint,
+					      const G4ThreeVector& localPos);

   static G4ThreeVector transformGlobalToLocal(const G4Step* aStep,

-					      const G4ThreeVector& globalPos);
-

+					      const G4ThreeVector& globalPos); 
+  static G4ThreeVector transformGlobalToLocal(const G4StepPoint* aPreStepPoint,
+					      const G4ThreeVector& globalPos); 
+  

   static int getVolumeNumber(G4TouchableHandle theTouchable, int historyDepth = -1);
 
   static std::vector<G4VPhysicalVolume*> getPhysVolList( G4Step* aStep );