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/readout/History
+7 -2
View File
@@ -1,8 +1,13 @@
# Category readout 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!
-------------------------------------------------------------------------------
## 2022-11-17 Gabriele Cosmo (readout-V11-00-02)
- Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1.
## 2022-01-28 Ben Morgan (readout-V11-00-01)
- Replace `geant4_global_library_target` with direct file inclusion and
source/readout/src/G4DCtable.cc
+15 -12
View File
@@ -33,13 +33,15 @@ G4DCtable::G4DCtable() {;}
G4DCtable::~G4DCtable() {;}
G4int G4DCtable::Registor(G4String DMname,G4String DCname)
G4int G4DCtable::Registor(G4String DMname, G4String DCname)
{
for(int i=0;i<int(DClist.size());i++)
{ if(DClist[i]==DCname && DMlist[i]==DMname) return -1; }
for(std::size_t i=0; i<DClist.size(); ++i)
{
if(DClist[i]==DCname && DMlist[i]==DMname) return -1;
}
DClist.push_back(DCname);
DMlist.push_back(DMname);
return DClist.size();
return (G4int)DClist.size();
}
G4int G4DCtable::GetCollectionID(G4String DCname) const
@@ -47,18 +49,18 @@ G4int G4DCtable::GetCollectionID(G4String DCname) const
G4int i = -1;
if(DCname.find("/")==std::string::npos) // DCname only
{
for(int j=0;j<int(DClist.size());j++)
for(std::size_t j=0; j<DClist.size(); ++j)
{
if(DClist[j]==DCname)
{
if(i>=0) return -2;
i = j;
i = (G4int)j;
}
}
}
else
{
for(int j=0;j<int(DClist.size());j++)
for(std::size_t j=0; j<DClist.size(); ++j)
{
G4String tgt = DMlist[j];
tgt += "/";
@@ -66,7 +68,7 @@ G4int G4DCtable::GetCollectionID(G4String DCname) const
if(tgt==DCname)
{
if(i>=0) return -2;
i = j;
i = (G4int)j;
}
}
}
@@ -88,13 +90,14 @@ G4int G4DCtable::GetCollectionID(G4VDigitizerModule* aDM) const
<< "> has more than one registered digits collections."
<< G4endl;
G4cerr << "Candidates are : ";
for(G4int j=0;j<aDM->GetNumberOfCollections();j++)
for(G4int j=0; j<aDM->GetNumberOfCollections(); ++j)
{ G4cerr << aDM->GetCollectionName(j) << " "; }
G4cerr << G4endl;
return -1;
}
for(size_t k=0;k<DMlist.size();k++)
{ if(DMlist[k]==aDM->GetName()) return k; }
for(std::size_t k=0; k<DMlist.size(); ++k)
{
if(DMlist[k]==aDM->GetName()) return (G4int)k;
}
return -1;
}