diff --git a/MARMoSET_C/MARMoSET/InstrumentMethod.cs b/MARMoSET_C/MARMoSET/InstrumentMethod.cs index 16f8864..f06213e 100644 --- a/MARMoSET_C/MARMoSET/InstrumentMethod.cs +++ b/MARMoSET_C/MARMoSET/InstrumentMethod.cs @@ -67,18 +67,16 @@ public InstrumentMethod(IRawDataPlus rawFile, int index, bool toLower = false, o var seqSNumber = Enumerable.Range(1, sNumber); List trailerD22List = new List(); - foreach (int scan in seqSNumber) + foreach (int scan in seqSNumber) // get resolution of each scan { Object aValue = rawFile.GetTrailerExtraValue(scan, 22); int intValue = Convert.ToInt32(aValue); trailerD22List.Add(intValue); } - // 1077 -> 0 ??? - - + // Hash Set for unique Values var resolutionValues = new HashSet(trailerD22List); - resolutionValues.Remove(0); - object resolution = resolutionValues; + resolutionValues.Remove(0); // no 0 + string resolution = string.Join(", ", resolutionValues); // todo, unschoen. wenn fjson aus R weg, hier array methodWithResolution.Add("Resolution", resolution); } diff --git a/MARMoSET_C/MARMoSET/bin/x64/Debug/MARMoSET.exe b/MARMoSET_C/MARMoSET/bin/x64/Debug/MARMoSET.exe index cdf1be7..0db8500 100644 Binary files a/MARMoSET_C/MARMoSET/bin/x64/Debug/MARMoSET.exe and b/MARMoSET_C/MARMoSET/bin/x64/Debug/MARMoSET.exe differ diff --git a/MARMoSET_C/MARMoSET/bin/x64/Debug/MARMoSET.pdb b/MARMoSET_C/MARMoSET/bin/x64/Debug/MARMoSET.pdb index bdd776d..83bc7a4 100644 Binary files a/MARMoSET_C/MARMoSET/bin/x64/Debug/MARMoSET.pdb and b/MARMoSET_C/MARMoSET/bin/x64/Debug/MARMoSET.pdb differ diff --git a/MARMoSET_C/MARMoSET/bin/x64/Release/MARMoSET.exe b/MARMoSET_C/MARMoSET/bin/x64/Release/MARMoSET.exe index 41bba22..42c4463 100644 Binary files a/MARMoSET_C/MARMoSET/bin/x64/Release/MARMoSET.exe and b/MARMoSET_C/MARMoSET/bin/x64/Release/MARMoSET.exe differ diff --git a/MARMoSET_C/MARMoSET/bin/x64/Release/MARMoSET.pdb b/MARMoSET_C/MARMoSET/bin/x64/Release/MARMoSET.pdb index db49b53..cbf6901 100644 Binary files a/MARMoSET_C/MARMoSET/bin/x64/Release/MARMoSET.pdb and b/MARMoSET_C/MARMoSET/bin/x64/Release/MARMoSET.pdb differ diff --git a/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.csprojAssemblyReference.cache b/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.csprojAssemblyReference.cache index c786c0e..ecf9e36 100644 Binary files a/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.csprojAssemblyReference.cache and b/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.csprojAssemblyReference.cache differ diff --git a/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.exe b/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.exe index cdf1be7..0db8500 100644 Binary files a/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.exe and b/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.exe differ diff --git a/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.pdb b/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.pdb index bdd776d..83bc7a4 100644 Binary files a/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.pdb and b/MARMoSET_C/MARMoSET/obj/x64/Debug/MARMoSET.pdb differ diff --git a/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.csproj.FileListAbsolute.txt b/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.csproj.FileListAbsolute.txt index 16ebcf4..eaa9377 100644 --- a/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.csproj.FileListAbsolute.txt +++ b/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.csproj.FileListAbsolute.txt @@ -71,3 +71,4 @@ P:\allMARMoSET\MARMoSET_C\MARMoSET\obj\x64\Release\MARMoSET.pdb \\mpg-nki-winfs.kerckhoff.mpg.de\mkiwele$\allMARMoSET\MARMoSET_C\MARMoSET\obj\x64\Release\MARMoSET.csproj.CopyComplete \\mpg-nki-winfs.kerckhoff.mpg.de\mkiwele$\allMARMoSET\MARMoSET_C\MARMoSET\obj\x64\Release\MARMoSET.exe \\mpg-nki-winfs.kerckhoff.mpg.de\mkiwele$\allMARMoSET\MARMoSET_C\MARMoSET\obj\x64\Release\MARMoSET.pdb +\\mpg-nki-winfs.kerckhoff.mpg.de\mkiwele$\allMARMoSET\MARMoSET_C\MARMoSET\obj\x64\Release\MARMoSET.csprojAssemblyReference.cache diff --git a/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.csprojAssemblyReference.cache b/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.csprojAssemblyReference.cache index ac1064a..9ca15da 100644 Binary files a/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.csprojAssemblyReference.cache and b/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.csprojAssemblyReference.cache differ diff --git a/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.exe b/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.exe index 41bba22..42c4463 100644 Binary files a/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.exe and b/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.exe differ diff --git a/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.pdb b/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.pdb index db49b53..cbf6901 100644 Binary files a/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.pdb and b/MARMoSET_C/MARMoSET/obj/x64/Release/MARMoSET.pdb differ