Open spc93 opened 3 months ago
Hi Paul, can you update the PR, with diff showing only updated lines ? thanks
Hi @rduyme,
The pull request is actually from @spc93, not from me!
But, I agree: rebasing the commit would be a good idea, as f2a588bfec should result in a smaller patch.
@spc93, just let me know if you would like a hand doing this.
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.
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.
Thanks Paul. If I follow you SOP document from the start then will that do what you suggest? Steve
From: Paul Millar @.> Sent: Tuesday, September 3, 2024 1:18 PM To: ExPaNDS-eu/ExPaNDS-experimental-techniques-ontology @.> Cc: Collins, Steve (DLSLtd,RAL,SCI) @.>; Mention @.> Subject: Re: [ExPaNDS-eu/ExPaNDS-experimental-techniques-ontology] SS-112-115-118 Modification of PaNET01236, PaNET01106, PaNET01196 (PR #149)
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.
- Reply to this email directly, view it on GitHubhttps://github.com/ExPaNDS-eu/ExPaNDS-experimental-techniques-ontology/pull/149#issuecomment-2326377087, or unsubscribehttps://github.com/notifications/unsubscribe-auth/ADGIGMD2MGUOHIYS4I5NE5LZUWSGRAVCNFSM6AAAAABMF6LX22VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDGMRWGM3TOMBYG4. You are receiving this because you were mentioned.Message ID: @.**@.>>
This e-mail and any attachments may contain confidential, copyright and or privileged material, and are for the use of the intended addressee only. If you are not the intended addressee or an authorised recipient of the addressee please notify us of receipt by returning the e-mail and do not use, copy, retain, distribute or disclose the information in or attached to the e-mail. Any opinions expressed within this e-mail are those of the individual and not necessarily of Diamond Light Source Ltd. Diamond Light Source Ltd. cannot guarantee that this e-mail or any attachments are free from viruses and we cannot accept liability for any damage which you may sustain as a result of software viruses which may be transmitted in or with the message. Diamond Light Source Limited (company no. 4375679). Registered in England and Wales with its registered office at Diamond House, Harwell Science and Innovation Campus, Didcot, Oxfordshire, OX11 0DE, United Kingdom.
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