renaming names for loading the topology correction

matthias-kleiner · davidrohr · commit e425b514b977 · 2021-12-14T09:35:54.000+01:00
diff --git a/GPU/GPUTracking/Definitions/GPUSettingsList.h b/GPU/GPUTracking/Definitions/GPUSettingsList.h
@@ -404,9 +404,9 @@ AddOption(synchronousProcessing, bool, false, "", 0, "Apply performance shortcut
 AddOption(dump, int, 0, "", 0, "Dump events for standalone benchmark: 1 = dump events, 2 = dump events and skip processing in workflow")
 AddOption(display, bool, false, "", 0, "Enable standalone gpu tracking visualizaion")
 AddOption(rundEdx, int, -1, "", 0, "Enable/disable dEdx processing (-1 for autoselect)")
-AddOption(dEdxFile, std::string, "", "", 0, "File name of the dE/dx spline track topology correction file")
+AddOption(dEdxSplineTopologyCorrFile, std::string, "", "", 0, "File name of the dE/dx spline track topology correction file")
 AddOption(dEdxCorrFile, std::string, "", "", 0, "File name of dEdx residual correction file")
-AddOption(dEdxTopologyCorrFile, std::string, "", "", 0, "File name of the dE/dx polynomial track topology correction")
+AddOption(dEdxPolTopologyCorrFile, std::string, "", "", 0, "File name of the dE/dx polynomial track topology correction")
 AddOption(transformationFile, std::string, "", "", 0, "File name of TPC fast transformation map")
 AddOption(matLUTFile, std::string, "", "", 0, "File name of material LUT file")
 AddOption(gainCalibFile, std::string, "", "", 0, "File name of TPC pad gain calibration")
diff --git a/GPU/Workflow/src/GPUWorkflowSpec.cxx b/GPU/Workflow/src/GPUWorkflowSpec.cxx
@@ -252,14 +252,14 @@ DataProcessorSpec getGPURecoWorkflowSpec(gpuworkflow::CompletionPolicyData* poli
       }
 
       // load from file
-      if (!confParam.dEdxTopologyCorrFile.empty() || !confParam.dEdxCorrFile.empty() || !confParam.dEdxFile.empty()) {
+      if (!confParam.dEdxPolTopologyCorrFile.empty() || !confParam.dEdxCorrFile.empty() || !confParam.dEdxSplineTopologyCorrFile.empty()) {
         processAttributes->dEdxCalibContainer.reset(new o2::tpc::CalibdEdxContainer());
-        if (!confParam.dEdxTopologyCorrFile.empty()) {
-          LOGP(info, "Loading dE/dx polynomial track topology correction from file: {}", confParam.dEdxTopologyCorrFile);
-          processAttributes->dEdxCalibContainer->loadPolTopologyCorrectionFromFile(confParam.dEdxTopologyCorrFile);
-        } else if (!confParam.dEdxFile.empty()) {
-          LOGP(info, "Loading dE/dx spline track topology correction from file: {}", confParam.dEdxFile);
-          processAttributes->dEdxCalibContainer->loadSplineTopologyCorrectionFromFile(confParam.dEdxFile);
+        if (!confParam.dEdxPolTopologyCorrFile.empty()) {
+          LOGP(info, "Loading dE/dx polynomial track topology correction from file: {}", confParam.dEdxPolTopologyCorrFile);
+          processAttributes->dEdxCalibContainer->loadPolTopologyCorrectionFromFile(confParam.dEdxPolTopologyCorrFile);
+        } else if (!confParam.dEdxSplineTopologyCorrFile.empty()) {
+          LOGP(info, "Loading dE/dx spline track topology correction from file: {}", confParam.dEdxSplineTopologyCorrFile);
+          processAttributes->dEdxCalibContainer->loadSplineTopologyCorrectionFromFile(confParam.dEdxSplineTopologyCorrFile);
         }
         if (!confParam.dEdxCorrFile.empty()) {
           LOGP(info, "Loading dEdx correction from file: {}", confParam.dEdxCorrFile);
