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

Import Geant4 11.0.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2021-06-25 16:12:29 +02:00
parent c968e26a39
commit 6399a014b6
4200 changed files with 207479 additions and 237366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/advanced/HGCal_testbeam/CMakeLists.txt
+1 -4
View File
@@ -1,9 +1,6 @@
#----------------------------------------------------------------------------
# Setup the project
cmake_minimum_required(VERSION 3.8...3.18 FATAL_ERROR)
if(${CMAKE_VERSION} VERSION_LESS 3.12)
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
endif()
cmake_minimum_required(VERSION 3.12...3.20)
project(HGCal_testbeam)
examples/advanced/HGCal_testbeam/History
+15 -1
View File
@@ -14,5 +14,19 @@ track of all tags.
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
10-June-21 V. Ivanchenko (exhgcaltb-V10-07-02)
- SiliconPixelHit, SiPMHit - fixed bug in handling of NIEL energy
deposition
- CMSHadronPhysicsFTFP_BERT - added class from CMS
- CMSEmStandardPhysicsHcal - removed obsolete
- FTFPCMS_BERT_EMM - use correct combination of physics constructors
24-May-21 B. Morgan (exhgcaltb-V10-07-01)
- Bump required CMake version range to 3.12...3.20, matching core Geant4
21-Mar-21 V. Ivanchenko (exhgcaltb-V10-07-00)
- removed RanecuEngine
- updated CMS EM physics to 11.0
02-Nov-20 A. Zaborowska (exhgcaltb-V10-06-00)
- Create HGCal_testbeam example based on Thorben Quast application
- Create HGCal_testbeam example based on Thorben Quast application
examples/advanced/HGCal_testbeam/hgcal_testbeam.cc
-3
View File
@@ -50,9 +50,6 @@ int main(int argc,char** argv)
ui = new G4UIExecutive(argc, argv);
}
// Choose the Random engine
G4Random::setTheEngine(new CLHEP::RanecuEngine);
// Initialization of Run manager
auto* runManager =
G4RunManagerFactory::CreateRunManager(G4RunManagerType::Default);
examples/advanced/HGCal_testbeam/include/CMSHadronPhysicsFTFP_BERT.hh
+61
View File
@@ -0,0 +1,61 @@
//
// ********************************************************************
// * License and Disclaimer *
// * *
// * The Geant4 software is copyright of the Copyright Holders of *
// * the Geant4 Collaboration. It is provided under the terms and *
// * conditions of the Geant4 Software License, included in the file *
// * LICENSE and available at http://cern.ch/geant4/license . These *
// * include a list of copyright holders. *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. Please see the license in the file LICENSE and URL above *
// * for the full disclaimer and the limitation of liability. *
// * *
// * This code implementation is the result of the scientific and *
// * technical work of the GEANT4 collaboration. *
// * By using, copying, modifying or distributing the software (or *
// * any work based on the software) you agree to acknowledge its *
// * use in resulting scientific publications, and indicate your *
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//---------------------------------------------------------------------------
// Author: Vladimir Ivanchenko
// Date: March 2018
//
// Hadron inelastic physics for the new CMS physics list FTFP_BERT.
// The hadron physics of FTFP_BERT has the transition between Bertini
// (BERT) intra-nuclear cascade model and Fritiof (FTF) string model
// optimized for CMS.
//
// 15.04.2021 V.Ivanchenko Hadron inelastic physics of CMS
// mirgrated to Geant4 10.7
//
//---------------------------------------------------------------------------
//
#ifndef CMSHadronPhysicsFTFP_BERT_h
#define CMSHadronPhysicsFTFP_BERT_h
#include "globals.hh"
#include "G4ios.hh"
#include "G4HadronPhysicsFTFP_BERT.hh"
class CMSHadronPhysicsFTFP_BERT : public G4HadronPhysicsFTFP_BERT {
public:
explicit CMSHadronPhysicsFTFP_BERT(G4int verb);
~CMSHadronPhysicsFTFP_BERT() override;
void ConstructProcess() override;
// copy constructor and hide assignment operator
CMSHadronPhysicsFTFP_BERT(CMSHadronPhysicsFTFP_BERT &) = delete;
CMSHadronPhysicsFTFP_BERT &operator=(const CMSHadronPhysicsFTFP_BERT &right) = delete;
};
#endif
examples/advanced/HGCal_testbeam/src/CMSEmStandardPhysicsHcal.cc
-381
View File
@@ -1,381 +0,0 @@
//
// ********************************************************************
// * License and Disclaimer *
// * *
// * The Geant4 software is copyright of the Copyright Holders of *
// * the Geant4 Collaboration. It is provided under the terms and *
// * conditions of the Geant4 Software License, included in the file *
// * LICENSE and available at http://cern.ch/geant4/license . These *
// * include a list of copyright holders. *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. Please see the license in the file LICENSE and URL above *
// * for the full disclaimer and the limitation of liability. *
// * *
// * This code implementation is the result of the scientific and *
// * technical work of the GEANT4 collaboration. *
// * By using, copying, modifying or distributing the software (or *
// * any work based on the software) you agree to acknowledge its *
// * use in resulting scientific publications, and indicate your *
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
#include "CMSEmStandardPhysicsHcal.hh"
#include "G4EmParameters.hh"
#include "G4LossTableManager.hh"
#include "G4ParticleDefinition.hh"
#include "G4UAtomicDeexcitation.hh"
#include "G4ComptonScattering.hh"
#include "G4GammaConversion.hh"
#include "G4PhotoElectricEffect.hh"
#include "G4CoulombScattering.hh"
#include "G4MuMultipleScattering.hh"
#include "G4UrbanMscModel.hh"
#include "G4WentzelVIModel.hh"
#include "G4eCoulombScatteringModel.hh"
#include "G4eMultipleScattering.hh"
#include "G4hMultipleScattering.hh"
#include "G4eBremsstrahlung.hh"
#include "G4eIonisation.hh"
#include "G4eplusAnnihilation.hh"
#include "G4MuBremsstrahlung.hh"
#include "G4MuIonisation.hh"
#include "G4MuPairProduction.hh"
#include "G4hBremsstrahlung.hh"
#include "G4hIonisation.hh"
#include "G4hPairProduction.hh"
#include "G4ionIonisation.hh"
#include "G4Alpha.hh"
#include "G4AntiLambdacPlus.hh"
#include "G4AntiOmegaMinus.hh"
#include "G4AntiProton.hh"
#include "G4AntiSigmaMinus.hh"
#include "G4AntiSigmaPlus.hh"
#include "G4AntiXiMinus.hh"
#include "G4AntiXicPlus.hh"
#include "G4BMesonMinus.hh"
#include "G4BMesonPlus.hh"
#include "G4DMesonMinus.hh"
#include "G4DMesonPlus.hh"
#include "G4Deuteron.hh"
#include "G4Electron.hh"
#include "G4Gamma.hh"
#include "G4GenericIon.hh"
#include "G4He3.hh"
#include "G4KaonMinus.hh"
#include "G4KaonPlus.hh"
#include "G4LambdacPlus.hh"
#include "G4MuonMinus.hh"
#include "G4MuonPlus.hh"
#include "G4OmegaMinus.hh"
#include "G4PionMinus.hh"
#include "G4PionPlus.hh"
#include "G4Positron.hh"
#include "G4Proton.hh"
#include "G4SigmaMinus.hh"
#include "G4SigmaPlus.hh"
#include "G4TauMinus.hh"
#include "G4TauPlus.hh"
#include "G4Triton.hh"
#include "G4XiMinus.hh"
#include "G4XicPlus.hh"
#include "G4BuilderType.hh"
#include "G4PhysicsListHelper.hh"
#include "G4RegionStore.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
CMSEmStandardPhysicsHcal::CMSEmStandardPhysicsHcal(G4int ver)
: G4VPhysicsConstructor("CMSEmStandard_emm"), fVerbose(ver) {
G4EmParameters *param = G4EmParameters::Instance();
param->SetDefaults();
param->SetVerbose(fVerbose);
param->SetApplyCuts(true);
param->SetMscRangeFactor(0.2);
param->SetMscStepLimitType(fMinimal);
SetPhysicsType(bElectromagnetic);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
CMSEmStandardPhysicsHcal::~CMSEmStandardPhysicsHcal() {}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void CMSEmStandardPhysicsHcal::ConstructParticle() {
// gamma
G4Gamma::Gamma();
// leptons
G4Electron::Electron();
G4Positron::Positron();
G4MuonPlus::MuonPlus();
G4MuonMinus::MuonMinus();
G4TauMinus::TauMinusDefinition();
G4TauPlus::TauPlusDefinition();
// mesons
G4PionPlus::PionPlusDefinition();
G4PionMinus::PionMinusDefinition();
G4KaonPlus::KaonPlusDefinition();
G4KaonMinus::KaonMinusDefinition();
G4DMesonMinus::DMesonMinusDefinition();
G4DMesonPlus::DMesonPlusDefinition();
G4BMesonMinus::BMesonMinusDefinition();
G4BMesonPlus::BMesonPlusDefinition();
// barions
G4Proton::Proton();
G4AntiProton::AntiProton();
G4SigmaMinus::SigmaMinusDefinition();
G4AntiSigmaMinus::AntiSigmaMinusDefinition();
G4SigmaPlus::SigmaPlusDefinition();
G4AntiSigmaPlus::AntiSigmaPlusDefinition();
G4XiMinus::XiMinusDefinition();
G4AntiXiMinus::AntiXiMinusDefinition();
G4OmegaMinus::OmegaMinusDefinition();
G4AntiOmegaMinus::AntiOmegaMinusDefinition();
G4LambdacPlus::LambdacPlusDefinition();
G4AntiLambdacPlus::AntiLambdacPlusDefinition();
G4XicPlus::XicPlusDefinition();
G4AntiXicPlus::AntiXicPlusDefinition();
// ions
G4Deuteron::Deuteron();
G4Triton::Triton();
G4He3::He3();
G4Alpha::Alpha();
G4GenericIon::GenericIonDefinition();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void CMSEmStandardPhysicsHcal::ConstructProcess() {
if (fVerbose > 0) {
G4cout << "### " << GetPhysicsName() << " Construct Processes " << G4endl;
}
// This EM builder takes default models of Geant4 10 EMV.
// Multiple scattering by Urban for all particles
// except e+e- below 100 MeV for which the Urban93 model is used
G4PhysicsListHelper *ph = G4PhysicsListHelper::GetPhysicsListHelper();
// muon & hadron bremsstrahlung and pair production
G4MuBremsstrahlung *mub = nullptr;
G4MuPairProduction *mup = nullptr;
G4hBremsstrahlung *pib = nullptr;
G4hPairProduction *pip = nullptr;
G4hBremsstrahlung *kb = nullptr;
G4hPairProduction *kp = nullptr;
G4hBremsstrahlung *pb = nullptr;
G4hPairProduction *pp = nullptr;
// muon & hadron multiple scattering
G4MuMultipleScattering *mumsc = nullptr;
G4MuMultipleScattering *pimsc = nullptr;
G4MuMultipleScattering *kmsc = nullptr;
G4MuMultipleScattering *pmsc = nullptr;
G4hMultipleScattering *hmsc = nullptr;
G4CoulombScattering *muss = nullptr;
G4CoulombScattering *piss = nullptr;
G4CoulombScattering *kss = nullptr;
G4CoulombScattering *pss = nullptr;
// high energy limit for e+- scattering models and bremsstrahlung
G4double highEnergyLimit = 100 * CLHEP::MeV;
G4Region *aRegion = G4RegionStore::GetInstance()->GetRegion("HcalRegion");
auto myParticleIterator = GetParticleIterator();
myParticleIterator->reset();
while ((*myParticleIterator)()) {
G4ParticleDefinition *particle = myParticleIterator->value();
G4String particleName = particle->GetParticleName();
if (particleName == "gamma") {
ph->RegisterProcess(new G4PhotoElectricEffect(), particle);
ph->RegisterProcess(new G4ComptonScattering(), particle);
ph->RegisterProcess(new G4GammaConversion(), particle);
} else if (particleName == "e-") {
G4eIonisation *eioni = new G4eIonisation();
eioni->SetStepFunction(0.8, 1.0 * CLHEP::mm);
G4eMultipleScattering *msc = new G4eMultipleScattering;
msc->SetStepLimitType(fMinimal);
G4UrbanMscModel *msc1 = new G4UrbanMscModel();
G4WentzelVIModel *msc2 = new G4WentzelVIModel();
G4UrbanMscModel *msc3 = new G4UrbanMscModel();
msc3->SetLocked(true);
msc1->SetHighEnergyLimit(highEnergyLimit);
msc2->SetLowEnergyLimit(highEnergyLimit);
msc3->SetHighEnergyLimit(highEnergyLimit);
msc->AddEmModel(0, msc1);
msc->AddEmModel(0, msc2);
msc->AddEmModel(-1, msc3, aRegion);
G4eCoulombScatteringModel *ssm = new G4eCoulombScatteringModel();
G4CoulombScattering *ss = new G4CoulombScattering();
ss->SetEmModel(ssm, 1);
ss->SetMinKinEnergy(highEnergyLimit);
ssm->SetLowEnergyLimit(highEnergyLimit);
ssm->SetActivationLowEnergyLimit(highEnergyLimit);
ph->RegisterProcess(msc, particle);
ph->RegisterProcess(eioni, particle);
ph->RegisterProcess(new G4eBremsstrahlung(), particle);
ph->RegisterProcess(ss, particle);
} else if (particleName == "e+") {
G4eIonisation *eioni = new G4eIonisation();
eioni->SetStepFunction(0.8, 1.0 * CLHEP::mm);
G4eMultipleScattering *msc = new G4eMultipleScattering;
msc->SetStepLimitType(fMinimal);
G4UrbanMscModel *msc1 = new G4UrbanMscModel();
G4WentzelVIModel *msc2 = new G4WentzelVIModel();
G4UrbanMscModel *msc3 = new G4UrbanMscModel();
msc1->SetHighEnergyLimit(highEnergyLimit);
msc2->SetLowEnergyLimit(highEnergyLimit);
msc3->SetHighEnergyLimit(highEnergyLimit);
msc3->SetLocked(true);
msc->AddEmModel(0, msc1);
msc->AddEmModel(0, msc2);
msc->AddEmModel(-1, msc3, aRegion);
G4eCoulombScatteringModel *ssm = new G4eCoulombScatteringModel();
G4CoulombScattering *ss = new G4CoulombScattering();
ss->SetEmModel(ssm, 1);
ss->SetMinKinEnergy(highEnergyLimit);
ssm->SetLowEnergyLimit(highEnergyLimit);
ssm->SetActivationLowEnergyLimit(highEnergyLimit);
ph->RegisterProcess(msc, particle);
ph->RegisterProcess(eioni, particle);
ph->RegisterProcess(new G4eBremsstrahlung(), particle);
ph->RegisterProcess(new G4eplusAnnihilation(), particle);
ph->RegisterProcess(ss, particle);
} else if (particleName == "mu+" || particleName == "mu-") {
if (nullptr == mub) {
mub = new G4MuBremsstrahlung();
mup = new G4MuPairProduction();
mumsc = new G4MuMultipleScattering();
mumsc->AddEmModel(0, new G4WentzelVIModel());
muss = new G4CoulombScattering();
}
ph->RegisterProcess(mumsc, particle);
ph->RegisterProcess(new G4MuIonisation(), particle);
ph->RegisterProcess(mub, particle);
ph->RegisterProcess(mup, particle);
ph->RegisterProcess(muss, particle);
} else if (particleName == "alpha" || particleName == "He3") {
ph->RegisterProcess(new G4hMultipleScattering(), particle);
ph->RegisterProcess(new G4ionIonisation(), particle);
} else if (particleName == "GenericIon") {
if (nullptr == hmsc) {
hmsc = new G4hMultipleScattering("ionmsc");
}
ph->RegisterProcess(hmsc, particle);
ph->RegisterProcess(new G4ionIonisation(), particle);
} else if (particleName == "pi+" || particleName == "pi-") {
if (nullptr == pib) {
pib = new G4hBremsstrahlung();
pip = new G4hPairProduction();
pimsc = new G4MuMultipleScattering();
pimsc->AddEmModel(0, new G4WentzelVIModel());
piss = new G4CoulombScattering();
}
ph->RegisterProcess(pimsc, particle);
ph->RegisterProcess(new G4hIonisation(), particle);
ph->RegisterProcess(pib, particle);
ph->RegisterProcess(pip, particle);
ph->RegisterProcess(piss, particle);
} else if (particleName == "kaon+" || particleName == "kaon-") {
if (nullptr == kb) {
kb = new G4hBremsstrahlung();
kp = new G4hPairProduction();
kmsc = new G4MuMultipleScattering();
kmsc->AddEmModel(0, new G4WentzelVIModel());
kss = new G4CoulombScattering();
}
ph->RegisterProcess(kmsc, particle);
ph->RegisterProcess(new G4hIonisation(), particle);
ph->RegisterProcess(kb, particle);
ph->RegisterProcess(kp, particle);
ph->RegisterProcess(kss, particle);
} else if (particleName == "proton" || particleName == "anti_proton") {
if (nullptr == pb) {
pb = new G4hBremsstrahlung();
pp = new G4hPairProduction();
pmsc = new G4MuMultipleScattering();
pmsc->AddEmModel(0, new G4WentzelVIModel());
pss = new G4CoulombScattering();
}
ph->RegisterProcess(pmsc, particle);
ph->RegisterProcess(new G4hIonisation(), particle);
ph->RegisterProcess(pb, particle);
ph->RegisterProcess(pp, particle);
ph->RegisterProcess(pss, particle);
} else if (particleName == "B+" || particleName == "B-" ||
particleName == "D+" || particleName == "D-" ||
particleName == "Ds+" || particleName == "Ds-" ||
particleName == "anti_He3" || particleName == "anti_alpha" ||
particleName == "anti_deuteron" ||
particleName == "anti_lambda_c+" ||
particleName == "anti_omega-" ||
particleName == "anti_sigma_c+" ||
particleName == "anti_sigma_c++" ||
particleName == "anti_sigma+" || particleName == "anti_sigma-" ||
particleName == "anti_triton" || particleName == "anti_xi_c+" ||
particleName == "anti_xi-" || particleName == "deuteron" ||
particleName == "lambda_c+" || particleName == "omega-" ||
particleName == "sigma_c+" || particleName == "sigma_c++" ||
particleName == "sigma+" || particleName == "sigma-" ||
particleName == "tau+" || particleName == "tau-" ||
particleName == "triton" || particleName == "xi_c+" ||
particleName == "xi-") {
if (nullptr == hmsc) {
hmsc = new G4hMultipleScattering("ionmsc");
}
ph->RegisterProcess(hmsc, particle);
ph->RegisterProcess(new G4hIonisation(), particle);
}
}
// Deexcitation
//
G4VAtomDeexcitation *de = new G4UAtomicDeexcitation();
G4LossTableManager::Instance()->SetAtomDeexcitation(de);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/advanced/HGCal_testbeam/include/CMSEmStandardPhysicsHcal.hh → examples/advanced/HGCal_testbeam/src/CMSHadronPhysicsFTFP_BERT.cc
+21 -23
View File
@@ -23,29 +23,27 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
#ifndef CMSEMSTANDARDPHYSICSHCAL_HH
#define CMSEMSTANDARDPHYSICSHCAL_HH
#include "CMSHadronPhysicsFTFP_BERT.hh"
#include "G4SystemOfUnits.hh"
#include "G4Threading.hh"
#include "G4VPhysicsConstructor.hh"
CMSHadronPhysicsFTFP_BERT::CMSHadronPhysicsFTFP_BERT(G4int)
: G4HadronPhysicsFTFP_BERT("hInelastic FTFP_BERT", false) {
minFTFP_pion = 3 * CLHEP::GeV;
maxBERT_pion = 12 * CLHEP::GeV;
minFTFP_kaon = 3 * CLHEP::GeV;
maxBERT_kaon = 6 * CLHEP::GeV;
minFTFP_proton = 3 * CLHEP::GeV;
maxBERT_proton = 6 * CLHEP::GeV;
minFTFP_neutron = 3 * CLHEP::GeV;
maxBERT_neutron = 6 * CLHEP::GeV;
}
/**
* @brief EM physics
*
* Used in FTFPCMS_BERT_EMM physics list. Copy from test46.
*
*/
CMSHadronPhysicsFTFP_BERT::~CMSHadronPhysicsFTFP_BERT() {}
class CMSEmStandardPhysicsHcal : public G4VPhysicsConstructor {
public:
explicit CMSEmStandardPhysicsHcal(G4int ver);
virtual ~CMSEmStandardPhysicsHcal();
virtual void ConstructParticle();
virtual void ConstructProcess();
private:
G4int fVerbose = 0;
};
#endif /* CMSEMSTANDARDPHYSICSHCAL_HH */
void CMSHadronPhysicsFTFP_BERT::ConstructProcess() {
if (G4Threading::IsMasterThread()) {
DumpBanner();
}
CreateModels();
}
examples/advanced/HGCal_testbeam/src/FTFPCMS_BERT_EMM.cc
+5 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
#include "FTFPCMS_BERT_EMM.hh"
#include "CMSEmStandardPhysicsHcal.hh"
#include "G4EmStandardPhysics.hh"
#include "G4DecayPhysics.hh"
#include "G4EmExtraPhysics.hh"
#include "G4HadronElasticPhysics.hh"
@@ -34,6 +34,7 @@
#include "G4StoppingPhysics.hh"
#include "G4HadronPhysicsFTFP_BERT.hh"
#include "CMSHadronPhysicsFTFP_BERT.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -46,7 +47,7 @@ FTFPCMS_BERT_EMM::FTFPCMS_BERT_EMM(G4int ver) {
<< "FTFP_BERT_EMM " << G4endl;
// EM Physics
RegisterPhysics(new CMSEmStandardPhysicsHcal(ver));
RegisterPhysics(new G4EmStandardPhysics(ver));
// Synchroton Radiation & GN Physics
RegisterPhysics(new G4EmExtraPhysics(ver));
@@ -57,7 +58,8 @@ FTFPCMS_BERT_EMM::FTFPCMS_BERT_EMM(G4int ver) {
// Hadron Elastic scattering
RegisterPhysics(new G4HadronElasticPhysics(ver));
RegisterPhysics(new G4HadronPhysicsFTFP_BERT(ver));
// Hadron Inelastic physics
RegisterPhysics(new CMSHadronPhysicsFTFP_BERT(ver));
// Stopping Physics
RegisterPhysics(new G4StoppingPhysics(ver));
examples/advanced/HGCal_testbeam/src/SiPMHit.cc
+4 -4
View File
@@ -40,7 +40,7 @@ void SiPMHit::Digitise(const G4double aTimeWindow,
const G4double aToaThreshold) {
// process energy deposits
if (fEdep.size() == 0) {
if (fEdep.empty()) {
fIsValidHit = false;
return;
}
@@ -53,7 +53,7 @@ void SiPMHit::Digitise(const G4double aTimeWindow,
G4double firstHitTime = fEdep[0].second;
fEdepDigi = 0;
for (size_t i = 0; i < fEdep.size(); i++) {
for (size_t i = 0; i < fEdep.size(); ++i) {
if (aTimeWindow < 0 || fEdep[i].second < firstHitTime + aTimeWindow)
fEdepDigi += fEdep[i].first;
#ifdef DEBUG
@@ -68,7 +68,7 @@ void SiPMHit::Digitise(const G4double aTimeWindow,
fIsValidHit = (fEdepDigi > 0);
// non ionizing part, does not contribute to TOAs
if (fEdepNonIonizing.size() == 0)
if (fEdepNonIonizing.empty())
return;
std::sort(fEdepNonIonizing.begin(), fEdepNonIonizing.end(),
@@ -78,7 +78,7 @@ void SiPMHit::Digitise(const G4double aTimeWindow,
});
fEdepNonIonizingDigi = 0;
for (size_t i = 0; i < fEdep.size(); i++) {
for (size_t i = 0; i < fEdepNonIonizing.size(); ++i) {
if (aTimeWindow == -1 ||
fEdepNonIonizing[i].second < firstHitTime + aTimeWindow)
fEdepNonIonizingDigi += fEdepNonIonizing[i].first;
examples/advanced/HGCal_testbeam/src/SiliconPixelHit.cc
+4 -4
View File
@@ -47,7 +47,7 @@ void SiliconPixelHit::Digitise(const G4double aTimeWindow,
const G4double aToaThreshold) {
// process energy deposits
if (fEdep.size() == 0) {
if (fEdep.empty()) {
fIsValidHit = false;
return;
}
@@ -60,7 +60,7 @@ void SiliconPixelHit::Digitise(const G4double aTimeWindow,
G4double firstHitTime = fEdep[0].second;
fEdepDigi = 0;
for (size_t i = 0; i < fEdep.size(); i++) {
for (size_t i = 0; i < fEdep.size(); ++i) {
if (aTimeWindow < 0 || fEdep[i].second < firstHitTime + aTimeWindow)
fEdepDigi += fEdep[i].first;
if (fEdepDigi > aToaThreshold) {
@@ -72,7 +72,7 @@ void SiliconPixelHit::Digitise(const G4double aTimeWindow,
fIsValidHit = (fEdepDigi > 0);
// non ionizing part, does not contribute to TOAs
if (fEdepNonIonizing.size() == 0)
if (fEdepNonIonizing.empty())
return;
std::sort(fEdepNonIonizing.begin(), fEdepNonIonizing.end(),
@@ -82,7 +82,7 @@ void SiliconPixelHit::Digitise(const G4double aTimeWindow,
});
fEdepNonIonizingDigi = 0;
for (size_t i = 0; i < fEdep.size(); i++) {
for (size_t i = 0; i < fEdepNonIonizing.size(); ++i) {
if (aTimeWindow == -1 ||
fEdepNonIonizing[i].second < firstHitTime + aTimeWindow)
fEdepNonIonizingDigi += fEdepNonIonizing[i].first;