Skip to content
Snippets Groups Projects
Commit 2dbf5f0b authored by Markus Frank's avatar Markus Frank Committed by MarkusFrankATcernch
Browse files

Fix compilation errors

parent a9b388a9
No related branches found
No related tags found
No related merge requests found
...@@ -52,7 +52,7 @@ namespace dd4hep { ...@@ -52,7 +52,7 @@ namespace dd4hep {
// typedef std::vector<std::pair<std::string, double> > ParticleConfig; // typedef std::vector<std::pair<std::string, double> > ParticleConfig;
typedef std::map<const G4ParticleDefinition*, double> ParticleCut; typedef std::map<const G4ParticleDefinition*, double> ParticleCut;
typedef std::map<std::string, std::string> ParticleConfig; typedef std::map<std::string, std::string> ParticleConfig;
typedef std::unique_ptr<Geant4ShowerModelWrapper> Wrapper; typedef Geant4ShowerModelWrapper* Wrapper;
/// Property: Region name to which this parametrization should be applied /// Property: Region name to which this parametrization should be applied
std::string m_regionName { "Region-name-not-specified"}; std::string m_regionName { "Region-name-not-specified"};
...@@ -78,7 +78,7 @@ namespace dd4hep { ...@@ -78,7 +78,7 @@ namespace dd4hep {
/// Reference to the G4 fast simulation model /// Reference to the G4 fast simulation model
G4VFastSimulationModel* m_model { nullptr }; G4VFastSimulationModel* m_model { nullptr };
/// Reference to the shower model /// Reference to the shower model
Wrapper m_wrapper { }; Wrapper m_wrapper { nullptr };
protected: protected:
/// Define standard assignments and constructors /// Define standard assignments and constructors
......
...@@ -99,13 +99,13 @@ Geant4FastSimShowerModel::Geant4FastSimShowerModel(Geant4Context* ctxt, const st ...@@ -99,13 +99,13 @@ Geant4FastSimShowerModel::Geant4FastSimShowerModel(Geant4Context* ctxt, const st
this->declareProperty("Emax", this->m_eMax); this->declareProperty("Emax", this->m_eMax);
this->declareProperty("Ekill", this->m_eKill); this->declareProperty("Ekill", this->m_eKill);
this->declareProperty("Etrigger", this->m_eTriggerNames); this->declareProperty("Etrigger", this->m_eTriggerNames);
this->m_wrapper.reset(new Geant4ShowerModelWrapper(this)); this->m_wrapper= new Geant4ShowerModelWrapper(this);
} }
/// Default destructor /// Default destructor
Geant4FastSimShowerModel::~Geant4FastSimShowerModel() { Geant4FastSimShowerModel::~Geant4FastSimShowerModel() {
detail::deletePtr(m_model); detail::deletePtr(m_model);
m_wrapper.reset(); detail::deletePtr(m_wrapper);
} }
/// Access particle definition from string /// Access particle definition from string
...@@ -163,7 +163,7 @@ void Geant4FastSimShowerModel::addShowerModel(G4Region* region) { ...@@ -163,7 +163,7 @@ void Geant4FastSimShowerModel::addShowerModel(G4Region* region) {
if ( m_model ) if ( m_model )
fastsimManager->AddFastSimulationModel(m_model); fastsimManager->AddFastSimulationModel(m_model);
else if ( m_wrapper ) else if ( m_wrapper )
fastsimManager->AddFastSimulationModel(m_wrapper.get()); fastsimManager->AddFastSimulationModel(m_wrapper);
else else
except("Geant4FastSimShowerModel::addShowerModel: Invalid shower model reference!"); except("Geant4FastSimShowerModel::addShowerModel: Invalid shower model reference!");
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment