Import Geant4 9.5.0 source tree

source/digits_hits/scorer/include/G4PSCellCharge.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSCellCharge.hh,v 1.2 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSCellCharge.hh,v 1.2 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSCellCharge_h

source/digits_hits/scorer/include/G4PSCellCharge3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSCellCharge3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSCellCharge3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSCellCharge3D_h

source/digits_hits/scorer/include/G4PSCellFlux.hh

@@ -34,6 +34,8 @@
 #include "G4VPrimitiveScorer.hh"
 #include "G4THitsMap.hh"
 
+class G4VSolid;
+
 ///////////////////////////////////////////////////////////////////////////////
 // (Description)
 //   This is a primitive scorer class for scoring cell flux.
@@ -66,6 +68,8 @@ class G4PSCellFlux : public G4VPrimitiveScorer
   protected: // with description
       virtual G4bool ProcessHits(G4Step*,G4TouchableHistory*);
 
+      virtual G4double ComputeVolume(G4Step*, G4int idx);
+
   public: 
       virtual void Initialize(G4HCofThisEvent*);
       virtual void EndOfEvent(G4HCofThisEvent*);

source/digits_hits/scorer/include/G4PSCellFlux3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSCellFlux3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSCellFlux3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSCellFlux3D_h

source/digits_hits/scorer/include/G4PSCellFluxForCylinder3D.hh

@@ -0,0 +1,77 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+//
+// $Id: G3PSCellFluxForCylinder3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
+// GEANT4 tag $Name: geant4-09-04 $
+//
+
+#ifndef G3PSCellFluxForCylinder3D_h
+#define G3PSCellFluxForCylinder3D_h 1
+
+#include "G4PSCellFlux3D.hh"
+///////////////////////////////////////////////////////////////////////////////
+// (Description)
+//   This is a primitive scorer class for 3D scoring cell flux.
+//   The Cell Flux is defined by  a sum of track length divided
+//   by the geometry volume, where all of the tracks in the geometry
+//   are taken into account. e.g. the unit of Cell Flux is mm/mm3.
+//
+//
+//   If you want to score only tracks passing through the geometry volume,
+//  please use G4PSPassageCellFlux3D.
+//
+//
+// Created: 2007-08-14  Tsukasa ASO
+// 2010-07-22   Introduce Unit specification.
+// 2011-03-24   Give Size and Segmentation for relicated volume in cylinder. 
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+
+class G4PSCellFluxForCylinder3D : public G4PSCellFlux3D
+{
+   public: // with description
+      G4PSCellFluxForCylinder3D(G4String name,
+		     G4int ni=1,G4int nj=1, G4int nk=1,
+		     G4int depi=2, G4int depj=1, G4int depk=0);
+     G4PSCellFluxForCylinder3D(G4String name,const G4String& unit,
+		     G4int ni=1,G4int nj=1, G4int nk=1,
+		     G4int depi=2, G4int depj=1, G4int depk=0);
+      virtual ~G4PSCellFluxForCylinder3D();
+
+      void SetCylinderSize(G4double dr, G4double dz);
+      void SetNumberOfSegments(G4int nSeg[3]);
+
+  protected: // with description
+      virtual G4double ComputeVolume(G4Step*, G4int idx);
+
+  private:
+  // Order of segmentation (Z PHI R) in CylinderMesh
+   G4ThreeVector cylinderSize;  
+   G4int nSegment[3];
+};
+#endif
+

source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSCylinderSurfaceCurrent.hh,v 1.2 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSCylinderSurfaceCurrent.hh,v 1.2 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSCylinderSurfaceCurrent_h

source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSCylinderSurfaceCurrent3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSCylinderSurfaceCurrent3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSCylinderSurfaceCurrent3D_h

source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSCylinderSurfaceFlux.hh,v 1.3 2010/07/22 23:42:01 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSCylinderSurfaceFlux.hh,v 1.3 2010-07-22 23:42:01 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSCylinderSurfaceFlux_h

source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSCylinderSurfaceFlux3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSCylinderSurfaceFlux3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSCylinderSurfaceFlux3D_h

source/digits_hits/scorer/include/G4PSDirectionFlag.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSDirectionFlag.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4PSDirectionFlag.hh,v 1.1 2007-07-11 01:29:28 asaim Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 //
 //---------------------------------------------------------------

source/digits_hits/scorer/include/G4PSDoseDeposit.hh

@@ -53,6 +53,8 @@ class G4PSDoseDeposit : public G4VPrimitiveScorer
   protected: // with description
       virtual G4bool ProcessHits(G4Step*,G4TouchableHistory*);
 
+      virtual G4double ComputeVolume(G4Step*, G4int idx);
+
   public: 
       virtual void Initialize(G4HCofThisEvent*);
       virtual void EndOfEvent(G4HCofThisEvent*);
