From 5bdc819185c058113680302ecd6a34456ac9a7ab Mon Sep 17 00:00:00 2001 From: jobo322 Date: Fri, 27 Sep 2024 08:47:46 -0500 Subject: [PATCH 1/2] fix: generalizedLorentzian shape supported --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0c792fd..4acff69 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "typescript": "^5.4.2" }, "dependencies": { - "ml-peak-shape-generator": "^4.1.2", - "ml-spectra-processing": "^14.2.0" + "ml-peak-shape-generator": "^4.1.4", + "ml-spectra-processing": "^14.5.0" } } From 328f3d77f58dedb3bb1fa534571b37d7867c88f6 Mon Sep 17 00:00:00 2001 From: jobo322 Date: Fri, 27 Sep 2024 09:01:14 -0500 Subject: [PATCH 2/2] chore: test case --- src/__tests__/generateSpectrum.shape.test.ts | 37 ++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/__tests__/generateSpectrum.shape.test.ts b/src/__tests__/generateSpectrum.shape.test.ts index 6a189f2..8a978e2 100644 --- a/src/__tests__/generateSpectrum.shape.test.ts +++ b/src/__tests__/generateSpectrum.shape.test.ts @@ -60,4 +60,41 @@ describe('generateSpectrum', () => { const gaussian = new Gaussian({ fwhm: 0.5 }); expect(spectrum.y[index]).toBe(gaussian.fct(0.06)); }); + + it('Those two peak shape should be a pure lorentzian', () => { + const lorentzianPeak: Peak1D[] = [ + { + x: 0, + y: 1, + shape: { kind: 'lorentzian', fwhm: 0.5 }, + }, + ]; + + const spectrum = generateSpectrum(lorentzianPeak, { + generator: { + from: -0.1, + to: 0.1, + nbPoints: 51, + shape: { kind: 'gaussian' }, + }, + }); + + const generalizedLorentzianPeak: Peak1D[] = [ + { + x: 0, + y: 1, + shape: { kind: 'generalizedLorentzian', fwhm: 0.5, gamma: 0 }, + }, + ]; + const spectrum2 = generateSpectrum(generalizedLorentzianPeak, { + generator: { + from: -0.1, + to: 0.1, + nbPoints: 51, + shape: { kind: 'gaussian' }, + }, + }); + + expect(spectrum.y).toStrictEqual(spectrum2.y); + }); });