Import Geant4 11.1.1 source tree
This commit is contained in:
@@ -6,6 +6,10 @@ It must **not** be used as a substitute for writing good git commit messages!
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
## 2022-12-20 Vladimir Ivanchenko (global-V11-00-34)
|
||||
- G4DataVector: simplified inline methods in order to remove compilation
|
||||
warnings at some CMSSW platforms
|
||||
|
||||
## 2022-11-29 Gabriele Cosmo (global-V11-00-33)
|
||||
- Updated tag IDs for geant4-11-01-ref-00.
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ class G4DataVector : public std::vector<G4double>
|
||||
inline void insertAt(std::size_t, const G4double&);
|
||||
// Insert an element at given position
|
||||
|
||||
inline std::size_t index(const G4double&);
|
||||
inline std::size_t index(const G4double&) const;
|
||||
// Returns back index of the element same as given value
|
||||
|
||||
inline G4bool contains(const G4double&) const;
|
||||
|
||||
@@ -45,31 +45,22 @@ inline void G4DataVector::insertAt(std::size_t pos, const G4double& a)
|
||||
}
|
||||
}
|
||||
|
||||
inline std::size_t G4DataVector::index(const G4double& a)
|
||||
inline std::size_t G4DataVector::index(const G4double& a) const
|
||||
{
|
||||
std::size_t ptn = 0;
|
||||
for(auto i = cbegin(); i != cend(); ++i, ++ptn)
|
||||
{
|
||||
if(!(*i != a))
|
||||
if((*i) == a)
|
||||
{
|
||||
return ptn;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return (ptn = ~(std::size_t) 0);
|
||||
return ptn;
|
||||
}
|
||||
|
||||
inline G4bool G4DataVector::contains(const G4double& a) const
|
||||
{
|
||||
for(double i : *this)
|
||||
{
|
||||
if(!(i != a))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
return (index(a) < size());
|
||||
}
|
||||
|
||||
inline G4bool G4DataVector::remove(const G4double& a)
|
||||
|
||||
@@ -40,11 +40,11 @@
|
||||
// |--> patch number
|
||||
|
||||
#ifndef G4VERSION_NUMBER
|
||||
#define G4VERSION_NUMBER 1110
|
||||
#define G4VERSION_NUMBER 1111
|
||||
#endif
|
||||
|
||||
#ifndef G4VERSION_TAG
|
||||
#define G4VERSION_TAG "$Name: geant4-11-01 $"
|
||||
#define G4VERSION_TAG "$Name: geant4-11-01-patch-01 $"
|
||||
#endif
|
||||
|
||||
// as variables
|
||||
@@ -53,10 +53,10 @@
|
||||
#include "G4Types.hh"
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
static const G4String G4Version = "$Name: geant4-11-01 [MT]$";
|
||||
static const G4String G4Version = "$Name: geant4-11-01-patch-01 [MT]$";
|
||||
#else
|
||||
static const G4String G4Version = "$Name: geant4-11-01 $";
|
||||
static const G4String G4Version = "$Name: geant4-11-01-patch-01 $";
|
||||
#endif
|
||||
static const G4String G4Date = "(9-December-2022)";
|
||||
static const G4String G4Date = "(10-February-2023)";
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user