@@ -65,5 +67,6 @@ class G4PSDoseDeposit : public G4VPrimitiveScorer
   private:
       G4int HCID;
       G4THitsMap<G4double>* EvtMap;
+
 };
 #endif

source/digits_hits/scorer/include/G4PSDoseDeposit3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSDoseDeposit3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSDoseDeposit3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSDoseDeposit3D_h

source/digits_hits/scorer/include/G4PSDoseDepositForCylinder3D.hh

@@ -0,0 +1,70 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+//
+// $Id: G4PSDoseDepositForCylinder3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
+// GEANT4 tag $Name: geant4-09-04 $
+//
+
+#ifndef G4PSDoseDepositForCylinder3D_h
+#define G4PSDoseDepositForCylinder3D_h 1
+
+#include "G4PSDoseDeposit3D.hh"
+
+////////////////////////////////////////////////////////////////////////////////
+// (Description)
+//   Primitive scorer class for scoring dose deposit in the geometry volume.
+//
+// Created: 2008-08-14  Tsukasa ASO
+// 2010-07-22   Introduce Unit specification.
+// 2011-03-24   Give Size and Segmentation for relicated volume in cylinder. 
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+class G4PSDoseDepositForCylinder3D : public G4PSDoseDeposit3D
+{
+ public: // with description
+      G4PSDoseDepositForCylinder3D(G4String name, 
+			G4int ni=1,G4int nj=1, G4int nk=1,
+			G4int depi=2, G4int depj=1, G4int depk=0);
+      G4PSDoseDepositForCylinder3D(G4String name, const G4String& unit,
+			G4int ni=1,G4int nj=1, G4int nk=1,
+			G4int depi=2, G4int depj=1, G4int depk=0);
+
+      virtual ~G4PSDoseDepositForCylinder3D();
+
+      void SetCylinderSize(G4double dr, G4double dz);
+      void SetNumberOfSegments(G4int nSeg[3]);
+
+  protected: // with description
+      virtual G4double ComputeVolume(G4Step*, G4int idx);
+
+  private:
+  // Order of segmentation (Z PHI R) in CylinderMesh
+   G4ThreeVector cylinderSize;  
+   G4int nSegment[3];
+
+};
+#endif

source/digits_hits/scorer/include/G4PSEnergyDeposit.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSEnergyDeposit.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSEnergyDeposit.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSEnergyDeposit_h

source/digits_hits/scorer/include/G4PSEnergyDeposit3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSEnergyDeposit3D.hh,v 1.4 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSEnergyDeposit3D.hh,v 1.4 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSEnergyDeposit3D_h

source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSFlatSurfaceCurrent.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSFlatSurfaceCurrent.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSFlatSurfaceCurrent_h

source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSFlatSurfaceCurrent3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSFlatSurfaceCurrent3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSFlatSurfaceCurrent3D_h

source/digits_hits/scorer/include/G4PSFlatSurfaceFlux.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSFlatSurfaceFlux.hh,v 1.3 2010/07/22 23:42:01 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSFlatSurfaceFlux.hh,v 1.3 2010-07-22 23:42:01 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSFlatSurfaceFlux_h

source/digits_hits/scorer/include/G4PSFlatSurfaceFlux3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSFlatSurfaceFlux3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSFlatSurfaceFlux3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSFlatSurfaceFlux3D_h

source/digits_hits/scorer/include/G4PSMinKinEAtGeneration.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSMinKinEAtGeneration.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSMinKinEAtGeneration.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSMinKinEAtGeneration_h

source/digits_hits/scorer/include/G4PSMinKinEAtGeneration3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSMinKinEAtGeneration3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSMinKinEAtGeneration3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSMinKinEAtGeneration3D_h

source/digits_hits/scorer/include/G4PSNofCollision.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSNofCollision.hh,v 1.2 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSNofCollision.hh,v 1.2 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSNofCollision_h

source/digits_hits/scorer/include/G4PSNofCollision3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSNofCollision3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4PSNofCollision3D.hh,v 1.2 2007-08-28 10:11:29 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSNofCollision3D_h

source/digits_hits/scorer/include/G4PSNofSecondary.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSNofSecondary.hh,v 1.4 2010/07/22 23:42:01 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSNofSecondary.hh,v 1.4 2010-07-22 23:42:01 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSNofSecondary_h

source/digits_hits/scorer/include/G4PSNofSecondary3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSNofSecondary3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4PSNofSecondary3D.hh,v 1.2 2007-08-28 10:11:29 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSNofSecondary3D_h

source/digits_hits/scorer/include/G4PSNofStep.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSNofStep.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSNofStep.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSNofStep_h

source/digits_hits/scorer/include/G4PSNofStep3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSNofStep3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSNofStep3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSNofStep3D_h

source/digits_hits/scorer/include/G4PSPassageCellCurrent.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSPassageCellCurrent.hh,v 1.3 2010/07/22 23:42:01 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSPassageCellCurrent.hh,v 1.3 2010-07-22 23:42:01 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSPassageCellCurrent_h

source/digits_hits/scorer/include/G4PSPassageCellCurrent3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSPassageCellCurrent3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSPassageCellCurrent3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSPassageCellCurrent3D_h

source/digits_hits/scorer/include/G4PSPassageCellFlux.hh

@@ -65,6 +65,7 @@ class G4PSPassageCellFlux : public G4VPrimitiveScorer
   protected: // with description
       virtual G4bool ProcessHits(G4Step*,G4TouchableHistory*);
       virtual G4bool IsPassed(G4Step*);
+      virtual G4double ComputeVolume(G4Step*, G4int idx);
 
   public: 
       virtual void Initialize(G4HCofThisEvent*);

source/digits_hits/scorer/include/G4PSPassageCellFlux3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSPassageCellFlux3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSPassageCellFlux3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSPassageCellFlux3D_h

source/digits_hits/scorer/include/G4PSPassageCellFluxForCylinder3D.hh

@@ -0,0 +1,75 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+//
+// $Id: G4PSPassageCellFluxForCylinder3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
+// GEANT4 tag $Name: geant4-09-04 $
+//
+
+#ifndef G4PSPassageCellFluxForCylinder3D_h
+#define G4PSPassageCellFluxForCylinder3D_h 1
+
+#include "G4PSPassageCellFlux3D.hh"
+///////////////////////////////////////////////////////////////////////////////
+// (Description)
+//   This is a primitive scorer class for scoring cell flux.
+//   The Cell Flux is defined by  a track length divided by a geometry
+//   volume, where only tracks passing through the geometry are taken
+//  into account. e.g. the unit of Cell Flux is mm/mm3.
+//
+//   If you want to score all tracks in the geometry volume,
+//  please use G4PSCellFlux.
+//
+// Created: 2007-08-14  Tsukasa ASO
+// 2010-07-22   Introduce Unit specification.
+// 2011-03-24   Give Size and Segmentation for relicated volume in cylinder.
+///////////////////////////////////////////////////////////////////////////////
+
+
+class G4PSPassageCellFluxForCylinder3D : public G4PSPassageCellFlux3D
+{
+   public: // with description
+      G4PSPassageCellFluxForCylinder3D(G4String name,
+			    G4int ni=1,G4int nj=1, G4int nk=1,
+			    G4int depi=2, G4int depj=1, G4int depk=0);
+      G4PSPassageCellFluxForCylinder3D(G4String name,const G4String& unit,
+			    G4int ni=1,G4int nj=1, G4int nk=1,
+			    G4int depi=2, G4int depj=1, G4int depk=0);
+      virtual ~G4PSPassageCellFluxForCylinder3D();
+
+      void SetCylinderSize(G4double dr, G4double dz);
+      void SetNumberOfSegments(G4int nSeg[3]);
+
+  protected: // with description
+      virtual G4double ComputeVolume(G4Step*, G4int idx);
+
+  private:
+  // Order of segmentation (Z PHI R) in CylinderMesh
+   G4ThreeVector cylinderSize;  
+   G4int nSegment[3];
+
+};
+#endif
+

source/digits_hits/scorer/include/G4PSPassageTrackLength.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSPassageTrackLength.hh,v 1.2 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSPassageTrackLength.hh,v 1.2 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSPassageTrackLength_h

source/digits_hits/scorer/include/G4PSPassageTrackLength3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSPassageTrackLength3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSPassageTrackLength3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSPassageTrackLength3D_h

source/digits_hits/scorer/include/G4PSPopulation.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSPopulation.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSPopulation.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSPopulation_h

source/digits_hits/scorer/include/G4PSPopulation3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSPopulation3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4PSPopulation3D.hh,v 1.2 2007-08-28 10:11:29 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSPopulation3D_h

source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSSphereSurfaceCurrent.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSSphereSurfaceCurrent.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSSphereSurfaceCurrent_h

source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSSphereSurfaceCurrent3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSSphereSurfaceCurrent3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSSphereSurfaceCurrent3D_h

source/digits_hits/scorer/include/G4PSSphereSurfaceFlux.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSSphereSurfaceFlux.hh,v 1.3 2010/07/22 23:42:01 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSSphereSurfaceFlux.hh,v 1.3 2010-07-22 23:42:01 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSSphereSurfaceFlux_h

source/digits_hits/scorer/include/G4PSSphereSurfaceFlux3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSSphereSurfaceFlux3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSSphereSurfaceFlux3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSSphereSurfaceFlux3D_h

source/digits_hits/scorer/include/G4PSStepChecker.hh

@@ -0,0 +1,77 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+//
+// $Id: G4PSStepChecker.hh,v 1.2 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
+//
+
+#ifndef G4PSStepChecker_h
+#define G4PSStepChecker_h 1
+
+#include "G4VPrimitiveScorer.hh"
+#include "G4THitsMap.hh"
+
+
+//////////////////////////////////////////////////////////////////////////////////
+// (Description)
+//   This is a primitive scorer class for Debug.
+// 
+// Created: 2011-03-24  Tsukasa ASO
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+
+class G4PSStepChecker : public G4VPrimitiveScorer
+{
+ 
+ public: // with description
+      G4PSStepChecker(G4String name, G4int depth=0);
+
+  protected: // with description
+      virtual G4bool ProcessHits(G4Step*,G4TouchableHistory*);
+
+  public:
+      virtual ~G4PSStepChecker();
+
+  public: 
+      virtual void Initialize(G4HCofThisEvent*);
+      virtual void EndOfEvent(G4HCofThisEvent*);
+      virtual void clear();
+
+  public:
+      virtual void DrawAll();
+      virtual void PrintAll();
+
+  private:
+
+  public:
+
+
+};
+
+
+
+#endif

source/digits_hits/scorer/include/G4PSStepChecker3D.hh

@@ -0,0 +1,64 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+//
+// $Id: G4PSStepChecker3D.hh,v 1.2 2007-08-28 10:11:29 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
+//
+
+#ifndef G4PSStepChecker3D_h
+#define G4PSStepChecker3D_h 1
+
+#include "G4PSStepChecker.hh"
+
+//////////////////////////////////////////////////////////////////////////////////
+// (Description)
+//   This is a primitive scorer class for debug.
+// 
+// Created: 2011-03-24  Tsukasa ASO
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+
+class G4PSStepChecker3D : public G4PSStepChecker{
+ 
+ public: // with description
+      G4PSStepChecker3D(G4String name, 
+		     G4int ni=1,G4int nj=1, G4int nk=1,
+		     G4int depi=2, G4int depj=1, G4int depk=0);
+
+  public:
+      virtual ~G4PSStepChecker3D();
+
+  protected: // with description
+      virtual G4int GetIndex(G4Step*);
+
+  private:
+      G4int fDepthi, fDepthj, fDepthk;
+};
+
+
+
+#endif

source/digits_hits/scorer/include/G4PSTermination.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSTermination.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSTermination.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSTermination_h

source/digits_hits/scorer/include/G4PSTermination3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSTermination3D.hh,v 1.3 2007/12/10 16:29:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4PSTermination3D.hh,v 1.3 2007-12-10 16:29:37 gunter Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSTermination3D_h

source/digits_hits/scorer/include/G4PSTrackCounter.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSTrackCounter.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSTrackCounter.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSTrackCounter_h

source/digits_hits/scorer/include/G4PSTrackCounter3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSTrackCounter3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSTrackCounter3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSTrackCounter3D_h

source/digits_hits/scorer/include/G4PSTrackLength.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSTrackLength.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSTrackLength.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSTrackLength_h

source/digits_hits/scorer/include/G4PSTrackLength3D.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4PSTrackLength3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4PSTrackLength3D.hh,v 1.3 2010-07-22 07:23:45 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4PSTrackLength3D_h

source/digits_hits/scorer/include/G4SDChargedFilter.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4SDChargedFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4SDChargedFilter.hh,v 1.1 2007-07-11 01:29:28 asaim Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4SDChargedFilter_h

source/digits_hits/scorer/include/G4SDKineticEnergyFilter.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4SDKineticEnergyFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4SDKineticEnergyFilter.hh,v 1.1 2007-07-11 01:29:28 asaim Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4SDKineticEnergyFilter_h

source/digits_hits/scorer/include/G4SDNeutralFilter.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4SDNeutralFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4SDNeutralFilter.hh,v 1.1 2007-07-11 01:29:28 asaim Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4SDNeutralFilter_h

source/digits_hits/scorer/include/G4SDParticleFilter.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4SDParticleFilter.hh,v 1.3 2010/07/23 00:59:33 taso Exp $
-// GEANT4 tag $Name: geant4-09-04 $
+// $Id: G4SDParticleFilter.hh,v 1.3 2010-07-23 00:59:33 taso Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4SDParticleFilter_h

source/digits_hits/scorer/include/G4SDParticleWithEnergyFilter.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4SDParticleWithEnergyFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4SDParticleWithEnergyFilter.hh,v 1.1 2007-07-11 01:29:28 asaim Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4SDParticleWithEnergyFilter_h