Merge branch 'master-ATEAM-638' into 'master'

Define m_smallStepLength/SmallStepLength with unit to fix ATEAM-638

Closes ATEAM-638

See merge request atlas/athena!35364

InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfig.py

 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon import CfgMgr
+import AthenaCommon.SystemOfUnits as Units
 # The earliest bunch crossing time for which interactions will be sent
 # to the SCT Digitization code.
 def SCT_FirstXing():
@@ -56,9 +57,9 @@ def getSCT_SurfaceChargesGenerator(name="SCT_SurfaceChargesGenerator", **kwargs)
 
     kwargs.setdefault("FixedTime", -999)
     kwargs.setdefault("SubtractTime", -999)
-    kwargs.setdefault("SurfaceDriftTime", 10)
+    kwargs.setdefault("SurfaceDriftTime", 10*Units.ns)
     kwargs.setdefault("NumberOfCharges", 1)
-    kwargs.setdefault("SmallStepLength", 5)
+    kwargs.setdefault("SmallStepLength", 5*Units.micrometer)
     kwargs.setdefault("DepletionVoltage", 70)
     kwargs.setdefault("BiasVoltage", 150)
     kwargs.setdefault("SiPropertiesTool", sct_SiPropertiesToolSetup.getTool())

InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfigNew.py

@@ -15,6 +15,7 @@ from SiLorentzAngleTool.SCT_LorentzAngleConfig import SCT_LorentzAngleCfg
 from Digitization.TruthDigitizationOutputConfig import TruthDigitizationOutputCfg
 from Digitization.PileUpToolsConfig import PileUpToolsCfg
 
+import AthenaCommon.SystemOfUnits as Units
 
 # The earliest and last bunch crossing times for which interactions will be sent
 # to the SCT Digitization code
@@ -133,9 +134,9 @@ def SCT_SurfaceChargesGeneratorCfg(flags, name="SCT_SurfaceChargesGenerator", **
     acc = ComponentAccumulator()
     kwargs.setdefault("FixedTime", -999)
     kwargs.setdefault("SubtractTime", -999)
-    kwargs.setdefault("SurfaceDriftTime", 10)
+    kwargs.setdefault("SurfaceDriftTime", 10*Units.ns)
     kwargs.setdefault("NumberOfCharges", 1)
-    kwargs.setdefault("SmallStepLength", 5)
+    kwargs.setdefault("SmallStepLength", 5*Units.micrometer)
     kwargs.setdefault("DepletionVoltage", 70)
     kwargs.setdefault("BiasVoltage", 150)
     kwargs.setdefault("isOverlay", flags.Detector.Overlay)

InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.cxx

@@ -22,7 +22,6 @@
 #include "CLHEP/Geometry/Point3D.h"
 #include "CLHEP/Random/RandomEngine.h"
 #include "CLHEP/Random/RandGaussZiggurat.h"
-#include "CLHEP/Units/SystemOfUnits.h"
 
 // C++ Standard Library
 #include <cmath>
@@ -130,9 +129,6 @@ StatusCode SCT_SurfaceChargesGenerator::initialize() {
   }
   ///////////////////////////////////////////////////
 
-  m_smallStepLength.setValue(m_smallStepLength.value() * CLHEP::micrometer);
-  m_tSurfaceDrift.setValue(m_tSurfaceDrift.value() * CLHEP::ns);
-
   // Surface drift time calculation Stuff
   m_tHalfwayDrift = m_tSurfaceDrift * 0.5;
   m_distHalfInterStrip = m_distInterStrip * 0.5;

InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.h

@@ -48,6 +48,9 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 
+// CLHEP
+#include "CLHEP/Units/SystemOfUnits.h"
+
 #include <iostream>
 
 // Charges and hits
@@ -104,10 +107,10 @@ class SCT_SurfaceChargesGenerator : public extends<AthAlgTool, ISCT_SurfaceCharg
   bool chargeIsTrapped(double spess, const InDetDD::SiDetectorElement* element, double& trap_pos, double& drift_time) const;
 
   IntegerProperty m_numberOfCharges{this, "NumberOfCharges", 1, "number of charges"};
-  FloatProperty m_smallStepLength{this, "SmallStepLength", 5, "max internal step along the larger G4 step"};
+  FloatProperty m_smallStepLength{this, "SmallStepLength", 5 * CLHEP::micrometer, "max internal step along the larger G4 step"};
 
   /** related to the surface drift */
-  FloatProperty m_tSurfaceDrift{this, "SurfaceDriftTime", 10, "max surface drift time"};
+  FloatProperty m_tSurfaceDrift{this, "SurfaceDriftTime", 10 * CLHEP::ns, "max surface drift time"};
 
   FloatProperty m_tfix{this, "FixedTime", -999., "fixed time"};
   FloatProperty m_tsubtract{this, "SubtractTime", -999., "subtract drift time from mid gap"};