Automatic insertion of caller function name in CheckOutFileName

macro/PWG/common/production/run_analysis_tree_maker_json_config.C

@@ -3,12 +3,11 @@
    Authors: Viktor Klochkov, Frederic Linz [committer] */
 
 // -----   Check output file name   -------------------------------------------
-bool CheckOutFileName(TString fileName, Bool_t overwrite)
+bool CheckOutFileName(TString fileName, Bool_t overwrite, const char* caller = __builtin_FUNCTION())
 {
-  string fName = "run_analysis_tree_maker_json_config";
   // --- Protect against overwriting an existing file
   if ((!gSystem->AccessPathName(fileName.Data())) && (!overwrite)) {
-    cout << fName << ": output file " << fileName << " already exists!";
+    std::cout << caller << ": output file " << fileName << " already exists!" << std::endl;
     return false;
   }
 
@@ -17,11 +16,11 @@ bool CheckOutFileName(TString fileName, Bool_t overwrite)
   if (gSystem->AccessPathName(directory)) {
     Int_t success = gSystem->mkdir(directory, kTRUE);
     if (success == -1) {
-      cout << fName << ": output directory " << directory << " does not exist and cannot be created!";
+      std::cout << caller << ": output directory " << directory << " does not exist and cannot be created!" << std::endl;
       return false;
     }
     else
-      cout << fName << ": created directory " << directory;
+      std::cout << caller << ": created directory " << directory << std::endl;
   }
   return true;
 }

macro/PWG/common/production/run_reco_json_config.C

@@ -92,12 +92,11 @@
  **/
 
 // -----   Check output file name   -------------------------------------------
-bool CheckOutFileName(TString fileName, Bool_t overwrite)
+bool CheckOutFileName(TString fileName, Bool_t overwrite, const char* caller = __builtin_FUNCTION())
 {
-  string fName = "run_reco_json_config";
   // --- Protect against overwriting an existing file
   if ((!gSystem->AccessPathName(fileName.Data())) && (!overwrite)) {
-    cout << fName << ": output file " << fileName << " already exists!";
+    std::cout << caller << ": output file " << fileName << " already exists!" << std::endl;
     return false;
   }
 
@@ -106,11 +105,11 @@ bool CheckOutFileName(TString fileName, Bool_t overwrite)
   if (gSystem->AccessPathName(directory)) {
     Int_t success = gSystem->mkdir(directory, kTRUE);
     if (success == -1) {
-      cout << fName << ": output directory " << directory << " does not exist and cannot be created!";
+      std::cout << caller << ": output directory " << directory << " does not exist and cannot be created!" << std::endl;
       return false;
     }
     else
-      cout << fName << ": created directory " << directory;
+      std::cout << caller << ": created directory " << directory << std::endl;
   }
   return true;
 }