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

Mods to support spectra file IO out of fortran #34

Draft
wants to merge 88 commits into
base: master
Choose a base branch
from

Conversation

hbivens
Copy link
Collaborator

@hbivens hbivens commented Jul 25, 2024

No description provided.

@hbivens hbivens requested a review from wcjohns July 25, 2024 23:46
@hbivens hbivens linked an issue Jul 25, 2024 that may be closed by this pull request
@hbivens hbivens changed the title Add install stuff and support for Finding Specutils in CMake Mods to support spectra file IO out of fortran Jul 25, 2024
@wcjohns
Copy link
Collaborator

wcjohns commented Jul 25, 2024

This looks like a nice addition - thanks!

//auto timesEqual = expectedM.start_time() == actualM.start_time();
auto timeStr1 = SpecUtils::to_iso_string(expectedM.start_time() );
auto timeStr2 = SpecUtils::to_iso_string(actualM.start_time() );
CHECK( timeStr1 == timeStr2);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wcjohns I think we lose some time precision when we write and read pcf files. My test is failing when comparing measurement start times.


1: /mnt/c/Projects/code/SpecUtils/unit_tests/test_spec_file.cpp:81: ERROR: CHECK( timeStr1 == timeStr2 ) is NOT correct!
1:   values: CHECK( 20240812T164010.285502 == 20240812T164010.29 )

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct - PCF files store time in VAX format (a 23 character string formatted like "19-Sep-2014 14:12:01.62"), so only to the 100th of a second.

SpecUtils normally tracks down to the microsecond (via using time_point_t = std::chrono::time_point<std::chrono::system_clock,std::chrono::microseconds>).

It looks like SpecUtils::to_vax_string(..) rounds to the nearest 0.01 seconds, so you could test:

auto timeStr1 = SpecUtils::to_vax_string( expectedM.start_time() );
auto timeStr2 = SpecUtils::to_vax_string( actualM.start_time() );
CHECK( timeStr1 == timeStr2);

Or something like:

CHECK( std::round(0.0001*expectedM.start_time().count()) == std::round(0.0001*actualM.start_time().count()) );

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, thanks! I'll use to_vax_string to compare.

@hbivens hbivens marked this pull request as ready for review August 30, 2024 20:30
This was referenced Aug 30, 2024
…alabs/SpecUtils into issue/31-spectra-io-out-of-fortran
…alabs/SpecUtils into issue/31-spectra-io-out-of-fortran
Before if time rounded to 100 hundreths of a second, that would be printed, instead of incrementing things properly.
For example "2014-Sep-19 23:59:59.996" would print "19-Sep-2014 23:59:59.100", when it should print "20-Sep-2014 00:00:00.00" - which it now does.
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.

Spectra io out of fortran
2 participants