lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 11.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2022-12-09 14:43:28 +01:00
parent c07cea1fe0
commit 9f34590941
3810 changed files with 200490 additions and 182326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/materials/src/G4CrystalExtension.cc
+16 -19
View File
@@ -23,8 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -39,13 +37,12 @@ G4CrystalExtension::G4CrystalExtension(G4Material* mat, const G4String& name)
: G4VMaterialExtension(name)
, fMaterial(mat)
, theUnitCell(nullptr)
{
;
}
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
G4CrystalExtension::~G4CrystalExtension(){;}
G4CrystalExtension::~G4CrystalExtension()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -59,7 +56,7 @@ ComputeStructureFactor(G4double kScatteringVector,
//GFS == Geometrical Structure Factor
G4complex SF = G4complex(0.,0.);
for(auto anElement: *(fMaterial->GetElementVector())){
for(auto & anElement: *(fMaterial->GetElementVector())){
G4double AFF = G4AtomicFormFactor::GetManager()->Get(kScatteringVector,anElement->GetZ());
G4complex GFS = G4complex(0.,0.);
@@ -69,8 +66,8 @@ ComputeStructureFactor(G4double kScatteringVector,
G4double aDouble = h * anAtomPos.x()
+ k * anAtomPos.y()
+ l * anAtomPos.z();
GFS += G4complex(std::cos(2 * CLHEP::pi * aDouble),
std::sin(2 * CLHEP::pi * aDouble));
GFS += G4complex(std::cos(CLHEP::twopi * aDouble),
std::sin(CLHEP::twopi * aDouble));
}
@@ -88,13 +85,13 @@ ComputeStructureFactorGeometrical(G4int h,
//GFS == Geometrical Structure Form Factor
G4complex GFS = G4complex(0.,0.);
for(auto anElement: *(fMaterial->GetElementVector())){
for(auto & anElement: *(fMaterial->GetElementVector())){
for(const auto& anAtomPos : GetAtomBase(anElement)->GetPos())
{
G4double aDouble =
h * anAtomPos.x() + k * anAtomPos.y() + l * anAtomPos.z();
GFS += G4complex(std::cos(2 * CLHEP::pi * aDouble),
std::sin(2 * CLHEP::pi * aDouble));
GFS += G4complex(std::cos(CLHEP::twopi * aDouble),
std::sin(CLHEP::twopi * aDouble));
}
}
return GFS;
@@ -103,11 +100,11 @@ ComputeStructureFactorGeometrical(G4int h,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
void G4CrystalExtension::SetElReduced(const ReducedElasticity& mat) {
for (size_t i=0; i<6; i++) {
for (size_t j=0; j<6; j++) {
fElReduced[i][j] = mat[i][j];
}
for (size_t i=0; i<6; ++i) {
for (size_t j=0; j<6; ++j) {
fElReduced[i][j] = mat[i][j];
}
}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -136,7 +133,7 @@ G4CrystalAtomBase* G4CrystalExtension::GetAtomBase(const G4Element* anElement){
G4bool G4CrystalExtension::GetAtomPos(const G4Element* anEl, std::vector<G4ThreeVector>& vecout){
std::vector<G4ThreeVector> pos;
for(auto asinglepos: GetAtomBase(anEl)->GetPos()){
for(auto & asinglepos: GetAtomBase(anEl)->GetPos()){
pos.clear();
theUnitCell->FillAtomicPos(asinglepos,pos);
vecout.insert(std::end(vecout), std::begin(pos), std::end(pos));
@@ -149,7 +146,7 @@ G4bool G4CrystalExtension::GetAtomPos(const G4Element* anEl, std::vector<G4Three
G4bool G4CrystalExtension::GetAtomPos(std::vector<G4ThreeVector>& vecout){
std::vector<G4ThreeVector> pos;
vecout.clear();
for(auto anElement: *(fMaterial->GetElementVector())){
for(auto & anElement: *(fMaterial->GetElementVector())){
pos.clear();
GetAtomPos(anElement,pos);
vecout.insert(std::end(vecout), std::begin(pos), std::end(pos));