Import Geant4 11.2.2 source tree
This commit is contained in:
@@ -1,9 +1,15 @@
|
||||
# Category prophonon 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!
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
## 2024-04-21 Gabriele Cosmo (prophonon-V11-01-00)
|
||||
- Fixed compilation error in G4LatticeManager on Windows VC++ with
|
||||
C++20 Standard enabled.
|
||||
Based on [GitHub PR#69](https://github.com/Geant4/geant4/pull/69).
|
||||
|
||||
## 2021-12-10 Ben Morgan (prophonon-V11-00-00)
|
||||
- Change to new Markdown History format
|
||||
|
||||
@@ -211,15 +211,16 @@ G4LatticeLogical* G4LatticeManager::GetLattice(G4Material* Mat) const {
|
||||
if (latFind != fLLatticeList.end()) {
|
||||
if (verboseLevel)
|
||||
G4cout << "G4LatticeManager::GetLattice found " << latFind->second
|
||||
<< " for " << (Mat?Mat->GetName():"NULL") << "." << G4endl;
|
||||
<< " for "<< (Mat ? Mat->GetName() : G4String("NULL")) << "."
|
||||
<< G4endl;
|
||||
return latFind->second;
|
||||
}
|
||||
|
||||
if (verboseLevel)
|
||||
G4cerr << "G4LatticeManager:: Found no matching lattices for "
|
||||
<< (Mat?Mat->GetName():"NULL") << "." << G4endl;
|
||||
<< (Mat ? Mat->GetName() : G4String("NULL")) << "." << G4endl;
|
||||
|
||||
return 0; // No lattice associated with volume
|
||||
return nullptr; // No lattice associated with volume
|
||||
}
|
||||
|
||||
// Returns a pointer to the LatticePhysical associated with volume
|
||||
@@ -230,15 +231,16 @@ G4LatticePhysical* G4LatticeManager::GetLattice(G4VPhysicalVolume* Vol) const {
|
||||
if (latFind != fPLatticeList.end()) {
|
||||
if (verboseLevel)
|
||||
G4cout << "G4LatticeManager::GetLattice found " << latFind->second
|
||||
<< " for " << (Vol?Vol->GetName():"default") << "." << G4endl;
|
||||
<< " for " << (Vol ? Vol->GetName() : G4String("default")) << "."
|
||||
<< G4endl;
|
||||
return latFind->second;
|
||||
}
|
||||
|
||||
if (verboseLevel)
|
||||
G4cerr << "G4LatticeManager::GetLattice found no matching lattices for "
|
||||
<< (Vol?Vol->GetName():"default") << "." << G4endl;
|
||||
<< (Vol ? Vol->GetName() : G4String("default")) << "." << G4endl;
|
||||
|
||||
return 0; // No lattice associated with volume
|
||||
return nullptr; // No lattice associated with volume
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
Reference in New Issue
Block a user