LEK SI2Conc edit

[LucyKershaw]

Edited LEK code for SI2Conc to include a range for the baseline points to be used. Test function updated accordingly

[netlify]

❌ Deploy Preview for osipicodecollection failed.

Name	Link
🔨 Latest commit	c0ab6af
🔍 Latest deploy log	https://app.netlify.com/sites/osipicodecollection/deploys/6451314de396130008e0ccf6

[codecov]

Codecov Report

Merging #130 (c0ab6af) into develop (65ed3f8) will decrease coverage by 2.69%.
Report is 3 commits behind head on develop.
The diff coverage is 100.00%.

❗ Current head c0ab6af differs from pull request most recent head 1b18536. Consider uploading reports for the commit 1b18536 to get more accurate results

@@             Coverage Diff             @@
##           develop     #130      +/-   ##
===========================================
- Coverage    64.75%   62.06%   -2.69%     
===========================================
  Files           64       21      -43     
  Lines         3476      754    -2722     
===========================================
- Hits          2251      468    -1783     
+ Misses        1225      286     -939     

Files Changed	Coverage Δ
...LEK_UoEdinburghUK/SignalToConcentration/SI2Conc.py	66.66% <100.00%> (ø)
test/SI_to_Conc/test_SI2Conc_LEK_EdinburghUK.py	100.00% <100.00%> (ø)

... and 78 files with indirect coverage changes

[stadmill]

@notZaki Can you please help me understand why this merge is failing?

[notZaki]

@stadmill This branch was created from a very old version of develop. The merge was failing because of one file which was modified in this PR but has also been modified in develop, and git can't figure out which version should be kept.
(I think the actual conflict is that the original test file was renamed in develop, but this branch is still using an older filename)

I've updated the PR to bring it up to speed with develop.
The test still fails, but one thing worth noting is that there already is a similar test in develop under test_SI2Conc_LEK_Edinburgh_UK.py (underscore between Edinburgh and UK).
It may be better to edit that existing file, and remove the test file that was added in the PR.

[stadmill]

@notZaki Ok I made the changes in the test file manually and pushed to the develop branch. I deleted the test file from Lucy's PR. Some checks are still failing.

[notZaki]

Should be ok now @stadmill