From bbaaf85064757e2b4be4fc2a731d74ea5302b6fe Mon Sep 17 00:00:00 2001 From: Yuri Fisyak Date: Sat, 31 Aug 2024 20:04:15 -0400 Subject: [PATCH] remove ifdef StiTpcHitErrorMDF4_h --- StRoot/StiTpc/StiTpcDetectorBuilder.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/StRoot/StiTpc/StiTpcDetectorBuilder.cxx b/StRoot/StiTpc/StiTpcDetectorBuilder.cxx index 3468ee47947..94969ec11c7 100644 --- a/StRoot/StiTpc/StiTpcDetectorBuilder.cxx +++ b/StRoot/StiTpc/StiTpcDetectorBuilder.cxx @@ -237,15 +237,15 @@ StiDetector* StiTpcDetectorBuilder::constructTpcPadrowDetector(StiLayer stiLayer pDetector->setShape(pShape); pDetector->setPlacement(pPlacement); - if (tpc_padrow_id <= nInnerPadrows) { -#ifdef StiTpcHitErrorMDF4_h - pDetector->setHitErrorCalculatorMDF4(StiTpcInnerHitErrorMDF4::instance()); -#endif - pDetector->setHitErrorCalculator(StiTpcInnerHitErrorCalculator::instance()); + if (row <= nInnerPadrows) { + if (StTpcDb::Alignment2024()) { + pDetector->setHitErrorCalculatorMDF4(StiTpcInnerHitErrorMDF4::instance()); + } + pDetector->setHitErrorCalculator(StiTPCHitErrorCalculator::instance()); } else { -#ifdef StiTpcHitErrorMDF4_h - pDetector->setHitErrorCalculatorMDF4(StiTpcOuterHitErrorMDF4::instance()); -#endif + if (StTpcDb::Alignment2024()) { + pDetector->setHitErrorCalculatorMDF4(StiTpcOuterHitErrorMDF4::instance()); + } pDetector->setHitErrorCalculator(StiTpcOuterHitErrorCalculator::instance()); } pDetector->setKey(1,stiLayer.sti_padrow_id);