Merge pull request #327 from vshekar/datapath-fix

Sets datapath to any request to current visit directory
NSLS-II · Sep 27, 2023 · b6dbc58 · b6dbc58
2 parents 9291de4 + a8fef96
commit b6dbc58
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/gui/control_main.py b/gui/control_main.py
@@ -3676,7 +3676,7 @@ def editSampleRequestCB(self, singleRequest):
                 singleRequest == 1
             ):  # a touch kludgy, but I want to be able to edit parameters for multiple requests w/o screwing the data loc info
                 reqObj["file_prefix"] = str(self.dataPathGB.prefix_ledit.text())
-                reqObj["basePath"] = str(self.dataPathGB.base_path_ledit.text())
+                reqObj["basePath"] = getBlConfig("visitDirectory")
                 reqObj["directory"] = str(self.dataPathGB.dataPath_ledit.text())
                 reqObj["file_number_start"] = int(
                     self.dataPathGB.file_numstart_ledit.text()
@@ -3934,9 +3934,9 @@ def addSampleRequestCB(self, rasterDef=None, selectedSampleID=None):
                         reqObj["file_prefix"] = str(
                             self.dataPathGB.prefix_ledit.text() + "_C" + str(i + 1)
                         )
-                        reqObj["basePath"] = str(self.dataPathGB.base_path_ledit.text())
+                        reqObj["basePath"] = getBlConfig("visitDirectory")
                         reqObj["directory"] = (
-                            str(self.dataPathGB.base_path_ledit.text())
+                            getBlConfig("visitDirectory")
                             + "/"
                             + str(daq_utils.getVisitName())
                             + "/"
@@ -4060,7 +4060,7 @@ def addSampleRequestCB(self, rasterDef=None, selectedSampleID=None):
                     )
                 reqObj["resolution"] = float(self.resolution_ledit.text())
                 reqObj["directory"] = (
-                    str(self.dataPathGB.base_path_ledit.text())
+                    getBlConfig("visitDirectory")
                     + "/"
                     + str(daq_utils.getVisitName())
                     + "/"
@@ -4073,7 +4073,7 @@ def addSampleRequestCB(self, rasterDef=None, selectedSampleID=None):
                     + str(samplePositionInContainer + 1)
                     + "/"
                 )
-                reqObj["basePath"] = str(self.dataPathGB.base_path_ledit.text())
+                reqObj["basePath"] = getBlConfig("visitDirectory")
                 reqObj["file_prefix"] = str(self.dataPathGB.prefix_ledit.text())
                 reqObj["file_number_start"] = int(
                     self.dataPathGB.file_numstart_ledit.text()