Import Geant4 9.6.0 source tree

source/processes/scoring/include/G4EnergySplitter.hh

@@ -51,9 +51,9 @@ public: // with description
   
   G4int SplitEnergyInVolumes(const G4Step* aStep );    // Calculates the energy spliting, and dumps it into theEnergies. Returns number of steps
 
-  inline void GetLastVoxelID( G4int& voxelID);
-  inline void GetFirstVoxelID( G4int& voxelID);
-  inline void GetVoxelID( G4int stepNo, G4int& voxelID );
+  void GetLastVoxelID( G4int& voxelID);
+  void GetFirstVoxelID( G4int& voxelID);
+  void GetVoxelID( G4int stepNo, G4int& voxelID );
   inline void GetVoxelIDAndLength( G4int stepNo, G4int& voxelID, G4double& stepLength ); 
   inline void GetLengthAndEnergyDeposited( G4int stepNo, G4int& voxelID, G4double& stepLength, G4double &energyLoss);
   inline void GetLengthAndInitialEnergy( G4double &preStepEnergy, G4int stepNo, G4int& voxelID, G4double& stepLength, G4double &initialEnergy);
@@ -63,7 +63,7 @@ public: // with description
   inline G4Material* GetVoxelMaterial( G4int stepNo );
 
 private:
-  inline void GetStepLength( G4int stepNo, G4double& stepLength );
+  void GetStepLength( G4int stepNo, G4double& stepLength );
 
   void GetPhantomParam(G4bool mustExist);
   G4bool IsPhantomVolume( G4VPhysicalVolume* pv );

source/processes/scoring/include/G4EnergySplitter.icc

@@ -23,46 +23,9 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-#include "G4RegularNavigationHelper.hh"
 #include "G4UIcommand.hh"
 #include "G4PhantomParameterisation.hh"
 
-//-----------------------------------------------------------------------
-inline void G4EnergySplitter::GetLastVoxelID( G4int& voxelID)
-{	
-  voxelID = (*(G4RegularNavigationHelper::theStepLengths.begin())).first;
-}
-
-//-----------------------------------------------------------------------
-inline void G4EnergySplitter::GetFirstVoxelID( G4int& voxelID)
-{
-  voxelID =  (*(G4RegularNavigationHelper::theStepLengths.rbegin())).first;
-}
-
-//-----------------------------------------------------------------------
-inline void G4EnergySplitter::GetVoxelID( G4int stepNo, G4int& voxelID )
-{
-  if( stepNo < 0 || stepNo >= G4int(G4RegularNavigationHelper::theStepLengths.size()) ) {
-  G4Exception("G4EnergySplitter::GetVoxelID",
-	      "Invalid stepNo, smaller than 0 or bigger or equal to number of voxels traversed",
-	      FatalErrorInArgument,
-	      G4String("stepNo = " + G4UIcommand::ConvertToString(stepNo) + ", number of voxels = " + G4UIcommand::ConvertToString(G4int(G4RegularNavigationHelper::theStepLengths.size())) ).c_str());
-  }
-  std::vector< std::pair<G4int,G4double> >::const_iterator ite = G4RegularNavigationHelper::theStepLengths.begin();
-  advance( ite, stepNo );
-  voxelID = (*ite).first;
-
-}
-
-
-//-----------------------------------------------------------------------
-inline void G4EnergySplitter::GetStepLength( G4int stepNo, G4double& stepLength )
-{
-  std::vector< std::pair<G4int,G4double> >::const_iterator ite = G4RegularNavigationHelper::theStepLengths.begin();
-  advance( ite, stepNo );
-  stepLength = (*ite).second;
-}
-
 //-----------------------------------------------------------------------
 inline void G4EnergySplitter::GetVoxelIDAndLength( G4int stepNo, G4int& voxelID, G4double& stepLength )
 {

source/processes/scoring/include/G4ParallelWorldProcess.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4ParallelWorldProcess.hh,v 1.4 2007/05/30 17:47:10 ahoward Exp $
+// $Id$
 // GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // 
@@ -59,6 +59,7 @@ class G4ParticleChange;
 #include "G4VProcess.hh"
 #include "G4FieldTrack.hh"
 #include "G4TouchableHandle.hh"
+#include "G4MultiNavigator.hh"
 
 //------------------------------------------
 //
@@ -164,6 +165,18 @@ private:
   // Flag for material switching
   //-----------------------------------------------------------------------
   G4bool layeredMaterialFlag;
+
+  //-----------------------------------------------------------------------
+  // Static G4Step object for "Hyper-step"
+  //-----------------------------------------------------------------------
+public:
+  static const G4Step* GetHyperStep();
+  static G4int GetHypNavigatorID();
+private:
+  static G4Step* fpHyperStep;
+  static G4int nParallelWorlds;
+  static G4int fNavIDHyp;
+  G4int iParallelWorld;
 };
 
 #endif

source/processes/scoring/include/G4ParallelWorldScoringProcess.hh

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4ParallelWorldScoringProcess.hh,v 1.4 2007-05-30 17:47:10 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 
 //---------------------------------------------------------------

source/processes/scoring/include/G4ScoreSplittingProcess.hh

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4ScoreSplittingProcess.hh,v 1.4 2010-11-22 14:30:49 japost Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 
 //---------------------------------------------------------------