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.

Sign up for GitHub

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

Jump to bottom

325 observation details are always strings #356

Merged
merged 18 commits into from
Jun 16, 2023
Merged

325 observation details are always strings #356

merged 18 commits into from
Jun 16, 2023

Conversation

dbenn
Copy link
Collaborator

@dbenn dbenn commented May 15, 2023 •
edited
Loading

Hi @mpyat2

There are quite a few changes on this branch and I'll have to sort out merge conflicts. The branch has changes from #317 and #325.

EDIT: The conflict was in plugin/src/org/aavso/tools/vstar/external/plugin/ASASObservationSource.java so could you please check that I have not messed anything up there? Seems OK.

David

dbenn added 12 commits April 30, 2023 22:05
@dbenn dbenn added bug Something isn't working enhancement New feature or request labels May 15, 2023
@dbenn dbenn requested a review from mpyat2 May 15, 2023 11:54
@dbenn dbenn self-assigned this May 15, 2023
@dbenn dbenn linked an issue May 15, 2023 that may be closed by this pull request
Add bitwise operators to VeLa #317
Closed
@dbenn dbenn linked an issue May 15, 2023 that may be closed by this pull request
Observation details are always strings #325
Closed
@mpyat2
Copy link
Collaborator

mpyat2 commented May 19, 2023

Hi @dbenn ,
Thank you! I'll check it. I see some changes needed in ASASSNObservationSource.java, I'm working on them.

@mpyat2
Copy link
Collaborator

mpyat2 commented May 27, 2023

Hi @dbenn ,
please see my changes.

@dbenn
Copy link
Collaborator Author

dbenn commented May 29, 2023

Looks good @mpyat2. Do you have comments on my code on this branch?

mpyat2
mpyat2 approved these changes Jun 4, 2023
View reviewed changes
Copy link
Collaborator

@mpyat2 mpyat2 left a comment

Choose a reason for hiding this comment

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

Hi @dbenn
sorry for delay. Looks good.

@mpyat2
QLP Sector56 FITSs have new column names: DET_FLUX instead of KSPSAP_…
ebd77ae 
…FLUX, DET_FLUX_ERR instead of KSPSAP_FLUX_ERR. The plug-in was updated to be compatible with the new format.
@mpyat2
Copy link
Collaborator

mpyat2 commented Jun 11, 2023

Hi @dbenn ,
I've updated QLPFITSObservationSource.java (minimal changes) to make it compatible with the last Sector56 data. They changed column names!

@dbenn
Copy link
Collaborator Author

dbenn commented Jun 16, 2023

@mpyat2 I think we're OK to merge this now. Agreed? I have a working Mac again BTW. :)

dbenn
dbenn commented Jun 16, 2023
View reviewed changes
Copy link
Collaborator Author

@dbenn dbenn left a comment

Choose a reason for hiding this comment

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

Thanks @mpyat2

@mpyat2
Copy link
Collaborator

mpyat2 commented Jun 16, 2023

Hi @dbenn ,
yes, please merge it!

@dbenn dbenn merged commit 7de6790 into master Jun 16, 2023
24 checks passed
@dbenn dbenn deleted the 325-observation-details-are-always-strings branch June 16, 2023 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mpyat2 mpyat2 mpyat2 approved these changes

Assignees

@dbenn dbenn

Labels
bug Something isn't working enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Observation details are always strings Add bitwise operators to VeLa
2 participants
@dbenn @mpyat2