Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Read horiba #65

Closed
wants to merge 7 commits into from
Closed

Read horiba #65

wants to merge 7 commits into from

Conversation

jpshanno
Copy link
Contributor

@jpshanno jpshanno commented Feb 5, 2020

This branch includes the Horiba import function I mentioned in #64 as well as sample EEMs and tests. I wasn't able to test all the various output options to export EEMs from the Horiba (including comments, etc). So I included a check to find the fluorescence intensity matrix within a csv if there are any header rows or columns inserted before the data in the export process (see extdata/horiba/horiba_non-standard_sample.csv).

I rebuilt with roxygen2 to update the help pages, so it shows that every help page was changed, and I could not run R CMD check because I don't have the necessary fonts to build the vignettes. I did run the run the testthat directory and rebuilt the package, so R CMD check should run smoothly.

@PMassicotte
Copy link
Owner

Thank you for your contribution. I am not sure why there are 32 files changes. Can you have a look?

@jpshanno
Copy link
Contributor Author

It looks like it stems from the last commit when I rebuilt the documentation to reflect an updated help page with the addition of a Horiba import function. I could try rolling back a commit and rebuilding the documentation without roxygen2 to see if it still marks all of the files as changed. I am not sure that would be enough to fix the problem though.

Looking at the files in R/ that I edited they show that I removed all existing lines and then readded all of the lines. I have had some trouble in the past moving between OSes (Linux (my OS) to Windows and vice versa) because of the difference in line endings in text files. I'd have to investigate a little more, but I think that may be causing part of the large number of files. When I rebuilt the documentation the line endings were changed (assuming you are not running Linux). Git then saw the new line endings and marked all of the files as updated. Let me know if you're hesitant about the large number of files changed and I can try to bring that number down to the essentials and submit a new pull request.

@jpshanno jpshanno closed this Oct 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants