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

Update auxiliaryfunctions.py and double angles #46

Merged
merged 3 commits into from
Dec 13, 2023

Conversation

TedBrierley
Copy link
Contributor

1.Update auxiliaryfunctions.py

using the following data

joints_dict['Nearfrontfoot'] = ['Shoulder', 'Nearfrontfoot', 'Stifle']

                     x                      y                      z (liklehood)

Shoulder 649.29443 355.67105 0.31627

Nearfrontfoot 604.79279 555.68231 0.92415

Stifle 519.55591 358.85684 0.03888

Existing Code

q shortest rotation -0.002116213557255 -0.003361624154413 0.951158771281366

quaternion angle -0.242500855 -0.38521442 144.037938

quaternion scaler 0.22098 0.21534 0.21723

angle_rotation_quaternion 144.041017105924 degrees

Modified Code

q shortest rotation 0.000686756082122 0.001090930770238 -0.308673859961963

quaternion angle 0.0786972977 0.125011118 -35.9586586

quaternion scaler 0.83145863 0.83615687 0.83452721

angle_rotation_quaternion 35.9589828940757 degrees

  1. Update double angles reflects above plus calculating padj correctly

Update auxiliaryfunctions.py  and  double angles
using the following data 

joints_dict['Nearfrontfoot'] = ['Shoulder', 'Nearfrontfoot', 'Stifle']

                         x                      y                      z (liklehood)

Shoulder        649.29443       355.67105       0.31627

Nearfrontfoot   604.79279       555.68231       0.92415

Stifle          519.55591       358.85684       0.03888

Existing Code

q shortest rotation -0.002116213557255     -0.003361624154413     0.951158771281366

quaternion angle -0.242500855     -0.38521442     144.037938

quaternion scaler 0.22098     0.21534      0.21723

angle_rotation_quaternion 144.041017105924 degrees

Modified Code

q shortest rotation 0.000686756082122     0.001090930770238     -0.308673859961963

quaternion angle 0.0786972977     0.125011118      -35.9586586

quaternion scaler 0.83145863     0.83615687     0.83452721

angle_rotation_quaternion 35.9589828940757 degrees

Second change in double angles reflects above plus calculating padj correctly
Update auxiliaryfunctions.py  and  double angles
using the following data 

joints_dict['Nearfrontfoot'] = ['Shoulder', 'Nearfrontfoot', 'Stifle']

                         x                      y                      z (liklehood)

Shoulder        649.29443       355.67105       0.31627

Nearfrontfoot   604.79279       555.68231       0.92415

Stifle          519.55591       358.85684       0.03888

Existing Code

q shortest rotation -0.002116213557255     -0.003361624154413     0.951158771281366

quaternion angle -0.242500855     -0.38521442     144.037938

quaternion scaler 0.22098     0.21534      0.21723

angle_rotation_quaternion 144.041017105924 degrees

Modified Code

q shortest rotation 0.000686756082122     0.001090930770238     -0.308673859961963

quaternion angle 0.0786972977     0.125011118      -35.9586586

quaternion scaler 0.83145863     0.83615687     0.83452721

angle_rotation_quaternion 35.9589828940757 degrees

Second change in double angles reflects above plus calculating padj correctly
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome! Thank you for your contribution!

Copy link
Contributor

@jeylau jeylau left a comment

Choose a reason for hiding this comment

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

Thanks @TedBrierley, this looks good to me! I have just suggested one minor change to make to improve the calculation of the arc tangent.

src/dlc2kinematics/utils/auxiliaryfunctions.py Outdated Show resolved Hide resolved
@TedBrierley
Copy link
Contributor Author

I agree with the suggested change.

@jeylau
Copy link
Contributor

jeylau commented Dec 13, 2023

Thanks once again @TedBrierley!

@jeylau jeylau merged commit dd2b036 into AdaptiveMotorControlLab:master Dec 13, 2023
11 checks passed
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