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

SS-112-115-118 Modification of PaNET01236, PaNET01106, PaNET01196 #149

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

spc93
Copy link
Collaborator

@spc93 spc93 commented Aug 8, 2024

ISS-112

Motivation:
'neutron single crystal diffraction' is not currently a subclass of 'neutron diffraction'

Mofification:
Current definition:
subclass of:
single crystal diffraction
neutron probe

Proposed new definition:
subclass of:
single crystal diffraction
neutron diffraction

Result:
Since 'neutron diffraction' is subclass of 'neutron probe' this change should only have the effect of making 'neutron single crystal diffraction' a subclass of 'neutron diffraction'.

Closes: #112

................

ISS-115

Motivation:
'obtain spatial map' is a subclass of 'defined by functional dependence'. This is wrong because 'obtain spatial map' (equivalent to 'imaging') may be obtained via a different functional dependence, e.g. a measurement in reciprocal space. The problem is in the definition of 'imaging'.

Modification:
Remove 'defined by functional dependence' from the definition of imaging.

Current definition:
subclass of:
'defined by functional dependence'
equivalent to:
obtain spatial map

New definition:
equivalent to:
obtain spatial map

Result:
Imaging (equivalent to 'obtain spatial map') is no longer a subclass of 'defined by functional dependence'

Closes: #115

................

ISS-118

Motivation:
'x-ray absorption spectroscopy' is not currently a subclass of 'x-ray absorption'

Modification:
Current definition:
subclass of:
x-ray probe
atomic core excitation
absorption spectroscopy

New definition:
subclass of:
x-ray absorption
atomic core excitation
absorption spectroscopy

Result:
Since 'x-ray absorption' is subclass of 'x-ray probe' this change should only have the effect of making 'x-ray absorption spectroscopy' a subclass of 'x-ray absorption'

Closes: #118

ISS-112

Motivation:
'neutron single crystal diffraction' is not currently a subclass of 'neutron diffraction'

Mofification:
Current definition:
subclass of:
single crystal diffraction
neutron probe

Proposed new definition:
subclass of:
single crystal diffraction
neutron diffraction

Result:
Since 'neutron diffraction' is subclass of 'neutron probe' this change should only have the effect of making 'neutron single crystal diffraction' a subclass of 'neutron diffraction'.

Closes: #112

................

ISS-115

Motivation:
'obtain spatial map' is a subclass of 'defined by functional dependence'. This is wrong because 'obtain spatial map' (equivalent to 'imaging') may be obtained via a different functional dependence, e.g. a measurement in reciprocal space. The problem is in the definition of 'imaging'.

Modification:
Remove 'defined by functional dependence' from the definition of imaging.

Current definition:
subclass of:
'defined by functional dependence'
equivalent to:
obtain spatial map

New definition:
equivalent to:
obtain spatial map

Result:
Imaging (equivalent to 'obtain spatial map') is no longer a subclass of 'defined by functional dependence'

Closes: #115

................

ISS-118

Motivation:
'x-ray absorption spectroscopy' is not currently a subclass of 'x-ray absorption'

Modification:
Current definition:
subclass of:
x-ray probe
atomic core excitation
absorption spectroscopy

New definition:
subclass of:
x-ray absorption
atomic core excitation
absorption spectroscopy

Result:
Since 'x-ray absorption' is subclass of 'x-ray probe' this change should only have the effect of making 'x-ray absorption spectroscopy' a subclass of 'x-ray absorption'

Closes: #118
@spc93 spc93 requested a review from paulmillar August 8, 2024 08:20
@rduyme
Copy link
Collaborator

rduyme commented Aug 22, 2024

Hi Paul, can you update the PR, with diff showing only updated lines ? thanks

@paulmillar
Copy link
Contributor

Hi @rduyme,

The pull request is actually from @spc93, not from me!

But, I agree: rebasing the commit would be a good idea, as f2a588b should result in a smaller patch.

@spc93, just let me know if you would like a hand doing this.

@spc93
Copy link
Collaborator Author

spc93 commented Sep 3, 2024

Thanks Paul. I think it works OK now using LibreOffice calc. File differences are then minimal.
Shall I abandon this and start again with a new commit? I think I'll delete everything and start from scratch.

@paulmillar
Copy link
Contributor

Certainly, I would recommend creating a new branch. Be careful that the new branch comes from the tip of the master branch, not from the current branch (ISS-112-115-118-modific[...]PaNET01196).

Within this new branch, it might be easiest to edit the file directly (with the content from the current tip of master), rather than trying to "cherry-pick" (==copy) the changes from the current branch (ISS-112-115-118-modific[...]PaNET01196) that you would then have to update.

Editing the file directly would mean redoing your changes, but (I think) it's more likely to work.

@spc93
Copy link
Collaborator Author

spc93 commented Sep 3, 2024 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants