Changeset 991 for trunk/source/processes/electromagnetic/utils/include/G4VMscModel.hh

Timestamp:

Apr 17, 2009, 12:17:14 PM (15 years ago)

Author:

garnier

Message:

update

File:

• trunk/source/processes/electromagnetic/utils/include/G4VMscModel.hh (modified) (7 diffs)

trunk/source/processes/electromagnetic/utils/include/G4VMscModel.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VMscModel.hh,v 1.8 2009/02/24 09:56:03 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VMscModel.hh,v 1.4 2008/03/10 10:39:28 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // -------------------------------------------------------------------
@@ -54 +54 @@
 #include "G4MscStepLimitType.hh"
 #include "globals.hh"
-#include "G4ThreeVector.hh"
-#include "G4Track.hh"
-#include "G4SafetyHelper.hh"
-
-class G4ParticleChangeForMSC;
 
 class G4VMscModel : public G4VEmModel
@@ -69 +64 @@
   virtual ~G4VMscModel();
 
-  // empty 
-  virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
-                                 const G4MaterialCutsCouple*,
-                                 const G4DynamicParticle*,
-                                 G4double tmin,
-                                 G4double tmax);
-
-  //================================================================
-  //  Set parameters of multiple scattering models
-  //================================================================
- 
   inline void SetStepLimitType(G4MscStepLimitType);
 
@@ -90 +74 @@
   inline void SetSkin(G4double);
 
-  inline void SetSampleZ(G4bool);
-
-protected:
-
-  // initialisation of interface with geometry
-  void InitialiseSafetyHelper();
-
-  // shift point of the track PostStep 
-  void ComputeDisplacement(G4ParticleChangeForMSC*,  
-                           const G4ThreeVector& displDir,
-                           G4double displacement,
-                           G4double postsafety);
-
-  // compute safety
-  inline G4double ComputeSafety(const G4ThreeVector& position, G4double limit);
-
-  // compute linear distance to a geometry boundary
-  inline G4double ComputeGeomLimit(const G4Track& position, G4double& presafety, 
-                                   G4double limit);
-
 private:
 
@@ -115 +79 @@
   G4VMscModel & operator=(const  G4VMscModel &right);
   G4VMscModel(const  G4VMscModel&);
-
-  G4SafetyHelper* safetyHelper;
 
 protected:
@@ -126 +88 @@
   G4double dtrl;
   G4double lambdalimit;
-  G4double geommax;
 
   G4MscStepLimitType steppingAlgorithm;
@@ -173 +134 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-inline void G4VMscModel::SetSampleZ(G4bool val)
-{
-  samplez = val;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-inline G4double G4VMscModel::ComputeSafety(const G4ThreeVector& position, 
-                                           G4double)
-{
-  return safetyHelper->ComputeSafety(position);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-inline G4double G4VMscModel::ComputeGeomLimit(const G4Track& track, 
-                                              G4double& presafety, 
-                                              G4double limit)
-{
-  G4double res = geommax;
-  if(track.GetVolume() != safetyHelper->GetWorldVolume()) {
-    res = safetyHelper->CheckNextStep(
-          track.GetStep()->GetPreStepPoint()->GetPosition(),
-          track.GetMomentumDirection(),
-          limit, presafety);
-  }
-  return res;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
 #endif