diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.cxx b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.cxx index 5e360577cedf7d48bcd86b7ab4ee1f4784a33428..23711b4ea8a99e792447980ff9a1c1bf38158f94 100644 --- a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.cxx +++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.cxx @@ -465,9 +465,9 @@ void SCT_SurfaceChargesGenerator::processSiHit(const SiDetectorElement* element, const double stripPitch{0.080}; // mm double dstrip{y1 / stripPitch}; // mm if (dstrip > 0.) { - dstrip -= static_cast<double>(static_cast<int>(dstrip)); + dstrip = dstrip - std::trunc(dstrip); } else { - dstrip -= static_cast<double>(static_cast<int>(dstrip)) + 1; + dstrip = dstrip - std::trunc(dstrip) + 1; } // now y will be x and z will be y ....just to make sure to confuse everebody diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.h b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.h index 9510fc80b29c4f616a061e8aa04787fe7b86a19c..20d1288a2918d385dbae16a24ab767665b7afa37 100644 --- a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.h +++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.h @@ -120,7 +120,7 @@ class SCT_SurfaceChargesGenerator : public extends<AthAlgTool, ISCT_SurfaceCharg FloatProperty m_tsubtract{this, "SubtractTime", -999., "subtract drift time from mid gap"}; BooleanProperty m_doDistortions{this, "doDistortions", false, "Simulation of module distortions"}; - BooleanProperty m_useSiCondDB{this, "UseSiCondDB", false, "Usage of SiConditions DB values can be disabled to use setable ones"}; + BooleanProperty m_useSiCondDB{this, "UseSiCondDB", true, "Usage of SiConditions DB values can be disabled to use setable ones"}; FloatProperty m_vdepl{this, "DepletionVoltage", 70., "depletion voltage, default 70V"}; FloatProperty m_vbias{this, "BiasVoltage", 150., "bias voltage, default 150V"}; BooleanProperty m_doTrapping{this, "doTrapping", false, "Flag to set Charge Trapping"}; diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py index 58d9885cf531850942357af52947ae5bfff992a4..786863b43a86cfb27e575155fb470ccc9d4ac0e1 100644 --- a/Tools/PROCTools/python/RunTier0TestsTools.py +++ b/Tools/PROCTools/python/RunTier0TestsTools.py @@ -34,7 +34,7 @@ ciRefFileMap = { 'overlay-d1592-22.0' : 'v1', 'overlay-bkg-21.0' : 'v1', 'overlay-bkg-22.0' : 'v4', - 'dataoverlay-d1590-22.0' : 'v2', + 'dataoverlay-d1590-22.0' : 'v3', 'dataoverlay-hits-22.0' : 'v1', }