getGeomFileName treats prefix as filename if such file exists

shahor02 · shahor02 · commit 8659b1ae4202 · 2020-04-08T16:34:28.000+02:00
diff --git a/DataFormats/Detectors/Common/src/NameConf.cxx b/DataFormats/Detectors/Common/src/NameConf.cxx
@@ -32,22 +32,22 @@ bool NameConf::pathIsDirectory(const std::string_view p)
 std::string NameConf::getGeomFileName(const std::string_view prefix)
 {
   // check if the prefix is an existing path
-  const bool prefixispath = pathIsDirectory(prefix);
-  if (prefixispath) {
+  if (pathIsDirectory(prefix)) {
     return o2::utils::concat_string(prefix, "/", STANDARDSIMPREFIX, "_", GEOM_FILE_STRING, ".root");
-  } else {
-    return o2::utils::concat_string(prefix.empty() ? STANDARDSIMPREFIX : prefix, "_", GEOM_FILE_STRING, ".root");
+  } else if (pathExists(prefix)) {
+    return std::string(prefix); // it is a full file
   }
+  return o2::utils::concat_string(prefix.empty() ? STANDARDSIMPREFIX : prefix, "_", GEOM_FILE_STRING, ".root");
 }
 
 // Filename to store geometry file
 std::string NameConf::getDictionaryFileName(DId det, const std::string_view prefix, const std::string_view ext)
 {
   // check if the prefix is an existing path
-  const bool prefixispath = pathIsDirectory(prefix);
-  if (prefixispath) {
+  if (pathIsDirectory(prefix)) {
     return o2::utils::concat_string(prefix, "/", det.getName(), DICTFILENAME, ext);
-  } else {
-    return o2::utils::concat_string(prefix, det.getName(), DICTFILENAME, ext);
+  } else if (pathExists(prefix)) {
+    return std::string(prefix); // it is a full file
   }
+  return o2::utils::concat_string(prefix, det.getName(), DICTFILENAME, ext);
 }

Original file line number	Diff line number	Diff line change
`@@ -32,22 +32,22 @@ bool NameConf::pathIsDirectory(const std::string_view p)`
`32`	`32`	`std::string NameConf::getGeomFileName(const std::string_view prefix)`
`33`	`33`	`{`
`34`	`34`	`// check if the prefix is an existing path`
`35`		`- const bool prefixispath = pathIsDirectory(prefix);`
`36`		`- if (prefixispath) {`
	`35`	`+ if (pathIsDirectory(prefix)) {`
`37`	`36`	`return o2::utils::concat_string(prefix, "/", STANDARDSIMPREFIX, "_", GEOM_FILE_STRING, ".root");`
`38`		`- } else {`
`39`		`- return o2::utils::concat_string(prefix.empty() ? STANDARDSIMPREFIX : prefix, "_", GEOM_FILE_STRING, ".root");`
	`37`	`+ } else if (pathExists(prefix)) {`
	`38`	`+ return std::string(prefix); // it is a full file`
`40`	`39`	`}`
	`40`	`+ return o2::utils::concat_string(prefix.empty() ? STANDARDSIMPREFIX : prefix, "_", GEOM_FILE_STRING, ".root");`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`// Filename to store geometry file`
`44`	`44`	`std::string NameConf::getDictionaryFileName(DId det, const std::string_view prefix, const std::string_view ext)`
`45`	`45`	`{`
`46`	`46`	`// check if the prefix is an existing path`
`47`		`- const bool prefixispath = pathIsDirectory(prefix);`
`48`		`- if (prefixispath) {`
	`47`	`+ if (pathIsDirectory(prefix)) {`
`49`	`48`	`return o2::utils::concat_string(prefix, "/", det.getName(), DICTFILENAME, ext);`
`50`		`- } else {`
`51`		`- return o2::utils::concat_string(prefix, det.getName(), DICTFILENAME, ext);`
	`49`	`+ } else if (pathExists(prefix)) {`
	`50`	`+ return std::string(prefix); // it is a full file`
`52`	`51`	`}`
	`52`	`+ return o2::utils::concat_string(prefix, det.getName(), DICTFILENAME, ext);`
`53`	`53`	`}`