From f5fb5d593b2a51adbc0dd7e9301c88fd0bc0c153 Mon Sep 17 00:00:00 2001
From: Zachary Louis Marshall <zach.marshall@cern.ch>
Date: Wed, 1 Jun 2016 13:37:26 +0200
Subject: [PATCH] Moving to G410 interface for fluctuation model
(Monopole-00-04-02)
* src/G4mplAtlasIonisationModel.hh: Moving to G410 interface
* Tagging: Monopole-00-04-02
Former-commit-id: efb92f78d3fa2641f5b89b140ca188b4716d1d1e
---
.../Monopole/src/G4mplAtlasIonisationModel.hh | 34 +++++++------------
1 file changed, 13 insertions(+), 21 deletions(-)
diff --git a/Simulation/G4Extensions/Monopole/src/G4mplAtlasIonisationModel.hh b/Simulation/G4Extensions/Monopole/src/G4mplAtlasIonisationModel.hh
index f4b428dd596..7f8f088a1f8 100644
--- a/Simulation/G4Extensions/Monopole/src/G4mplAtlasIonisationModel.hh
+++ b/Simulation/G4Extensions/Monopole/src/G4mplAtlasIonisationModel.hh
@@ -66,47 +66,39 @@ public:
virtual ~G4mplAtlasIonisationModel();
- virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
+ virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&) override final;
virtual G4double ComputeDEDXPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
- G4double cutEnergy);
+ G4double cutEnergy) override final;
virtual void SampleSecondaries( std::vector<G4DynamicParticle*>* ,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
- G4double maxEnergy);
+ G4double maxEnergy) override final;
-#if G4VERSION_NUMBER > 1009
virtual G4double SampleFluctuations(const G4MaterialCutsCouple* material,
const G4DynamicParticle* dp,
G4double tmax,
G4double length,
- G4double meanLoss);
-#else
- virtual G4double SampleFluctuations(const G4Material*,
+ G4double meanLoss) override final;
+
+ virtual G4double Dispersion( const G4Material*,
const G4DynamicParticle*,
- G4double& tmax,
- G4double& length,
- G4double& meanLoss);
-#endif
+ G4double tmax,
+ G4double length) override final;
- virtual G4double Dispersion(const G4Material*,
- const G4DynamicParticle*,
- G4double& tmax,
- G4double& length);
+ // hide assignment operator and copy constructor
+ G4mplAtlasIonisationModel & operator=(const G4mplAtlasIonisationModel &right) = delete;
+ G4mplAtlasIonisationModel(const G4mplAtlasIonisationModel&) = delete;
private:
void SetParticle(const G4ParticleDefinition* p);
- // hide assignment operator
- G4mplAtlasIonisationModel & operator=(const G4mplAtlasIonisationModel &right);
- G4mplAtlasIonisationModel(const G4mplAtlasIonisationModel&);
-
const G4ParticleDefinition* monopole;
G4ParticleChangeForLoss* fParticleChange;
@@ -136,8 +128,8 @@ inline void G4mplAtlasIonisationModel::SampleSecondaries(
inline G4double G4mplAtlasIonisationModel::Dispersion(
const G4Material* material,
const G4DynamicParticle* dp,
- G4double& tmax,
- G4double& length)
+ G4double tmax,
+ G4double length)
{
G4double siga = 0.0;
G4double tau = dp->GetKineticEnergy()/mass;
--
GitLab