Changeset 1058 for trunk/source/materials/include/G4IronStoppingICRU73.hh

Timestamp:

May 29, 2009, 3:55:14 PM (15 years ago)

Author:

garnier

Message:

file release beta

File:

• trunk/source/materials/include/G4IronStoppingICRU73.hh (modified) (3 diffs)

trunk/source/materials/include/G4IronStoppingICRU73.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4IronStoppingICRU73.hh,v 1.3 2008/11/02 12:22:19 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4IronStoppingICRU73.hh,v 1.4 2009/03/18 10:14:48 alechner Exp $
+// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
 
 #ifndef G4IronStoppingICRU73_h
@@ -51 +51 @@
 
 #include "globals.hh"
+#include "G4VIonDEDXTable.hh"
 #include "G4LPhysicsFreeVector.hh"
 #include <vector>
 
-class G4IronStoppingICRU73
+
+class G4IronStoppingICRU73 : public G4VIonDEDXTable
 {
 public:
@@ -62 +64 @@
   ~G4IronStoppingICRU73();
 
-  G4double GetDEDX(G4int idxMaterial, G4double kinEnergy);
+  G4bool IsApplicable(G4int ionZ,  
+                      G4int matZ);
 
-  inline G4double GetDEDX(const G4String& NameMaterial, G4double kinEnergy);
+  G4bool IsApplicable(G4int ionZ, 
+                      const G4String& matName);
 
-  inline G4int GetMaterialIndex(const G4String& NameMaterial);
+  G4PhysicsVector* GetPhysicsVector(G4int ionZ, 
+                                    G4int matZ);
 
-  // Function returns an unique index (>=0) for each ion-material couple (the 
-  // return value is -1 if the couple is not found):
-  inline G4int GetIonMaterialCoupleIndex(
-                        G4int atomicNumber,            // Atomic number of ion 
-                        const G4String& materialName); // Material name
+  G4PhysicsVector* GetPhysicsVector(G4int ionZ, 
+                                    const G4String& matName);
 
-  inline G4double GetDensity(G4int idx);
+  G4double GetDEDX(G4double kinEnergyPerNucleon,
+                   G4int ionZ,
+                   const G4String& matName);
 
-  inline G4String GetMaterialName(G4int idx);
-
-  inline G4PhysicsVector* GetPhysicsVector(G4int idx);
-
-  inline G4PhysicsVector* GetPhysicsVector(const G4String& NameMaterial);
-
-  inline G4double GetLowerEnergyBoundary();
-
-  inline G4double GetUpperEnergyBoundary();
+  G4double GetDEDX(G4double kinEnergyPerNucleon,
+                   G4int ionZ,
+                   G4int matZ);
 
 private:
+  // Function for creating a physics vector
+  G4PhysicsVector* CreatePhysicsVector(G4double* energy, 
+                                       G4double* stoppower, 
+                                       G4double factor);
 
-  void AddData(G4double* energy, G4double* stoppower, G4double factor);
+  // Assignment operator and copy constructor
+  G4IronStoppingICRU73 & operator=(const G4IronStoppingICRU73 &right);
+  G4IronStoppingICRU73(const G4IronStoppingICRU73&);
 
-  void Initialise();
+  // Flag indicating the use of spline interpolation for dE/dx vectors
+  G4bool spline;
 
-  // hide assignment operator
-  G4IronStoppingICRU73 & operator=(const  G4IronStoppingICRU73 &right);
-  G4IronStoppingICRU73(const  G4IronStoppingICRU73&);
+  // Vectors containing the atomic numbers and names of the materials
+  std::vector<G4int> atomicNumbersMat;
+  std::vector<G4String> namesMat;
 
-  G4bool spline;
-  G4String MatName[16];
-  G4double Density[16];
+  // Keys (material names) corresponding to created dE/dx vectors
+  std::vector<G4String> dedxKeys;
 
-  // Lower and upper energy boundaries for dE/dx vectors:
-  G4double lowerEnergyBoundary;
-  G4double upperEnergyBoundary;
+  // Vector of dE/dx vectors
+  std::vector<G4PhysicsVector*>  dedx;
+};
 
-  std::vector<G4LPhysicsFreeVector*>  dedx;
-};
+
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-inline G4double G4IronStoppingICRU73::GetDEDX(const G4String& NameMaterial, 
-                                              G4double kinEnergy)
-{
-  return GetDEDX(GetMaterialIndex(NameMaterial), kinEnergy);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-inline G4int
-G4IronStoppingICRU73::GetMaterialIndex(const G4String& NameMaterial)
-{
-  G4int idx = -1;
-  for (G4int idxMaterial=0; idxMaterial<16; idxMaterial++){
-    if(MatName[idxMaterial] == NameMaterial) {
-      idx = idxMaterial;
-      break;
-    }
-  }
-  return idx;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-inline G4int
-G4IronStoppingICRU73::GetIonMaterialCoupleIndex(G4int atomicNumber,
-                                                const G4String& materialName) 
-{
-  G4int idx = -1;
-  if(atomicNumber == 26) idx = GetMaterialIndex(materialName);
-  return idx;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-inline G4double G4IronStoppingICRU73::GetDensity(G4int idxMaterial)
-{
-  G4double d = 0.0;
-  if( idxMaterial >= 0 && idxMaterial <= 15) d = Density[idxMaterial];
-  return d;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-inline G4String G4IronStoppingICRU73::GetMaterialName(G4int idxMaterial)
-{
-  G4String s = "";
-  if( idxMaterial >= 0 && idxMaterial <= 15) s = MatName[idxMaterial];
-  return s;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-inline 
-G4PhysicsVector* G4IronStoppingICRU73::GetPhysicsVector(G4int idxMaterial)
-{
-  G4PhysicsVector* v = 0;
-  if(idxMaterial >= 0 && idxMaterial <= 15) v = dedx[idxMaterial];
-  return v;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-inline G4PhysicsVector* 
-G4IronStoppingICRU73::GetPhysicsVector(const G4String& NameMaterial)
-{
-  return GetPhysicsVector(GetMaterialIndex(NameMaterial));
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-inline G4double
-G4IronStoppingICRU73::GetLowerEnergyBoundary() {
-
-  return lowerEnergyBoundary;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-inline G4double
-G4IronStoppingICRU73::GetUpperEnergyBoundary() {
-
-  return upperEnergyBoundary;
-}
-
-
 #endif