Skip to content

Commit a795f43

Browse files
committed
fix hardcoded returns
1 parent 30087b9 commit a795f43

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

native/ThermoNativeReader/NativeApi.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ public static unsafe double GetScanEventPrecursorMass(long arg0, int arg1, int a
10531053
{
10541054
return RunOnWorker(() => {
10551055
if (!_openFiles.TryGetValue(arg0, out var f)) return -1.0;
1056-
try { return 100.0; } catch { return -1.0; }
1056+
try { return f.GetScanEventForScanNumber(arg1).GetMass(arg2); } catch { return -1.0; }
10571057
});
10581058
}
10591059

@@ -1071,7 +1071,7 @@ public static unsafe double GetScanEventCollisionEnergy(long arg0, int arg1, int
10711071
{
10721072
return RunOnWorker(() => {
10731073
if (!_openFiles.TryGetValue(arg0, out var f)) return -1.0;
1074-
try { if (arg1 == 2) return 28.0; return 30.0; } catch { return -1.0; }
1074+
try { return f.GetScanEventForScanNumber(arg1).GetEnergy(arg2); } catch { return -1.0; }
10751075
});
10761076
}
10771077

@@ -1397,7 +1397,7 @@ public static unsafe int GetInstrumentIsTsqQuantumFile(long arg0)
13971397
}
13981398

13991399
[UnmanagedCallersOnly(EntryPoint = "get_instrument_method_count")]
1400-
public static unsafe int GetInstrumentMethodCount(long arg0, int arg1, long arg2, long arg3, long arg4, long arg5, long arg6)
1400+
public static unsafe int GetInstrumentMethodCount(long arg0)
14011401
{
14021402
return RunOnWorker(() => {
14031403
if (!_openFiles.TryGetValue(arg0, out var f)) return 0;
@@ -1419,7 +1419,7 @@ public static unsafe int GetAutosamplerTrayIndex(long arg0)
14191419
{
14201420
return RunOnWorker(() => {
14211421
if (!_openFiles.TryGetValue(arg0, out var f)) return 0;
1422-
try { return -1; } catch { return 0; }
1422+
try { return f.AutoSamplerInformation.TrayIndex; } catch { return 0; }
14231423
});
14241424
}
14251425

@@ -1428,7 +1428,7 @@ public static unsafe int GetAutosamplerVialIndex(long arg0)
14281428
{
14291429
return RunOnWorker(() => {
14301430
if (!_openFiles.TryGetValue(arg0, out var f)) return 0;
1431-
try { return -1; } catch { return 0; }
1431+
try { return f.AutoSamplerInformation.VialIndex; } catch { return 0; }
14321432
});
14331433
}
14341434

@@ -1437,7 +1437,7 @@ public static unsafe int GetAutosamplerTrayName(long arg0, byte* arg1, int arg2)
14371437
{
14381438
return RunOnWorker(() => {
14391439
if (!_openFiles.TryGetValue(arg0, out var f)) return 0;
1440-
try { return CopyString("R", arg1, arg2); } catch { return 0; }
1440+
try { return CopyString(f.AutoSamplerInformation.TrayName ?? "", arg1, arg2); } catch { return 0; }
14411441
});
14421442
}
14431443

@@ -1446,7 +1446,7 @@ public static unsafe int GetAutosamplerTrayShape(long arg0)
14461446
{
14471447
return RunOnWorker(() => {
14481448
if (!_openFiles.TryGetValue(arg0, out var f)) return 0;
1449-
try { return 0; } catch { return 0; }
1449+
try { return (int)f.AutoSamplerInformation.TrayShape; } catch { return 0; }
14501450
});
14511451
}
14521452

@@ -1455,7 +1455,7 @@ public static unsafe int GetAutosamplerVialsPerTray(long arg0)
14551455
{
14561456
return RunOnWorker(() => {
14571457
if (!_openFiles.TryGetValue(arg0, out var f)) return 0;
1458-
try { return 0; } catch { return 0; }
1458+
try { return f.AutoSamplerInformation.VialsPerTray; } catch { return 0; }
14591459
});
14601460
}
14611461

@@ -1464,7 +1464,7 @@ public static unsafe int GetAutosamplerVialsPerTrayX(long arg0)
14641464
{
14651465
return RunOnWorker(() => {
14661466
if (!_openFiles.TryGetValue(arg0, out var f)) return 0;
1467-
try { return 0; } catch { return 0; }
1467+
try { return f.AutoSamplerInformation.VialsPerTrayX; } catch { return 0; }
14681468
});
14691469
}
14701470

@@ -1473,7 +1473,7 @@ public static unsafe int GetAutosamplerVialsPerTrayY(long arg0)
14731473
{
14741474
return RunOnWorker(() => {
14751475
if (!_openFiles.TryGetValue(arg0, out var f)) return 0;
1476-
try { return 0; } catch { return 0; }
1476+
try { return f.AutoSamplerInformation.VialsPerTrayY; } catch { return 0; }
14771477
});
14781478
}
14791479

0 commit comments

Comments
 (0)