output directory fix

rest-for-physics · Aug 18, 2024 · 9e79aa4 · 9e79aa4
1 parent f8db155
commit 9e79aa4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/mclient/cmdfetcher.cpp b/src/mclient/cmdfetcher.cpp
@@ -27,6 +27,7 @@ as 4th or 5th argument in any command
 #include "cmdfetcher.h"
 #include "evbuilder.h"
 #include "femarray.h"
+#include "storage.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -365,17 +366,18 @@ int CmdFetcher_Main(CmdFetcher* cf) {
                             fprintf(fRunInfo, "%s\n", detectorStr);
                             fclose(fRunInfo);
 
+                            const auto output_directory = mclient_storage::StorageManager::Instance().GetOutputDirectory();
                             if (savePed) {
                                 sprintf(tmpStr, "cp ped %s/R%05d_%s_Vm_%s_Vd_%s_Pr_%s_Gain_%s_Shape_%s_Clock_%s.ped",
-                                        getenv("RAWDATA_PATH"), runNumber, runTagStr, meshVoltageStr, driftFieldStr,
+                                        output_directory.c_str(), runNumber, runTagStr, meshVoltageStr, driftFieldStr,
                                         detectorPressureStr, gainStr, shapingStr, clockStr);
                                 system(tmpStr);
                                 savePed = 0;
                             }
 
                             sprintf(tmpStr, "cp %s %s/R%05d_%s_Vm_%s_Vd_%s_Pr_%s_Gain_%s_Shape_%s_Clock_%s.run",
                                     cf->cmd_file,
-                                    getenv("RAWDATA_PATH"), runNumber, runTagStr, meshVoltageStr, driftFieldStr,
+                                    output_directory.c_str(), runNumber, runTagStr, meshVoltageStr, driftFieldStr,
                                     detectorPressureStr, gainStr, shapingStr, clockStr);
                             system(tmpStr);
                             savePed = 0;

diff --git a/src/mclient/evbuilder.cpp b/src/mclient/evbuilder.cpp
@@ -1264,7 +1264,8 @@ int EventBuilder_FileAction(EventBuilder* eb,
         eb->subrun_ix++;
     }
 
-    sprintf(&(eb->file_path[0]), "%s", getenv("RAWDATA_PATH"));
+    const auto output_directory = mclient_storage::StorageManager::Instance().GetOutputDirectory();
+    sprintf(&(eb->file_path[0]), "%s", output_directory.c_str());
 
     char filename_root[120] = {};
     sprintf(filename_root, "%s/%s.%s", &(eb->file_path[0]),

diff --git a/src/root/storage.h b/src/root/storage.h
@@ -105,6 +105,9 @@ class StorageManager {
     }
 
     void SetOutputDirectory(const std::string& directory);
+    std::string GetOutputDirectory() const {
+        return output_directory;
+    }
 
 private:
     // make it a point in the past to force a checkpoint on the first event