diff --git a/DDDigi/include/DDDigi/DigiContainerProcessor.h b/DDDigi/include/DDDigi/DigiContainerProcessor.h
index a414ebbe7768182b8190d235caf84cb5112e5987..6ac2044b4e09a7777a2b466630b9aad75eba2912 100644
--- a/DDDigi/include/DDDigi/DigiContainerProcessor.h
+++ b/DDDigi/include/DDDigi/DigiContainerProcessor.h
@@ -116,11 +116,10 @@ namespace dd4hep {
protected:
/// Property to steer parallel processing
bool m_parallel { false };
-
- /// Lock for output merging
- mutable std::mutex m_output_lock;
/// Array of sub-workers
workers_t m_workers;
+ /// Lock for output merging
+ mutable std::mutex m_output_lock;
protected:
/// Define standard assignments and constructors
diff --git a/examples/DDDigi/scripts/DigiTest.py b/examples/DDDigi/scripts/DigiTest.py
index a3ecf0c81e204bf5909c5bde4a0e3523c645c9e8..798594a98e6e4094bbad3124be21af8a27bcfae5 100644
--- a/examples/DDDigi/scripts/DigiTest.py
+++ b/examples/DDDigi/scripts/DigiTest.py
@@ -10,27 +10,28 @@
# ==========================================================================
from __future__ import absolute_import
import os
+import dd4hep
import dddigi
import logging
-from g4units import ns
+from dd4hep import units
logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO)
logger = logging.getLogger(__name__)
-attenuation = {'SiVertexEndcapHits': 50 * ns,
- 'SiVertexBarrelHits': 50 * ns,
- 'SiTrackerForwardHits': 50 * ns,
- 'SiTrackerEndcapHits': 50 * ns,
- 'SiTrackerBarrelHits': 50 * ns,
- 'HcalPlugHits': 50 * ns,
- 'HcalEndcapHits': 50 * ns,
- 'HcalBarrelHits': 50 * ns,
- 'EcalBarrelHits': 50 * ns,
- 'EcalEndcapHits': 50 * ns,
- 'MuonEndcapHits': 50 * ns,
- 'MuonBarrelHits': 50 * ns,
- 'BeamCalHits': 50 * ns,
- 'LumiCalHits': 50 * ns,
+attenuation = {'SiVertexEndcapHits': 50 * units.ns,
+ 'SiVertexBarrelHits': 50 * units.ns,
+ 'SiTrackerForwardHits': 50 * units.ns,
+ 'SiTrackerEndcapHits': 50 * units.ns,
+ 'SiTrackerBarrelHits': 50 * units.ns,
+ 'HcalPlugHits': 50 * units.ns,
+ 'HcalEndcapHits': 50 * units.ns,
+ 'HcalBarrelHits': 50 * units.ns,
+ 'EcalBarrelHits': 50 * units.ns,
+ 'EcalEndcapHits': 50 * units.ns,
+ 'MuonEndcapHits': 50 * units.ns,
+ 'MuonBarrelHits': 50 * units.ns,
+ 'BeamCalHits': 50 * units.ns,
+ 'LumiCalHits': 50 * units.ns,
}
@@ -77,7 +78,7 @@ class Test(dddigi.Digitize):
</plugins>"""))
self.volumeManager = self.description.volumeManager()
if self.volumeManager.isValid():
- self.info('+++ Successfully created DD4hep VolumeManager')
+ self.info('+++ Successfully created DD4hep VolumeManager')
return self
def data_containers(self):
diff --git a/examples/DDDigi/scripts/TestDepositSmearEnergy.py b/examples/DDDigi/scripts/TestDepositSmearEnergy.py
index ff925982e86e0efd3bd9fb5cc62acf95324259ae..cb375d6f623028628acef0d920c6954cbbc788fa 100644
--- a/examples/DDDigi/scripts/TestDepositSmearEnergy.py
+++ b/examples/DDDigi/scripts/TestDepositSmearEnergy.py
@@ -29,13 +29,13 @@ def run():
# sigma(E)[GeV]/E[GeV] = 0.02 (systematic) + 0.005 / sqrt(E[GeV]) (intrinsic) + 1keV/E[GeV] (instrumentation)
# sigma(E)[GeV] = 0.02*E[GeV] (systematic) + 0.005 * sqrt(E[GeV]) (intrinsic) + 1keV (instrumentation)
smear.intrinsic_fluctuation = 0.005 / math.sqrt(units.GeV)
- smear.systematic_resolution = 0.02 / units.GeV
+ smear.systematic_resolution = 0.02 / units.GeV
smear.instrumentation_resolution = 1 * units.keV
smear.pair_ionisation_energy = 10 * units.eV
smear.ionization_fluctuation = True
smear.update_in_place = False
# proc.adopt_container_processor(smear, conts)
- proc.adopt_container_processor(smear, ['EcalBarrelHits','EcalEndcapHits','HcalBarrelHits'])
+ proc.adopt_container_processor(smear, ['EcalBarrelHits', 'EcalEndcapHits', 'HcalBarrelHits'])
event.adopt_action('DigiStoreDump/HeaderDump')
# ========================================================================================================
diff --git a/examples/DDDigi/scripts/TestPositionSmearResolution.py b/examples/DDDigi/scripts/TestPositionSmearResolution.py
index 63df6d078c3df775dc1b85ae250c656ad3268ce2..93062b1608635e573dec2f26427904f4f6472c6e 100644
--- a/examples/DDDigi/scripts/TestPositionSmearResolution.py
+++ b/examples/DDDigi/scripts/TestPositionSmearResolution.py
@@ -12,7 +12,6 @@ from __future__ import absolute_import
def run():
- import math
import DigiTest
from dd4hep import units
digi = DigiTest.Test(geometry=None)
@@ -25,11 +24,11 @@ def run():
input_mask=0xEEE5,
input_segment='deposits')
smear = digi.create_action('DigiDepositSmearPositionResolution/Smear',
- deposit_cutoff = 1e-55 * units.MeV,
+ deposit_cutoff=1e-55 * units.MeV,
resolution_u=1e-2 * units.mm,
resolution_v=1e-2 * units.mm)
- proc.adopt_container_processor(smear, ['SiVertexEndcapHits','SiVertexBarrelHits',
- 'SiTrackerEndcapHits','SiTrackerBarrelHits',
+ proc.adopt_container_processor(smear, ['SiVertexEndcapHits', 'SiVertexBarrelHits',
+ 'SiTrackerEndcapHits', 'SiTrackerBarrelHits',
'SiTrackerForwardHits'])
event.adopt_action('DigiStoreDump/HeaderDump')
diff --git a/examples/DDDigi/scripts/TestPositionSmearTrack.py b/examples/DDDigi/scripts/TestPositionSmearTrack.py
index 7054e0056c93a459ff658b144e2596e5495194c9..4b5a0b3d33f57acb615cd33b3fb9a81d12e8d1d7 100644
--- a/examples/DDDigi/scripts/TestPositionSmearTrack.py
+++ b/examples/DDDigi/scripts/TestPositionSmearTrack.py
@@ -12,7 +12,6 @@ from __future__ import absolute_import
def run():
- import math
import DigiTest
from dd4hep import units
digi = DigiTest.Test(geometry=None)
@@ -25,11 +24,11 @@ def run():
input_mask=0xEEE5,
input_segment='deposits')
smear = digi.create_action('DigiDepositSmearPositionTrack/Smear',
- deposit_cutoff = 1e-55 * units.MeV,
+ deposit_cutoff=1e-55 * units.MeV,
resolution_u=1e-2 * units.mm,
resolution_v=1e-2 * units.mm)
- proc.adopt_container_processor(smear, ['SiVertexEndcapHits','SiVertexBarrelHits',
- 'SiTrackerEndcapHits','SiTrackerBarrelHits',
+ proc.adopt_container_processor(smear, ['SiVertexEndcapHits', 'SiVertexBarrelHits',
+ 'SiTrackerEndcapHits', 'SiTrackerBarrelHits',
'SiTrackerForwardHits'])
event.adopt_action('DigiStoreDump/HeaderDump')