Fix for merging from previous PR

scannito · scannito · commit e470025365c7 · 2025-10-28T17:36:55.000+01:00
diff --git a/Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx b/Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx
@@ -492,16 +492,11 @@ void GeometryTGeo::fillMatrixCache(int mask)
 //__________________________________________________________________________
 
 #ifdef ENABLE_UPGRADES
-const char* GeometryTGeo::composeSymNameLayer(int d, int lr)
-{
-  return Form("%s_%d", o2::detectors::DetID(o2::detectors::DetID::TRK).getName(), d);
-}
-#endif
-
 const char* GeometryTGeo::composeSymNameLayer(int d, int layer)
 {
   return Form("%s/%s%d", composeSymNameTRK(d), getTRKLayerPattern(), layer);
 }
+#endif
 
 const char* GeometryTGeo::composeSymNameStave(int d, int layer)
 {

Original file line number	Diff line number	Diff line change
`@@ -492,16 +492,11 @@ void GeometryTGeo::fillMatrixCache(int mask)`
`492`	`492`	`//__________________________________________________________________________`
`493`	`493`
`494`	`494`	`#ifdef ENABLE_UPGRADES`
`495`		`-const char* GeometryTGeo::composeSymNameLayer(int d, int lr)`
`496`		`-{`
`497`		`- return Form("%s_%d", o2::detectors::DetID(o2::detectors::DetID::TRK).getName(), d);`
`498`		`-}`
`499`		`-#endif`
`500`		`-`
`501`	`495`	`const char* GeometryTGeo::composeSymNameLayer(int d, int layer)`
`502`	`496`	`{`
`503`	`497`	`return Form("%s/%s%d", composeSymNameTRK(d), getTRKLayerPattern(), layer);`
`504`	`498`	`}`
	`499`	`+#endif`
`505`	`500`
`506`	`501`	`const char* GeometryTGeo::composeSymNameStave(int d, int layer)`
`507`	`502`	`{`