diff --git a/src/MSDIAL5/MsdialCore/Parameter/ParameterBase.cs b/src/MSDIAL5/MsdialCore/Parameter/ParameterBase.cs index fa422c772..daad21164 100644 --- a/src/MSDIAL5/MsdialCore/Parameter/ParameterBase.cs +++ b/src/MSDIAL5/MsdialCore/Parameter/ParameterBase.cs @@ -107,8 +107,6 @@ public ParameterBase(bool isLabUseOnly) { [IgnoreMember] public string CompoundListForRtCorrectionPath { get => ReferenceFileParam.CompoundListForRtCorrectionPath; set => ReferenceFileParam.CompoundListForRtCorrectionPath = value; } [IgnoreMember] - public string RtCorrectionPeakSelectionFilePath { get => ReferenceFileParam.RtCorrectionPeakSelectionFilePath; set => ReferenceFileParam.RtCorrectionPeakSelectionFilePath = value; } - [IgnoreMember] public List SearchedAdductIons { get => ReferenceFileParam.SearchedAdductIons; set => ReferenceFileParam.SearchedAdductIons = value; } // Export @@ -538,7 +536,7 @@ public virtual List ParametersAsText() { pStrings.Add(String.Join(": ", new string[] { "Isotope text DB file path", IsotopeTextDBFilePath.ToString() })); pStrings.Add(String.Join(": ", new string[] { "Compounds library file path for target detection", CompoundListInTargetModePath.ToString() })); pStrings.Add(String.Join(": ", new string[] { "Compounds library file path for RT correction", CompoundListForRtCorrectionPath.ToString() })); - pStrings.Add(String.Join(": ", new string[] { "RT correction peak selection file path", RtCorrectionPeakSelectionFilePath.ToString() })); + pStrings.Add(String.Join(": ", new string[] { "RT correction peak selection file path", ReferenceFileParam.RtCorrectionPeakSelectionFilePath?.ToString() ?? string.Empty })); pStrings.Add(String.Join(": ", new string[] { "Searched adduct ions", String.Join(",", SearchedAdductIons.Select(n => n.AdductIonName).ToArray()) })); pStrings.Add("\r\n"); diff --git a/tests/MSDIAL5/MsdialCoreTestApp/Parser/ConfigParser.cs b/tests/MSDIAL5/MsdialCoreTestApp/Parser/ConfigParser.cs index bea6f4d93..0ba9829be 100644 --- a/tests/MSDIAL5/MsdialCoreTestApp/Parser/ConfigParser.cs +++ b/tests/MSDIAL5/MsdialCoreTestApp/Parser/ConfigParser.cs @@ -617,7 +617,7 @@ public static bool ReadCommonParameter(ParameterBase param, string method, strin } } return true; - case "rt correction peak selection file path": param.RtCorrectionPeakSelectionFilePath = value; return true; + case "rt correction peak selection file path": param.ReferenceFileParam.RtCorrectionPeakSelectionFilePath = value; return true; // Private version case "is private version of tada": diff --git a/tests/MSDIAL5/MsdialCoreTestApp/Process/EicProcess.cs b/tests/MSDIAL5/MsdialCoreTestApp/Process/EicProcess.cs index 648107fae..94f6268be 100644 --- a/tests/MSDIAL5/MsdialCoreTestApp/Process/EicProcess.cs +++ b/tests/MSDIAL5/MsdialCoreTestApp/Process/EicProcess.cs @@ -131,7 +131,7 @@ public int RunRtCorrection( parameter.IonMode = ionMode; parameter.CompoundListForRtCorrectionPath = libraryFile.FullName; parameter.RetentionTimeCorrectionCommon.RetentionTimeCorrectionParam.ExcuteRtCorrection = true; - parameter.RtCorrectionPeakSelectionFilePath = selectionFile?.FullName ?? string.Empty; + parameter.ReferenceFileParam.RtCorrectionPeakSelectionFilePath = selectionFile?.FullName ?? string.Empty; var analysisFiles = CreateRtCorrectionAnalysisFiles(rawFiles, acquisitionType, outputFile.FullName); RetentionTimeCorrectionProcess.Prepare( analysisFiles, diff --git a/tests/MSDIAL5/MsdialCoreTestApp/Process/RetentionTimeCorrectionProcess.cs b/tests/MSDIAL5/MsdialCoreTestApp/Process/RetentionTimeCorrectionProcess.cs index ea739a0fc..7df4368f9 100644 --- a/tests/MSDIAL5/MsdialCoreTestApp/Process/RetentionTimeCorrectionProcess.cs +++ b/tests/MSDIAL5/MsdialCoreTestApp/Process/RetentionTimeCorrectionProcess.cs @@ -53,9 +53,9 @@ public static void Prepare(IReadOnlyList analysisFiles, Parame } Directory.CreateDirectory(outputFolder); - var selectionInput = parameter.RtCorrectionPeakSelectionFilePath; + var selectionInput = parameter.ReferenceFileParam.RtCorrectionPeakSelectionFilePath; var detectedRts = SnapshotDetectedRetentionTimes(analysisFiles); - if (!selectionInput.IsEmptyOrNull()) { + if (!string.IsNullOrEmpty(selectionInput)) { ApplySelectionFile(selectionInput, analysisFiles, parameter.RetentionTimeCorrectionCommon); } else {