loadGeometry should fully rely on NameConf::getGeomFileName(..)

shahor02 · shahor02 · commit eb745f79e892 · 2020-04-08T16:34:28.000+02:00
diff --git a/Detectors/Base/include/DetectorsBase/GeometryManager.h b/Detectors/Base/include/DetectorsBase/GeometryManager.h
@@ -48,7 +48,7 @@ class GeometryManager : public TObject
 {
  public:
   ///< load geometry from file
-  static void loadGeometry(std::string_view geomFileName = "");
+  static void loadGeometry(std::string_view geomFilePath = "");
 
   ///< Get the global transformation matrix (ideal geometry) for a given alignable volume
   ///< The alignable volume is identified by 'symname' which has to be either a valid symbolic
diff --git a/Detectors/Base/src/GeometryManager.cxx b/Detectors/Base/src/GeometryManager.cxx
@@ -445,11 +445,11 @@ o2::base::MatBudget GeometryManager::meanMaterialBudget(float x0, float y0, floa
 void GeometryManager::loadGeometry(std::string_view geomFileName)
 {
   ///< load geometry from file
-  std::string fname = geomFileName.empty() ? o2::base::NameConf::getGeomFileName() : std::string(geomFileName);
+  std::string fname = o2::base::NameConf::getGeomFileName(geomFileName);
   LOG(INFO) << "Loading geometry " << o2::base::NameConf::GEOMOBJECTNAME << " from " << fname;
   TFile flGeom(fname.data());
   if (flGeom.IsZombie()) {
-    LOG(FATAL) << "Failed to open file " << geomFileName;
+    LOG(FATAL) << "Failed to open file " << fname;
   }
   if (!flGeom.Get(std::string(o2::base::NameConf::GEOMOBJECTNAME).c_str())) {
     LOG(FATAL) << "Did not find geometry named " << o2::base::NameConf::GEOMOBJECTNAME;
diff --git a/Detectors/Base/test/buildMatBudLUT.C b/Detectors/Base/test/buildMatBudLUT.C
@@ -45,13 +45,12 @@ void configLayers();
 
 bool buildMatBudLUT(int nTst, int maxLr, std::string outName, std::string outFile, std::string geomNameInput)
 {
-  auto geomName = geomNameInput.empty() ? o2::base::NameConf::getGeomFileName() : geomNameInput;
+  auto geomName = o2::base::NameConf::getGeomFileName(geomNameInput);
   if (gSystem->AccessPathName(geomName.c_str())) { // if needed, create geometry
     std::cout << geomName << " does not exist. Will create it\n";
     gSystem->Exec("$O2_ROOT/bin/o2-sim -n 0");
-    geomName = o2::base::NameConf::getGeomFileName();
   }
-  o2::base::GeometryManager::loadGeometry(geomName);
+  o2::base::GeometryManager::loadGeometry(geomNameInput);
   configLayers();
 
   if (maxLr < 1) {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class GeometryManager : public TObject`
`48`	`48`	`{`
`49`	`49`	`public:`
`50`	`50`	`///< load geometry from file`
`51`		`- static void loadGeometry(std::string_view geomFileName = "");`
	`51`	`+ static void loadGeometry(std::string_view geomFilePath = "");`
`52`	`52`
`53`	`53`	`///< Get the global transformation matrix (ideal geometry) for a given alignable volume`
`54`	`54`	`///< The alignable volume is identified by 'symname' which has to be either a valid symbolic`
Original file line number	Diff line number	Diff line change
`@@ -445,11 +445,11 @@ o2::base::MatBudget GeometryManager::meanMaterialBudget(float x0, float y0, floa`
`445`	`445`	`void GeometryManager::loadGeometry(std::string_view geomFileName)`
`446`	`446`	`{`
`447`	`447`	`///< load geometry from file`
`448`		`- std::string fname = geomFileName.empty() ? o2::base::NameConf::getGeomFileName() : std::string(geomFileName);`
	`448`	`+ std::string fname = o2::base::NameConf::getGeomFileName(geomFileName);`
`449`	`449`	`LOG(INFO) << "Loading geometry " << o2::base::NameConf::GEOMOBJECTNAME << " from " << fname;`
`450`	`450`	`TFile flGeom(fname.data());`
`451`	`451`	`if (flGeom.IsZombie()) {`
`452`		`- LOG(FATAL) << "Failed to open file " << geomFileName;`
	`452`	`+ LOG(FATAL) << "Failed to open file " << fname;`
`453`	`453`	`}`
`454`	`454`	`if (!flGeom.Get(std::string(o2::base::NameConf::GEOMOBJECTNAME).c_str())) {`
`455`	`455`	`LOG(FATAL) << "Did not find geometry named " << o2::base::NameConf::GEOMOBJECTNAME;`
Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,12 @@ void configLayers();`
`45`	`45`
`46`	`46`	`bool buildMatBudLUT(int nTst, int maxLr, std::string outName, std::string outFile, std::string geomNameInput)`
`47`	`47`	`{`
`48`		`- auto geomName = geomNameInput.empty() ? o2::base::NameConf::getGeomFileName() : geomNameInput;`
	`48`	`+ auto geomName = o2::base::NameConf::getGeomFileName(geomNameInput);`
`49`	`49`	`if (gSystem->AccessPathName(geomName.c_str())) { // if needed, create geometry`
`50`	`50`	`std::cout << geomName << " does not exist. Will create it\n";`
`51`	`51`	`gSystem->Exec("$O2_ROOT/bin/o2-sim -n 0");`
`52`		`- geomName = o2::base::NameConf::getGeomFileName();`
`53`	`52`	`}`
`54`		`- o2::base::GeometryManager::loadGeometry(geomName);`
	`53`	`+ o2::base::GeometryManager::loadGeometry(geomNameInput);`
`55`	`54`	`configLayers();`
`56`	`55`
`57`	`56`	`if (maxLr < 1) {`