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

Import Geant4 11.4.1 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2026-03-19 16:51:22 +01:00
parent b4a16de652
commit 41f2dd7996
352 changed files with 26342 additions and 24532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/solidstate/channeling/History
+8 -2
View File
@@ -1,9 +1,15 @@
# Category channeling History
See `CONTRIBUTING.rst` for details of **required** info/format for each entry,
which **must** added in reverse chronological order (newest at the top). It must **not**
be used as a substitute for writing good git commit messages!
which **must** added in reverse chronological order (newest at the top).
It must **not** be used as a substitute for writing good git commit messages!
-------------------------------------------------------------------------------
## 2026-02-04 Gabriele Cosmo (channeling-V11-03-00)
- In G4ChannelingMaterialData, fixed reported Coverity defects for
string parameters copying. Use consistently G4 types and minor
code formatting.
## 2024-07-17 Vladimir Ivanchenko (channeling-V11-02-00)
- G4ChannelingOptrMultiParticleChangeCrossSection,
source/processes/solidstate/channeling/include/G4ChannelingMaterialData.hh
+37 -53
View File
@@ -25,8 +25,8 @@
//
//
#ifndef G4ChannelingMaterialData_h
#define G4ChannelingMaterialData_h 1
#ifndef G4CHANNELINGMATERIALDATA_HH
#define G4CHANNELINGMATERIALDATA_HH
#include "G4ios.hh"
#include "globals.hh"
@@ -38,69 +38,53 @@
#include <unordered_map>
#include "G4PhysicsLinearVector.hh"
class G4ChannelingMaterialData : public G4VMaterialExtension{
public:
class G4ChannelingMaterialData : public G4VMaterialExtension
{
public:
G4ChannelingMaterialData(const G4String&);
virtual ~G4ChannelingMaterialData();
public:
void Print() const {G4cout << "Channeling Material Data" << G4endl;};
void Print() const { G4cout << "Channeling Material Data" << G4endl; }
void SetFilename(const G4String&);
void SetFilenameElement(const G4String&,std::string);
void SetFilenameElement(const G4String&, const G4String&);
public:
G4ChannelingECHARM* GetPot() {return fPotential;};
G4ChannelingECHARM* GetEFX() {return fElectricFieldX;};
G4ChannelingECHARM* GetEFY() {return fElectricFieldY;};
G4ChannelingECHARM* GetNuD() {return fNucleiDensity;};
G4ChannelingECHARM* GetElD() {return fElectronDensity;};
G4ChannelingECHARM* GetPot() { return fPotential; }
G4ChannelingECHARM* GetEFX() { return fElectricFieldX; }
G4ChannelingECHARM* GetEFY() { return fElectricFieldY; }
G4ChannelingECHARM* GetNuD() { return fNucleiDensity; }
G4ChannelingECHARM* GetElD() { return fElectronDensity; }
private:
G4ChannelingECHARM* fPotential;
G4ChannelingECHARM* fElectricFieldX;
G4ChannelingECHARM* fElectricFieldY;
G4ChannelingECHARM* fNucleiDensity;
G4ChannelingECHARM* fElectronDensity;
G4ChannelingECHARM* GetPotEl(const G4String& name) { return fPotentialElement[name]; }
G4ChannelingECHARM* GetEFXEl(const G4String& name) { return fElectricFieldXElement[name]; }
G4ChannelingECHARM* GetEFYEl(const G4String& name) { return fElectricFieldYElement[name]; }
G4ChannelingECHARM* GetNuDEl(const G4String& name) { return fNucleiDensityElement[name]; }
G4ChannelingECHARM* GetElDEl(const G4String& name) { return fElectronDensityElement[name]; }
public:
G4ChannelingECHARM* GetPotEl(std::string name) {return fPotentialElement[name];};
G4ChannelingECHARM* GetEFXEl(std::string name) {return fElectricFieldXElement[name];};
G4ChannelingECHARM* GetEFYEl(std::string name) {return fElectricFieldYElement[name];};
G4ChannelingECHARM* GetNuDEl(std::string name) {return fNucleiDensityElement[name];};
G4ChannelingECHARM* GetElDEl(std::string name) {return fElectronDensityElement[name];};
virtual G4bool IsBent() { return bIsBent; }
private:
std::unordered_map<std::string,G4ChannelingECHARM*> fPotentialElement;
std::unordered_map<std::string,G4ChannelingECHARM*> fElectricFieldXElement;
std::unordered_map<std::string,G4ChannelingECHARM*> fElectricFieldYElement;
std::unordered_map<std::string,G4ChannelingECHARM*> fNucleiDensityElement;
std::unordered_map<std::string,G4ChannelingECHARM*> fElectronDensityElement;
public:
virtual G4bool IsBent() {
return bIsBent;
};
virtual G4ThreeVector GetBR(G4ThreeVector& v3) {
return G4ThreeVector(fVectorR->Value(v3.z()),0.,0.);
};
virtual G4ThreeVector GetBR(const G4ThreeVector& v3) { return G4ThreeVector(fVectorR->Value(v3.z()),0.,0.); }
virtual void SetBR(const G4String&);
virtual void SetBR(G4double);
protected:
G4PhysicsVector* fVectorR;
G4bool bIsBent;
protected:
G4PhysicsVector* fVectorR = nullptr;
G4bool bIsBent = false;
private:
G4ChannelingECHARM* fPotential = nullptr;
G4ChannelingECHARM* fElectricFieldX = nullptr;
G4ChannelingECHARM* fElectricFieldY = nullptr;
G4ChannelingECHARM* fNucleiDensity = nullptr;
G4ChannelingECHARM* fElectronDensity = nullptr;
std::unordered_map<std::string, G4ChannelingECHARM*> fPotentialElement;
std::unordered_map<std::string, G4ChannelingECHARM*> fElectricFieldXElement;
std::unordered_map<std::string, G4ChannelingECHARM*> fElectricFieldYElement;
std::unordered_map<std::string, G4ChannelingECHARM*> fNucleiDensityElement;
std::unordered_map<std::string, G4ChannelingECHARM*> fElectronDensityElement;
};
#endif
source/processes/solidstate/channeling/src/G4ChannelingMaterialData.cc
+17 -18
View File
@@ -33,19 +33,15 @@
#include "G4LogicalCrystalVolume.hh"
#include "G4TouchableHistory.hh"
G4ChannelingMaterialData::G4ChannelingMaterialData(const G4String& name):
G4VMaterialExtension(name),
fPotential(0),
fElectricFieldX(0),
fElectricFieldY(0),
fNucleiDensity(0),
fElectronDensity(0),
fVectorR(0),
bIsBent(false){;}
G4ChannelingMaterialData::G4ChannelingMaterialData(const G4String& name)
: G4VMaterialExtension(name)
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
void G4ChannelingMaterialData::SetFilename(const G4String& fileName){
void G4ChannelingMaterialData::SetFilename(const G4String& fileName)
{
G4String filePot = fileName + "_pot.txt";
G4String fileEFX = fileName + "_efx.txt";
G4String fileEFY = fileName + "_efy.txt";
@@ -67,7 +63,8 @@ void G4ChannelingMaterialData::SetFilename(const G4String& fileName){
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
void G4ChannelingMaterialData::SetFilenameElement(const G4String& fileName,std::string elementName){
void G4ChannelingMaterialData::SetFilenameElement(const G4String& fileName, const G4String& elementName)
{
G4String filePot = fileName + "_pot.txt";
G4String fileEFX = fileName + "_efx.txt";
G4String fileEFY = fileName + "_efy.txt";
@@ -90,7 +87,8 @@ void G4ChannelingMaterialData::SetFilenameElement(const G4String& fileName,std::
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
void G4ChannelingMaterialData::SetBR(G4double val){
void G4ChannelingMaterialData::SetBR(G4double val)
{
fVectorR = new G4PhysicsLinearVector(0,DBL_MAX,2);
fVectorR->PutValue(0,val);
fVectorR->PutValue(1,val);
@@ -99,17 +97,18 @@ void G4ChannelingMaterialData::SetBR(G4double val){
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
void G4ChannelingMaterialData::SetBR(const G4String& filename){
void G4ChannelingMaterialData::SetBR(const G4String& filename)
{
std::ifstream vFileIn;
int points;
float maximum;
G4int points;
G4float maximum;
vFileIn.open(filename);
vFileIn >> points >> maximum;
fVectorR = new G4PhysicsLinearVector(0,maximum * CLHEP::millimeter,points);
double vTempX;
double maximumY = -DBL_MAX;
double minimumY = +DBL_MAX;
G4double vTempX;
G4double maximumY = -DBL_MAX;
G4double minimumY = +DBL_MAX;
for(G4int i0=0;i0<points; i0++){
vFileIn >> vTempX;
if(vTempX>maximumY) maximumY = vTempX;