diff --git a/DDDigi/README.md b/DDDigi/README.md index a0678f1969d1e5409dd21b989598d25cf32b542a..cb0f0f6b8730b922ea4f5ceefdcffdb56563fa21 100644 --- a/DDDigi/README.md +++ b/DDDigi/README.md @@ -72,14 +72,14 @@ energy deposits of the simulation. Deposit attenuator for energy deposits according to decay time constant. <br/> Properties: <br/> - |**Property** |**Data type** |**Description** | - |:--- |:--- |:--- | - |`.input` | vector<string> | List of input files to be processed | - |`.attenuate_history`| boolean | Propagate the weight also to the history entries. default: true | - |`.processor_type`| string | Processor type used for single container attenuation default: `DigiAttenuator` | - |`.containers` | vector<string> | List of containers to be attenuated. | - |`.signal_decay`| string | Decay function. default: `exponential` | - |`.t0` | double | Time constant for exponential signal decay. | + |**Property** |**Data type** |**Description** | + |:--- |:--- |:--- | + |`.input` | vector<string> | List of input files to be processed | + |`.processor_type`| string | Processor type used for single container attenuation. | + | | | default: `DigiAttenuator` | + |`.containers` | vector<string> | List of containers to be attenuated. | + |`.signal_decay` | string | Decay function. default: `exponential` | + |`.t0` | double | Time constant for exponential signal decay. | diff --git a/DDDigi/include/DDDigi/DigiAttenuator.h b/DDDigi/include/DDDigi/DigiAttenuator.h index f492d48b49e0184c7e602164e6e46c4428b1aef4..a5d85b88689e16b1ef083d3201581d008a43abc4 100644 --- a/DDDigi/include/DDDigi/DigiAttenuator.h +++ b/DDDigi/include/DDDigi/DigiAttenuator.h @@ -87,10 +87,6 @@ namespace dd4hep { std::map<std::string, double> m_container_attenuation { }; /// Property: T0 with respect to central crossing double m_t0 { 0e0 }; - /// Property: Flag to act on hit input data - bool m_attenuate_data { true }; - /// Property: Flag to act on history objects as well - bool m_attenuate_history { true }; protected: /// Define standard assignments and constructors diff --git a/DDDigi/src/DigiAttenuator.cpp b/DDDigi/src/DigiAttenuator.cpp index ecd09d0a3f9c82634bc2bda9553a57308759047b..1d63f324e54388dcbff2a74209486ae531b06e98 100644 --- a/DDDigi/src/DigiAttenuator.cpp +++ b/DDDigi/src/DigiAttenuator.cpp @@ -48,8 +48,6 @@ DigiAttenuator::attenuate(T& cont, const predicate_t& predicate) const { for( auto& dep : cont ) { if ( predicate(dep) ) { dep.second.deposit *= m_factor; - if ( !m_attenuate_history ) - continue; auto& e = dep.second.history; for( auto& h : e.hits ) h.weight *= m_factor; for( auto& h : e.particles ) h.weight *= m_factor; @@ -88,7 +86,6 @@ void DigiAttenuator::execute(DigiContext& context, work_t& work, const predicate DigiAttenuatorSequence::DigiAttenuatorSequence(const DigiKernel& krnl, const std::string& nam) : DigiContainerSequenceAction(krnl, nam) { - declareProperty("attenuate_history", m_attenuate_history); declareProperty("processor_type", m_processor_type = "DigiAttenuator"); declareProperty("containers", m_container_attenuation); declareProperty("signal_decay", m_signal_decay = "exponential");