diff --git a/C#_Version/DeconEngine/DTAGeneration/DTAGeneration.cs b/C#_Version/DeconEngine/DTAGeneration/DTAGeneration.cs index 9a66ad0..069eea5 100644 --- a/C#_Version/DeconEngine/DTAGeneration/DTAGeneration.cs +++ b/C#_Version/DeconEngine/DTAGeneration/DTAGeneration.cs @@ -108,7 +108,7 @@ public DTAProcessor() IsolationWindowSize = 3; ConsiderMultiplePrecursors = false; DoCentroidMSn = false; - DatasetType = FileType.FINNIGAN; + DatasetType = FileType.THERMORAW; IsProfileDataForMzXML = false; _firstScanWritten = false; } @@ -1016,7 +1016,7 @@ public bool ContainsProfileData(int parentScan) public bool IsZoomScan(int parentScan) { - if (DatasetType == FileType.FINNIGAN) + if (DatasetType == FileType.THERMORAW) return RawDataDTA.IsZoomScan(parentScan); return false; @@ -1029,7 +1029,7 @@ public int GetSpectraType(int msNScanNumber) public bool IsFTData(int parentScan) { - if (DatasetType == FileType.FINNIGAN) + if (DatasetType == FileType.THERMORAW) return RawDataDTA.IsFTScan(parentScan); else if (DatasetType == FileType.MZXMLRAWDATA) { diff --git a/C#_Version/DeconEngine/Readers/FinniganRawData.cs b/C#_Version/DeconEngine/Readers/FinniganRawData.cs index ac36065..bb35104 100644 --- a/C#_Version/DeconEngine/Readers/FinniganRawData.cs +++ b/C#_Version/DeconEngine/Readers/FinniganRawData.cs @@ -71,7 +71,7 @@ internal class FinniganRawData : RawData [Obsolete("Only used by DeconTools for ICR2LSRun and IMFRun; BrukerV2 exists, but has no use path", false)] public override FileType GetFileType() { - return FileType.FINNIGAN; + return FileType.THERMORAW; } [Obsolete("Only used by DeconTools for ICR2LSRun and IMFRun; BrukerV2 exists, but has no use path", false)] diff --git a/C#_Version/DeconEngine/Readers/ReaderFactory.cs b/C#_Version/DeconEngine/Readers/ReaderFactory.cs index 404021d..8787cff 100644 --- a/C#_Version/DeconEngine/Readers/ReaderFactory.cs +++ b/C#_Version/DeconEngine/Readers/ReaderFactory.cs @@ -62,7 +62,7 @@ public static RawData GetRawData(FileType fileType, string fileName) rawData.Load(fileName); break; #pragma warning restore 618 - case FileType.FINNIGAN: + case FileType.THERMORAW: rawData = new ThermoRawData(); rawData.Load(fileName); break; @@ -117,7 +117,7 @@ public static void GetRawData(out RawData rawData, FileType fileType) rawData = new AgilentRawData(); #endif break; - case FileType.FINNIGAN: + case FileType.THERMORAW: rawData = new ThermoRawData(); break; case FileType.SUNEXTREL: @@ -168,7 +168,7 @@ public static RawData GetRawData(FileType fileType) rawData = new AgilentRawData(); #endif break; - case FileType.FINNIGAN: + case FileType.THERMORAW: rawData = new ThermoRawData(); break; case FileType.SUNEXTREL: diff --git a/C#_Version/DeconEngine/Readers/ThermoRawData.cs b/C#_Version/DeconEngine/Readers/ThermoRawData.cs index 4fe6031..33f6069 100644 --- a/C#_Version/DeconEngine/Readers/ThermoRawData.cs +++ b/C#_Version/DeconEngine/Readers/ThermoRawData.cs @@ -35,7 +35,7 @@ internal class ThermoRawData : RawData [Obsolete("Only used by DeconTools for ICR2LSRun and IMFRun; BrukerV2 exists, but has no use path", false)] public override FileType GetFileType() { - return FileType.FINNIGAN; + return FileType.THERMORAW; } [Obsolete("Only used by DeconTools for ICR2LSRun and IMFRun; BrukerV2 exists, but has no use path", false)] diff --git a/C#_Version/DeconEngine/clsProcRunner.cs b/C#_Version/DeconEngine/clsProcRunner.cs index 2ac359f..fb4ba84 100644 --- a/C#_Version/DeconEngine/clsProcRunner.cs +++ b/C#_Version/DeconEngine/clsProcRunner.cs @@ -139,7 +139,7 @@ private Results.clsTransformResults CreateTransformResults(string fileName, File // while the thresholded parameter is already set in the clsPeakProcessParameters, we would // like to override that here if the data type is Finnigan because that data is threshold. bool thresholded; - if (fileType == FileType.FINNIGAN || + if (fileType == FileType.THERMORAW || fileType == FileType.MZXMLRAWDATA) thresholded = true; else @@ -656,7 +656,7 @@ public void CreateDTAFile() var dotIndex = FileName.IndexOf('.'); var inputFileFormat = FileName.Remove(0, dotIndex + 1); if ((inputFileFormat.ToLower() == "raw")) - FileType = DeconToolsV2.Readers.FileType.FINNIGAN; + FileType = DeconToolsV2.Readers.FileType.THERMORAW; else if (inputFileFormat.ToLower() == "mzxml") FileType = DeconToolsV2.Readers.FileType.MZXMLRAWDATA; else @@ -680,7 +680,7 @@ public void CreateDTAFile() var thresholded = true; /* - if (FileType == DeconToolsV2.Readers.FileType.FINNIGAN || + if (FileType == DeconToolsV2.Readers.FileType.THERMORAW || FileType == DeconToolsV2.Readers.FileType.MZXMLRAWDATA) thresholded = true; else