fix: Deltoid wrapping

Body/AAUHuman/Arm/ArmData1.1/ArmModelParameters.any

@@ -102,6 +102,8 @@ AnyFolder Humerus = {
   AnyFloat art_tub_majus_pos = {0.021, 0.009 , -0.02}+OffSet;
   AnyFloat sulcus_intertubercularis_pos = {0.017500, -0.023000, -0.0175000}+OffSet; // 0.5*(.art_tub_majus.sRel+.art_tub_minus.sRel)+.Scale({.....Sign*0.003,0.0,0.0}); // midpoint
   AnyFloat sulcus_intertubercularisTop_pos = {0.017, 0.023000, -0.02650}+OffSet; //.sulcus_intertubercularis.sRel+.Scale({.....Sign*-0.005,0.015,0.003});
+  AnyFloat Deltoid_hum = {0.0006969078, -0.145082, 0.007705414};
+  AnyFloat Deltoid_hum_p3 = {0.012821, -0.13903, 0.01491};
 
 #if BM_ARM_DELTOID_WRAPPING == _DELTOID_WRAPPING_RAKE_
   AnyFloat I_deltoideus_scapular_part_1_pos         = {0.009442, -0.095031 , -0.005209}+{0,0,0.005}+ds1;
@@ -460,9 +462,20 @@ AnyFolder Ulna = {
 AnyFolder Scapula = {
   AnyFloat sCoM_pos = {-0.06,-0.04,0.02};
 
-  AnyFloat deltoid_cyl_P2_pos = {0.027588, -0.047361, -0.015292};
-  AnyFloat deltoid_cyl_P3_pos = {-0.128825, -0.129236, 0.024150};
-
+  AnyFloat deltoid_cyl_P1_pos = {-0.1307360, -0.1302360, 0.006280000}+{0,0.02,0};
+  AnyFloat deltoid_cyl_P2_pos = {0.027588, -0.047361, -0.015292}+{0,0.02,0};
+  AnyFloat deltoid_cyl_P3_pos = {-0.128825, -0.129236, 0.024150}+{0,0.02,0};
+//  AnyFloat Deltoid_Cyl_P1_pos = {-0.1307360, -0.1302360, 0.006280000};//+{0,0.02,0};
+//  AnyFloat Deltoid_Cyl_P2_pos = {0.027588, -0.047361, -0.015292};//+{0,0.02,0};
+//  AnyFloat Deltoid_Cyl_P3_pos = {-0.001,-0.048,-0.030};//{-0.128825, -0.129236, 0.024150};//+{0,0.02,0};
+//  AnyFloat Deltoid_Anterior_Cyl1_pos = {0.02339800, -0.05086300, -0.03438100}+{-0.1,0.06,-0.1};
+//  AnyFloat Deltoid_Anterior_Cyl2_pos = {0.02339800, -0.05086300, -0.03438100}+{-0.1,0.06,-0.08}+{0,-0.03,-0.01};
+//  AnyFloat Deltoid_Anterior_Cyl_pos = {0.02339800, -0.05086300, -0.03438100}+{-0.1,0.06,-0.06};
+//  AnyFloat Deltoid_Anterior_CylStop1_pos = {0.02339800, -0.05086300, -0.03438100}+{0.05,0.04,0.0};
+//  AnyFloat Deltoid_Anterior_CylStop2_pos = {0.02339800, -0.05086300, -0.03438100}+{0.05,0.04,-0.01};
+//  AnyFloat Deltoid_Anterior_CylStop3_pos = {0.02339800, -0.05086300, -0.03438100}+{0.05,0.04,-0.03};
+//  AnyFloat Deltoid_Anterior_CylStop4_pos = {0.02339800, -0.05086300, -0.03438100}+{0.05,0.04,-0.05};
+
   AnyFloat margo_medialis_P2_pos= {-0.1114460,  0.0300000, -0.003720};
   AnyFloat margo_medialis_P3_pos= {-0.1157360, -0.1402360,  0.01628000};
   AnyFloat margo_medialis_pos = {-0.1157360, -0.1402360, 0.006280000};

Body/AAUHuman/Arm/CalEllipsMembers_3nodes.any

@@ -0,0 +1,19 @@
+// Define ellipsoid's raduis, sRel, and ARel based on origin and insertion nodes
+AnyFloat pos_node1 = .HumerusRef.r0 + (.HumerusRef.Axes0 * Node1.sRel')'-.r0;
+AnyFloat pos_node2 ??=  .ScapulaRef.r0 + (.ScapulaRef.Axes0 * Node2.sRel')'-.r0;
+AnyFloat axes_node2 ??= .ScapulaRef.Axes0 * Node2.ARel;
+AnyFloat pos_node3 ??= .ScapulaRef.r0 + (.ScapulaRef.Axes0 * Node3.sRel')'-.r0;
+AnyFloat pos_gh = .ScapulaRef.r0 + (.ScapulaRef.Axes0 * .ScapulaRef.gh.sRel')'-.r0;
+
+AnyFloat Rxy ??= ...DeltoidWrappingPosterior.WrappingSegment.AlignmentRefNode.Deltoid_Scapula_Cyl.cyl.Radius;//.....Segments.Scapula.Deltoid_Scapula_Cyl.cyl.Radius;//vnorm( (pos_node2 - pos_node1) )/5;
+AnyFloat Rz = Rxy*5;
+//AnyFloat DistanceRatio ??= 1.45;
+//AnyFloat AdjustorDirection ??= {1,.....Sign*0.3,0};
+AnyFloat AdjustorXRotation ??= pi/2;
+Radius = {Rxy, Rxy, Rz};
+AnyFloat Sizes = Radius;
+AnyMatrix RotMatrix ??= RotMat(pos_node1, pos_node2, pos_node3) * RotMat(AdjustorXRotation,x);
+sRel ??= pos_gh;//(pos_node2 + pos_node1)/2;// + Rxy*DistanceRatio * (RotMatrix*(AdjustorDirection/vnorm(AdjustorDirection))')';
+ARel ??= RotMatrix * RotMat(pi/2 - .....Sign * pi/2,x);
+
+// viewSurface = {Visible = On; Opacity = 0.1; RGB = {0.5, 0.1, 0.1}; Transparency = 0.7; };

Body/AAUHuman/Arm/Calibration/ShoulderCal.any

@@ -332,7 +332,7 @@ AnyBodyCalibrationStudy ArmCalibrationStudyShoulder = {
   AnyFolder &ref=.ShoulderCal;
   nStep = SizesOf(ref.GHPosData)[1]*6;
   FiberAndTendonLengthAdjustment.CalibrateTendonAtMaxForceOnOff = On;
-  Kinematics.SmallStepAssumptionOnOff = On;
+  Kinematics.SmallStepAssumptionOnOff = Off;
   Kinematics.PosAnalysisOnlyOnOff = On;
   InitialConditions.PosAnalysisOnlyOnOff = On;
 

Body/AAUHuman/Arm/Calibration/SpineDependentCal.any

@@ -292,7 +292,7 @@ AnyBodyCalibrationStudy ArmCalibrationStudySpineDependent = {
   AnyFolder &ref=.SpineDependentCal;
   nStep = 8;
 
-  Kinematics.SmallStepAssumptionOnOff = On;
+  Kinematics.SmallStepAssumptionOnOff = Off;
   Kinematics.PosAnalysisOnlyOnOff = On;
   InitialConditions.PosAnalysisOnlyOnOff = On;