Print

Print


Commit in lcdd on MAIN
include/G4GridXYZSegmentation.hh+46-461.7 -> 1.8
src/G4GridXYZSegmentation.cc+5-21.5 -> 1.6
+51-48
2 modified files
fix build error

lcdd/include
G4GridXYZSegmentation.hh 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- G4GridXYZSegmentation.hh	1 Apr 2008 19:53:02 -0000	1.7
+++ G4GridXYZSegmentation.hh	24 Sep 2009 17:47:20 -0000	1.8
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/G4GridXYZSegmentation.hh,v 1.7 2008/04/01 19:53:02 wenzel Exp $
+// $Header: /cvs/lcd/lcdd/include/G4GridXYZSegmentation.hh,v 1.8 2009/09/24 17:47:20 jeremy Exp $
 #ifndef LCDD_G4GRIDXYZSEGMENTATION_HH
 #define LCDD_G4GRIDXYZSEGMENTATION_HH 1
 
@@ -14,51 +14,51 @@
 */
 class G4GridXYZSegmentation : public G4Segmentation
 {
-
-public:
-
-  G4GridXYZSegmentation(double gridSizeX,
-			double gridSizeY,
-			double gridSizeZ);
-
-  virtual ~G4GridXYZSegmentation();
-
-public:
-
-  // 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");
-    addBinName("y");
-    addBinName("z");
-  }
-
-
-protected:
-
-  // compute signed int bin values with base at local origin
-  int computeBinX(const G4ThreeVector& localStepPos);
-  int computeBinY(const G4ThreeVector& localStepPos);
-  int computeBinZ(const G4ThreeVector& localStepPos);
-
-  // individual position dim from bin 
-  double computeDimX(int bin);
-  double computeDimY(int bin);
-  double computeDimZ(int bin);
-
-private:
-
-  double m_gridSizeX;
-  double m_gridSizeY;
-  double m_gridSizeZ;
+        
+    public:
+        
+        G4GridXYZSegmentation(double gridSizeX,
+                              double gridSizeY,
+                              double gridSizeZ);
+        
+        virtual ~G4GridXYZSegmentation();
+        
+    public:
+        
+        // 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");
+            addBinName("y");
+            addBinName("z");
+        }
+        
+        
+    protected:
+        
+        // compute signed int bin values with base at local origin
+        int computeBinX(const G4ThreeVector& localStepPos);
+        int computeBinY(const G4ThreeVector& localStepPos);
+        int computeBinZ(const G4ThreeVector& localStepPos);
+        
+        // individual position dim from bin 
+        double computeDimX(int bin);
+        double computeDimY(int bin);
+        double computeDimZ(int bin);
+        
+    private:
+        
+        double m_gridSizeX;
+        double m_gridSizeY;
+        double m_gridSizeZ;
 };
 
 #endif

lcdd/src
G4GridXYZSegmentation.cc 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- G4GridXYZSegmentation.cc	9 Sep 2009 00:35:04 -0000	1.5
+++ G4GridXYZSegmentation.cc	24 Sep 2009 17:47:20 -0000	1.6
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4GridXYZSegmentation.cc,v 1.5 2009/09/09 00:35:04 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4GridXYZSegmentation.cc,v 1.6 2009/09/24 17:47:20 jeremy Exp $
 #include "G4GridXYZSegmentation.hh"
 
 #include "ReadoutUtil.hh"
@@ -96,9 +96,12 @@
     ++idx;
 }
 
-/*
 void G4GridXYZSegmentation::G4GridXYZSegmentation::setBins(const G4StepPoint* aPreStepPointconst)
 {
+    return;
+}
+
+/*
     G4ThreeVector globalStepPos = aPreStepPointconst->GetPosition();
     int binX = computeBinX( globalStepPos );
     int binY = computeBinY( globalStepPos );
CVSspam 0.2.8