designix 0.5.29 → 0.5.31

package/dist/index.js

@@ -1432,7 +1432,7 @@ import {
   checkGeom as checkGeom3,
   prefixLog as prefixLog3,
   figure as figure8,
-  degToRad as degToRad4,
+  degToRad as degToRad5,
   radToDeg as radToDeg6,
   ffix as ffix10,
   pNumber as pNumber8,
@@ -1448,6 +1448,7 @@ import {
   prefixLog as prefixLog2,
   contour as contour6,
   contourCircle as contourCircle4,
+  ctrOblong,
   figure as figure4,
   radToDeg as radToDeg3,
   ffix as ffix6,
@@ -2091,8 +2092,13 @@ function pGeom4(t, param, suffix = "") {
     }
     const ctrDoorFace = function(pL2) {
       const R4b = R4 - pL2;
-      const H3b = param.H3 + R4;
-      const rCtrDoorFace = contour6(R4b, H3b + doorStraightLenght).addPointR(-R4b, R4b).addSegArc(R4b, false, true).addPointR(-R4b, -R4b).addSegArc(R4b, false, true).addSegStrokeR(0, -doorStraightLenght).addPointR(R4b, -R4b).addSegArc(R4b, false, true).addPointR(R4b, R4b).addSegArc(R4b, false, true).closeSegStroke();
+      const rCtrDoorFace = ctrOblong(
+        0,
+        param.H3 + R4 - R4b,
+        2 * R4b,
+        doorStraightLenght + 2 * R4b,
+        Math.PI / 2
+      );
       return rCtrDoorFace;
     };
     figFace.addMain(ctrDoorFace(0));
@@ -2349,7 +2355,11 @@ var poleStaticDef = {
 import {
   contour as contour7,
   contourCircle as contourCircle5,
+  ctrRectangle,
+  ctrRectRot,
+  ctrTrapezoid,
   figure as figure5,
+  degToRad as degToRad4,
   radToDeg as radToDeg4,
   ffix as ffix7,
   pNumber as pNumber5,
@@ -2393,7 +2403,8 @@ var pDef5 = {
     pNumber5("H6", "mm", 100, 1, 1e3, 10),
     pNumber5("H7", "mm", 600, 10, 2e3, 10),
     pNumber5("L9", "mm", 300, 1, 1e3, 10),
-    pNumber5("R9", "mm", 50, 0, 300, 1)
+    pNumber5("R9", "mm", 50, 0, 300, 1),
+    pNumber5("doorOrientation", "degree", 0, -180, 180, 1)
   ],
   paramSvg: {
     D1: "rake_face.svg",
@@ -2423,7 +2434,8 @@ var pDef5 = {
     H6: "rake_door.svg",
     H7: "rake_door.svg",
     L9: "rake_door.svg",
-    R9: "rake_door.svg"
+    R9: "rake_door.svg",
+    doorOrientation: "rake_door.svg"
   },
   sim: {
     tMax: 180,
@@ -2434,10 +2446,8 @@ var pDef5 = {
 };
 function pGeom5(t, param, suffix = "") {
   const rGeome = initGeom5(pDef5.partName + suffix);
-  let ctrCone;
-  let ctrConePlus;
-  let ctrRect;
   const figCone = figure5();
+  const figConeHollow = figure5();
   const figBeam = figure5();
   const figBeamHollow = figure5();
   const figDisc = figure5();
@@ -2458,28 +2468,6 @@ function pGeom5(t, param, suffix = "") {
     const R8 = param.D8 / 2;
     const H1H2 = param.H1 + param.H2;
     const H1H5 = H1H2 - param.H4 + param.H5;
-    rGeome.logstr += `cone-height: ${ffix7(H1H2)} mm
-`;
-    rGeome.logstr += `cone-height total: ${ffix7(H1H5)} mm
-`;
-    if (param.D2 > param.D1) {
-      throw `err110: D2 ${param.D2} is larger than D1 ${param.D1}`;
-    }
-    if (param.D3 + param.E1 > param.D1) {
-      throw `err113: D3 ${param.D3} is too large compare to D1 ${param.D1} and E1 ${param.E1}`;
-    }
-    if (param.H3 + param.E3 > param.H1) {
-      throw `err116: H3 ${param.H3} is too large compare to H1 ${param.H1} and E3 ${param.E3}`;
-    }
-    if (param.H4 + R4 > param.H2) {
-      throw `err119: H4 ${param.H4} is too large compare to H2 ${param.H2} and D4 ${param.D4}`;
-    }
-    if (param.E4 > R4) {
-      throw `err122: E4 ${param.E4} is too large compare to D4 ${param.D4}`;
-    }
-    if (param.D8 <= param.D5) {
-      throw `err146: D8 ${param.D8} is too small compare to D5 ${param.D5}`;
-    }
     const beamL = 4 * param.L4 + param.L5 + 2 * param.L6;
     const beamH = param.H1 + param.H2 - param.H4;
     const handLowX = R4 * Math.cos(Math.PI / 6);
@@ -2490,17 +2478,10 @@ function pGeom5(t, param, suffix = "") {
     const handHighYext = R8 * Math.sin(Math.PI / 6);
     const handPos = [-beamL / 2, -param.L5 / 2 - param.L4, param.L5 / 2, beamL / 2 - param.L4];
     const wingLy = param.H2 - param.L8 - param.H4 - R4;
-    if (wingLy < 0) {
-      throw `err140: H2 ${param.H2} too small compare to L8 ${param.L8}, H4 ${param.H4} and D4 ${param.D4}`;
-    }
     const coneAngle = Math.atan2(R1 - R2, param.H2);
-    rGeome.logstr += `cone-angle: ${ffix7(radToDeg4(coneAngle))} degree
-`;
     const wingLx = beamL / 2 - param.L7 - R1 + param.L8 * Math.tan(coneAngle);
     const wingL = Math.sqrt(wingLx ** 2 + wingLy ** 2);
     const wingAngle = Math.atan2(wingLx, wingLy);
-    rGeome.logstr += `wing-angle: ${ffix7(radToDeg4(wingAngle))} degree
-`;
     const wingLPre = param.E1 / Math.sin(wingAngle + coneAngle);
     const wingL2 = wingL + param.E4 / Math.cos(wingAngle) + wingLPre;
     const wingPosX = R1 - param.L8 * Math.tan(coneAngle) - wingLPre * Math.sin(wingAngle);
@@ -2513,49 +2494,82 @@ function pGeom5(t, param, suffix = "") {
     const wingAngleC = Math.PI / 2 - wingAngle;
     const doorLowX = param.L9 / 2;
     const doorHighX = doorLowX - param.H7 * Math.tan(coneAngle);
+    if (param.D2 > param.D1) {
+      throw `err110: D2 ${param.D2} is larger than D1 ${param.D1}`;
+    }
+    if (param.D3 + param.E1 > param.D1) {
+      throw `err113: D3 ${param.D3} is too large compare to D1 ${param.D1} and E1 ${param.E1}`;
+    }
+    if (param.H3 + param.E3 > param.H1) {
+      throw `err116: H3 ${param.H3} is too large compare to H1 ${param.H1} and E3 ${param.E3}`;
+    }
+    if (param.H4 + R4 > param.H2) {
+      throw `err119: H4 ${param.H4} is too large compare to H2 ${param.H2} and D4 ${param.D4}`;
+    }
+    if (param.E4 > R4) {
+      throw `err122: E4 ${param.E4} is too large compare to D4 ${param.D4}`;
+    }
+    if (param.D8 <= param.D5) {
+      throw `err146: D8 ${param.D8} is too small compare to D5 ${param.D5}`;
+    }
+    if (wingLy < 0) {
+      throw `err140: H2 ${param.H2} too small compare to L8 ${param.L8}, H4 ${param.H4} and D4 ${param.D4}`;
+    }
     if (doorHighX < param.R9) {
       throw `err177: R9 ${param.R9} too large compare to doorHighX ${doorHighX} and L9 ${param.L9}`;
     }
     if (param.L9 > param.D1) {
       throw `err180: L9 ${param.L9} too large compare to D1 ${param.D1}`;
     }
+    rGeome.logstr += `cone-height: ${ffix7(H1H2)} mm
+`;
+    rGeome.logstr += `cone-height total: ${ffix7(H1H5)} mm
+`;
+    rGeome.logstr += `cone-angle: ${ffix7(radToDeg4(coneAngle))} degree
+`;
+    rGeome.logstr += `wing-angle: ${ffix7(radToDeg4(wingAngle))} degree
+`;
     const coneSlopeX = param.E1 * Math.cos(coneAngle);
     const coneSlopeY = param.E1 * Math.sin(coneAngle);
     const coneFC = param.E1 * Math.tan(coneAngle / 2);
-    ctrCone = function(orient) {
+    const ctrCone = function(orient) {
       const rCtr = contour7(orient * R1, 0).addSegStrokeA(orient * R1, param.H1).addSegStrokeA(orient * R2, H1H2).addSegStrokeA(orient * (R2 - coneSlopeX), H1H2 - coneSlopeY).addSegStrokeA(orient * (R1 - param.E1), param.H1 - coneFC).addSegStrokeA(orient * (R1 - param.E1), 0).closeSegStroke();
       return rCtr;
     };
-    ctrConePlus = function(orient) {
+    const ctrConePlus = function(orient) {
       const rCtr = contour7(orient * R1, 0).addSegStrokeA(orient * R1, param.H1).addSegStrokeA(orient * R2, H1H2).addSegStrokeA(orient * (R2 - coneSlopeX), H1H2 - coneSlopeY).addSegStrokeA(orient * (R1 - param.E1), param.H1 - coneFC).addSegStrokeA(orient * (R1 - param.E1), param.H1 - param.H3).addSegStrokeA(orient * R3, param.H1 - param.H3).addSegStrokeA(orient * R3, param.H1 - param.H3 - param.E3).addSegStrokeA(orient * (R1 - param.E1), param.H1 - param.H3 - param.E3).addSegStrokeA(orient * (R1 - param.E1), 0).closeSegStroke();
       return rCtr;
     };
-    ctrRect = function(width, height, xpos, ypos, angle) {
-      const xWidth = width * Math.cos(angle);
-      const yWidth = width * Math.sin(angle);
-      const xHeight = -height * Math.sin(angle);
-      const yHeight = height * Math.cos(angle);
-      const rCtr = contour7(xpos, ypos).addSegStrokeA(xpos + xWidth, ypos + yWidth).addSegStrokeA(xpos + xWidth + xHeight, ypos + yWidth + yHeight).addSegStrokeA(xpos + xHeight, ypos + yHeight).closeSegStroke();
-      return rCtr;
-    };
-    const ctrDoor = contour7(doorLowX, param.H1 + param.H6).addCornerRounded(param.R9).addSegStrokeA(doorHighX, param.H1 + param.H6 + param.H7).addCornerRounded(param.R9).addSegStrokeA(-doorHighX, param.H1 + param.H6 + param.H7).addCornerRounded(param.R9).addSegStrokeA(-doorLowX, param.H1 + param.H6).addCornerRounded(param.R9).closeSegStroke();
+    const coneHollowHeight2 = beamH - R4 - (param.H1 - coneFC);
+    const coneHollowR2 = R1 - param.E1 - Math.tan(coneAngle) * coneHollowHeight2;
+    const ctrConeHollow = contour7(0, beamH - R4).addSegStrokeA(coneHollowR2, beamH - R4).addSegStrokeA(R1 - param.E1, param.H1 - coneFC).addSegStrokeA(R1 - param.E1, param.H1 - param.H3).addSegStrokeA(0, param.H1 - param.H3).closeSegStroke();
+    const ctrDoor = ctrTrapezoid(
+      -doorLowX,
+      param.H1 + param.H6,
+      param.L9,
+      2 * doorHighX,
+      param.H7,
+      param.R9
+    );
     figCone.addMain(ctrCone(1));
     figCone.addSecond(ctrConePlus(1));
     figCone.addSecond(ctrConePlus(-1));
-    figCone.addSecond(ctrRect(beamL, param.D4, -beamL / 2, beamH - R4, 0));
+    figCone.addSecond(ctrRectangle(-beamL / 2, beamH - R4, beamL, param.D4));
     figCone.addSecond(
-      ctrRect(beamL, param.D4 - 2 * param.E4, -beamL / 2, beamH - R4 + param.E4, 0)
+      ctrRectangle(-beamL / 2, beamH - R4 + param.E4, beamL, param.D4 - 2 * param.E4)
     );
     for (const posX of handPos) {
       figCone.addSecond(
-        ctrRect(param.L4, param.H5 - handLowY - handHighYint, posX, beamH + handLowY, 0)
+        ctrRectangle(posX, beamH + handLowY, param.L4, param.H5 - handLowY - handHighYint)
       );
     }
-    figCone.addSecond(ctrRect(wingL2, 2 * R6, wingPosX, wingPosY, wingAngleC));
-    figCone.addSecond(ctrRect(wingL2, 2 * wingHR, wingHPosX, wingHPosY, wingAngleC));
-    figCone.addSecond(ctrRect(2 * R6, wingL2, -wingPosX, wingPosY, wingAngle));
-    figCone.addSecond(ctrRect(2 * wingHR, wingL2, -wingHPosX, wingHPosY, wingAngle));
+    figCone.addSecond(ctrRectRot(wingPosX, wingPosY, wingL2, 2 * R6, wingAngleC));
+    figCone.addSecond(ctrRectRot(wingHPosX, wingHPosY, wingL2, 2 * wingHR, wingAngleC));
+    figCone.addSecond(ctrRectRot(-wingPosX, wingPosY, 2 * R6, wingL2, wingAngle));
+    figCone.addSecond(ctrRectRot(-wingHPosX, wingHPosY, 2 * wingHR, wingL2, wingAngle));
     figCone.addSecond(ctrDoor);
+    figConeHollow.mergeFigure(figCone, true);
+    figConeHollow.addMain(ctrConeHollow);
     const ctrHand = contour7(handLowX, beamH + handLowY).addSegStrokeA(handHighXext, beamH + param.H5 - handHighYext).addSegStrokeA(handHighXint, beamH + param.H5 - handHighYint).addPointA(-handHighXint, beamH + param.H5 - handHighYint).addSegArc(R5, false, false).addSegStrokeA(-handHighXext, beamH + param.H5 - handHighYext).addSegStrokeA(-handLowX, beamH + handLowY).closeSegArc(R4, false, false);
     figBeam.addMain(contourCircle5(0, beamH, R4));
     figBeam.addMain(contourCircle5(0, beamH, R4 - param.E4));
@@ -2563,8 +2577,8 @@ function pGeom5(t, param, suffix = "") {
     figBeam.addSecond(ctrConePlus(-1));
     figBeam.addSecond(ctrHand);
     figBeam.addSecond(contourCircle5(0, beamH + param.H5, R5));
-    figBeam.addSecond(ctrRect(2 * R6, wingLy, -R6, param.H1 + param.L8, 0));
-    figBeam.addSecond(ctrRect(2 * wingHR, wingLy, -wingHR, param.H1 + param.L8, 0));
+    figBeam.addSecond(ctrRectangle(-R6, param.H1 + param.L8, 2 * R6, wingLy));
+    figBeam.addSecond(ctrRectangle(-wingHR, param.H1 + param.L8, 2 * wingHR, wingLy));
     figBeam.addSecond(ctrDoor);
     figBeamHollow.addMain(contourCircle5(0, beamH, R4 - param.E4));
     figBeamHollow.addSecond(contourCircle5(0, beamH, R4));
@@ -2580,22 +2594,22 @@ function pGeom5(t, param, suffix = "") {
     }
     figDisc.addSecond(contourCircle5(0, 0, R1 - param.E1));
     figDisc.addSecond(contourCircle5(0, 0, R2));
-    figDisc.addSecond(ctrRect(param.D4, beamL, -R4, -beamL / 2, 0));
-    figDisc.addSecond(ctrRect(param.D4 - 2 * param.E4, beamL, -R4 + param.E4, -beamL / 2, 0));
+    figDisc.addSecond(ctrRectangle(-R4, -beamL / 2, param.D4, beamL));
+    figDisc.addSecond(ctrRectangle(-R4 + param.E4, -beamL / 2, param.D4 - 2 * param.E4, beamL));
     for (const posX of handPos) {
-      figDisc.addSecond(ctrRect(2 * handLowX, param.L4, -handLowX, posX, 0));
-      figDisc.addSecond(ctrRect(2 * handHighXint, param.L4, -handHighXint, posX, 0));
-      figDisc.addSecond(ctrRect(2 * handHighXext, param.L4, -handHighXext, posX, 0));
+      figDisc.addSecond(ctrRectangle(-handLowX, posX, 2 * handLowX, param.L4));
+      figDisc.addSecond(ctrRectangle(-handHighXint, posX, 2 * handHighXint, param.L4));
+      figDisc.addSecond(ctrRectangle(-handHighXext, posX, 2 * handHighXext, param.L4));
     }
-    figDisc.addSecond(ctrRect(2 * R6, wingLx, -R6, R1 - param.L8 * Math.tan(coneAngle), 0));
+    figDisc.addSecond(ctrRectangle(-R6, R1 - param.L8 * Math.tan(coneAngle), 2 * R6, wingLx));
     figDisc.addSecond(
-      ctrRect(2 * wingHR, wingLx, -wingHR, R1 - param.L8 * Math.tan(coneAngle), 0)
+      ctrRectangle(-wingHR, R1 - param.L8 * Math.tan(coneAngle), 2 * wingHR, wingLx)
     );
     figDisc.addSecond(
-      ctrRect(2 * R6, wingLx, -R6, -R1 + param.L8 * Math.tan(coneAngle) - wingLx, 0)
+      ctrRectangle(-R6, -R1 + param.L8 * Math.tan(coneAngle) - wingLx, 2 * R6, wingLx)
     );
     figDisc.addSecond(
-      ctrRect(2 * wingHR, wingLx, -wingHR, -R1 + param.L8 * Math.tan(coneAngle) - wingLx, 0)
+      ctrRectangle(-wingHR, -R1 + param.L8 * Math.tan(coneAngle) - wingLx, 2 * wingHR, wingLx)
     );
     figHand.addMain(ctrHand);
     figHand.addSecond(contourCircle5(0, beamH, R4));
@@ -2608,21 +2622,22 @@ function pGeom5(t, param, suffix = "") {
     figDoor.addMain(ctrDoor);
     figDoor.addSecond(ctrConePlus(1));
     figDoor.addSecond(ctrConePlus(-1));
-    figDoor.addSecond(ctrRect(beamL, param.D4, -beamL / 2, beamH - R4, 0));
+    figDoor.addSecond(ctrRectangle(-beamL / 2, beamH - R4, beamL, param.D4));
     figDoor.addSecond(
-      ctrRect(beamL, param.D4 - 2 * param.E4, -beamL / 2, beamH - R4 + param.E4, 0)
+      ctrRectangle(-beamL / 2, beamH - R4 + param.E4, beamL, param.D4 - 2 * param.E4)
     );
     for (const posX of handPos) {
       figDoor.addSecond(
-        ctrRect(param.L4, param.H5 - handLowY - handHighYint, posX, beamH + handLowY, 0)
+        ctrRectangle(posX, beamH + handLowY, param.L4, param.H5 - handLowY - handHighYint)
       );
     }
-    figDoor.addSecond(ctrRect(wingL2, 2 * R6, wingPosX, wingPosY, wingAngleC));
-    figDoor.addSecond(ctrRect(wingL2, 2 * wingHR, wingHPosX, wingHPosY, wingAngleC));
-    figDoor.addSecond(ctrRect(2 * R6, wingL2, -wingPosX, wingPosY, wingAngle));
-    figDoor.addSecond(ctrRect(2 * wingHR, wingL2, -wingHPosX, wingHPosY, wingAngle));
+    figDoor.addSecond(ctrRectRot(wingPosX, wingPosY, wingL2, 2 * R6, wingAngleC));
+    figDoor.addSecond(ctrRectRot(wingHPosX, wingHPosY, wingL2, 2 * wingHR, wingAngleC));
+    figDoor.addSecond(ctrRectRot(-wingPosX, wingPosY, 2 * R6, wingL2, wingAngle));
+    figDoor.addSecond(ctrRectRot(-wingHPosX, wingHPosY, 2 * wingHR, wingL2, wingAngle));
     rGeome.fig = {
       faceCone: figCone,
+      faceConeHollow: figConeHollow,
       faceBeam: figBeam,
       faceBeamHollow: figBeamHollow,
       faceDisc: figDisc,
@@ -2652,6 +2667,13 @@ function pGeom5(t, param, suffix = "") {
           rotate: [0, 0, 0],
           translate: [0, 0, 0]
         },
+        {
+          outName: `subpax_${designName}_coneHollow`,
+          face: `${designName}_faceConeHollow`,
+          extrudeMethod: EExtrude4.eRotate,
+          rotate: [0, 0, 0],
+          translate: [0, 0, 0]
+        },
         {
           outName: `subpax_${designName}_beam`,
           face: `${designName}_faceBeam`,
@@ -2713,7 +2735,7 @@ function pGeom5(t, param, suffix = "") {
           face: `${designName}_faceDoor`,
           extrudeMethod: EExtrude4.eLinearOrtho,
           length: param.D1,
-          rotate: [Math.PI / 2, 0, Math.PI / 2],
+          rotate: [Math.PI / 2, 0, -Math.PI / 2 + degToRad4(param.doorOrientation)],
           translate: [0, 0, 0]
         },
         ...preExtrude
@@ -2738,6 +2760,7 @@ function pGeom5(t, param, suffix = "") {
           outName: `ipax_${designName}_hollow`,
           boolMethod: EBVolume5.eUnion,
           inList: [
+            `subpax_${designName}_coneHollow`,
             `subpax_${designName}_beamHollow`,
             `subpax_${designName}_wing_hollow_right`,
             `subpax_${designName}_wing_hollow_left`,
@@ -2962,7 +2985,7 @@ import {
   point as point5,
   contour as contour9,
   contourCircle as contourCircle7,
-  ctrRectangle,
+  ctrRectangle as ctrRectangle2,
   figure as figure7,
   ffix as ffix9,
   pNumber as pNumber7,
@@ -3046,9 +3069,9 @@ function pGeom7(t, param, suffix = "") {
     figSide.addMain(contourCircle7(0, 0, R1 - param.E1));
     const sidePx = [-param.L2 / 2, -param.L3 - param.H2, param.L3, param.L2 / 2 - param.H2];
     for (const px of sidePx) {
-      figSide.addMain(ctrRectangle(px, R1 - param.H4, param.H2, param.H4));
+      figSide.addMain(ctrRectangle2(px, R1 - param.H4, param.H2, param.H4));
       figSide.addMain(
-        ctrRectangle(
+        ctrRectangle2(
           px + param.E2,
           R1 - param.H4 + param.E2,
           param.H2 - 2 * param.E2,
@@ -3056,7 +3079,7 @@ function pGeom7(t, param, suffix = "") {
         )
       );
     }
-    figSide.addSecond(ctrRectangle(-param.L2 / 2, R1, param.L2, param.H3));
+    figSide.addSecond(ctrRectangle2(-param.L2 / 2, R1, param.L2, param.H3));
     const facePx = [];
     facePx.push(-param.L1 / 2);
     facePx.push(param.L1 / 2 - param.H1);
@@ -3071,9 +3094,9 @@ function pGeom7(t, param, suffix = "") {
       }
     }
     for (const px of facePx) {
-      figFace.addMain(ctrRectangle(px, R1, param.H1, param.H3));
+      figFace.addMain(ctrRectangle2(px, R1, param.H1, param.H3));
       figFace.addMain(
-        ctrRectangle(
+        ctrRectangle2(
           px + param.E3,
           R1 + param.E3,
           param.H1 - 2 * param.E3,
@@ -3081,15 +3104,15 @@ function pGeom7(t, param, suffix = "") {
         )
       );
     }
-    figFace.addSecond(ctrRectangle(-param.L1 / 2, -R1, param.L1, param.D1));
-    figFace.addSecond(ctrRectangle(-param.L1 / 2, R1 - param.H4, param.L1, param.H4));
+    figFace.addSecond(ctrRectangle2(-param.L1 / 2, -R1, param.L1, param.D1));
+    figFace.addSecond(ctrRectangle2(-param.L1 / 2, R1 - param.H4, param.L1, param.H4));
     for (const px of facePx) {
-      figTop.addSecond(ctrRectangle(px, -param.L2 / 2, param.H1, param.L2));
+      figTop.addSecond(ctrRectangle2(px, -param.L2 / 2, param.H1, param.L2));
     }
     for (const py of sidePx) {
-      figTop.addSecond(ctrRectangle(-param.L1 / 2, py, param.L1, param.H2));
+      figTop.addSecond(ctrRectangle2(-param.L1 / 2, py, param.L1, param.H2));
     }
-    figTop.addSecond(ctrRectangle(-param.L1 / 2, -R1, param.L1, param.D1));
+    figTop.addSecond(ctrRectangle2(-param.L1 / 2, -R1, param.L1, param.D1));
     const aBAC = Math.atan2(param.S1, R1);
     const aDAB = 2 * aBAC;
     const pA = point5(0, 0);
@@ -3100,12 +3123,12 @@ function pGeom7(t, param, suffix = "") {
     figButtress.addMain(contourCircle7(0, 0, R1 - param.E1));
     figSide.addSecond(ctrButtress);
     for (const px of facePx) {
-      figTopWithRod.addMain(ctrRectangle(px, -param.L2 / 2, param.H1, param.L2));
+      figTopWithRod.addMain(ctrRectangle2(px, -param.L2 / 2, param.H1, param.L2));
     }
     for (const py of sidePx) {
-      figTopWithRod.addMain(ctrRectangle(-param.L1 / 2, py, param.L1, param.H2));
+      figTopWithRod.addMain(ctrRectangle2(-param.L1 / 2, py, param.L1, param.H2));
     }
-    figTopWithRod.addMain(ctrRectangle(-param.L1 / 2, -R1, param.L1, param.D1));
+    figTopWithRod.addMain(ctrRectangle2(-param.L1 / 2, -R1, param.L1, param.D1));
     const rodPx0 = -((param.rod1 - 1) * param.rod2 + param.rod3) / 2;
     const rodOffset = (param.rod3 - param.rod4) / 2;
     const rodPlateH = param.rod3 / 2;
@@ -3114,10 +3137,10 @@ function pGeom7(t, param, suffix = "") {
     const rodPy0 = -rodLength / 2;
     for (let i = 0; i < param.rod1; i++) {
       const px = rodPx0 + i * param.rod2;
-      figTopWithRod.addSecond(ctrRectangle(px + rodOffset, rodPy0, param.rod4, rodLength));
+      figTopWithRod.addSecond(ctrRectangle2(px + rodOffset, rodPy0, param.rod4, rodLength));
       for (let j = 0; j < 4; j++) {
         figTopWithRod.addSecond(
-          ctrRectangle(px, rodPy0 + j * rodPyStep, param.rod3, rodPlateH, rodPlateH / 4)
+          ctrRectangle2(px, rodPy0 + j * rodPyStep, param.rod3, rodPlateH, rodPlateH / 4)
         );
       }
     }
@@ -3288,7 +3311,7 @@ function pGeom8(t, param, suffix = "") {
 `;
     const posAngleMid = (param.al - param.ar) / 2;
     const posAngleDegree = posAngleMid - Math.sin(2 * Math.PI * t / pDef8.sim.tMax) * (param.al + param.ar) / 2;
-    const posAngle = degToRad4(posAngleDegree);
+    const posAngle = degToRad5(posAngleDegree);
     rGeome.logstr += `swing position angle: ${ffix10(radToDeg6(posAngle))} degree
 `;
     const rakePosY = param.H1 + param.H2 - param.H3;
@@ -3513,7 +3536,7 @@ import {
   checkGeom as checkGeom5,
   prefixLog as prefixLog5,
   figure as figure10,
-  degToRad as degToRad5,
+  degToRad as degToRad6,
   radToDeg as radToDeg8,
   ffix as ffix12,
   pNumber as pNumber10,
@@ -3528,8 +3551,8 @@ import {
   checkGeom as checkGeom4,
   prefixLog as prefixLog4,
   contourCircle as contourCircle8,
-  ctrRectangle as ctrRectangle2,
-  ctrRectRot,
+  ctrRectangle as ctrRectangle3,
+  ctrRectRot2,
   figure as figure9,
   radToDeg as radToDeg7,
   ffix as ffix11,
@@ -3575,9 +3598,11 @@ var pDef9 = {
     pNumber9("H7", "mm", 600, 1, 2e3, 1),
     pNumber9("L9", "mm", 300, 1, 1e3, 1),
     pNumber9("R9", "mm", 50, 0, 300, 1),
+    pNumber9("doorOrientation", "degree", 0, -180, 180, 1),
     pSectionSeparator8("stoppers"),
     pNumber9("S1", "mm", 100, 1, 300, 1),
     pNumber9("S2", "mm", 2e3, 1, 8e3, 1),
+    pNumber9("S3", "mm", 100, 0, 8e3, 1),
     pNumber9("E7", "mm", 5, 1, 80, 1),
     pSectionSeparator8("low stopper"),
     pNumber9("JD1", "mm", 200, 1, 500, 1),
@@ -3585,7 +3610,14 @@ var pDef9 = {
     pNumber9("JL1", "mm", 260, 1, 2e3, 1),
     pNumber9("JH1", "mm", 20, -500, 500, 1),
     pNumber9("JS1", "mm", 100, 1, 500, 1),
-    pNumber9("JS2", "mm", 200, 1, 500, 1)
+    pNumber9("JS2", "mm", 200, 1, 500, 1),
+    pSectionSeparator8("high stopper"),
+    pNumber9("JD3", "mm", 200, 1, 500, 1),
+    pNumber9("JE3", "mm", 5, 1, 80, 1),
+    pNumber9("JS3", "mm", 120, 1, 500, 1),
+    pNumber9("JD4", "mm", 200, 1, 500, 1),
+    pNumber9("JE4", "mm", 5, 1, 80, 1),
+    pNumber9("JS4", "mm", 120, 1, 500, 1)
   ],
   paramSvg: {
     D1: "rake_face.svg",
@@ -3616,15 +3648,23 @@ var pDef9 = {
     H7: "rake_door.svg",
     L9: "rake_door.svg",
     R9: "rake_door.svg",
+    doorOrientation: "rake_door.svg",
     S1: "rake_side_stopper.svg",
     S2: "rake_top_stopper.svg",
+    S3: "rake_side_stopper.svg",
     E7: "rake_side_stopper.svg",
     JD1: "rake_low_stopper_holder.svg",
     JE1: "rake_low_stopper_holder.svg",
     JL1: "rake_low_stopper_holder.svg",
     JH1: "rake_low_stopper_holder.svg",
     JS1: "rake_side_stopper.svg",
-    JS2: "rake_top_stopper.svg"
+    JS2: "rake_top_stopper.svg",
+    JD3: "rake_side_stopper.svg",
+    JE3: "rake_side_stopper.svg",
+    JS3: "rake_top_stopper.svg",
+    JD4: "rake_top_stopper.svg",
+    JE4: "rake_top_stopper.svg",
+    JS4: "rake_side_stopper.svg"
   },
   sim: {
     tMax: 180,
@@ -3652,6 +3692,8 @@ function pGeom9(t, param, suffix = "") {
   const figStopperFaceBH = figure9();
   const figLowStopperHolderPre = figure9();
   const figLowStopperHolder = figure9();
+  const figHi1StopperHolder = figure9();
+  const figHi2StopperHolder = figure9();
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -3659,19 +3701,23 @@ function pGeom9(t, param, suffix = "") {
     const H1H2 = param.H1 + param.H2;
     const H1H5 = H1H2 - param.H4 + param.H5;
     const stopper1H = H1H5 - param.S2;
-    const stopper2H = param.H1 + param.H2 - param.H4 + param.D4 / 2;
-    const stopper3H = param.H1 + param.L8 - param.S1;
+    const Hi2SHpz = param.H1 + param.H2 - param.H4;
+    const stopper2H = Hi2SHpz + param.D4 / 2;
+    const stopper3H = param.H1 + param.S3;
     const L5h = param.L5 / 2;
     const S1r = param.S1 / 2;
     const S1h = param.S1 - 2 * param.E7;
     const S1hr = S1h / 2;
     const lowStopperTopPosX = -R1 - param.S1 / 2 - param.JS1;
-    const S2s = param.S2 - param.S1 / 2;
+    const S2s = param.S2 - S1r;
     const lowSPosY = stopper1H - S1r;
     const lowSHPosZ = stopper1H - param.JH1;
     const JR1 = param.JD1 / 2;
     const JR1H = JR1 - param.JE1;
     const lowSHL = R1 + param.JS2;
+    const JR3 = param.JD3 / 2;
+    const JR4 = param.JD4 / 2;
+    const Hi2SHpy = L5h - S1r;
     if (2 * param.E7 >= param.S1) {
       throw `err135: E7 ${param.E7} too large compare to S1 ${param.S1}`;
     }
@@ -3699,12 +3745,21 @@ function pGeom9(t, param, suffix = "") {
     if (param.JS2 < param.JS1 - S1r) {
       throw `err149: JS2 ${param.JS2} too small compare to JS1 ${param.JS1} and S1 ${param.S1}`;
     }
+    if (param.S3 > param.H2 - param.H4) {
+      throw `err150: S3 ${param.S3} too large compare to H2 ${param.H2} and H4 ${param.H4}`;
+    }
+    if (param.JE3 > param.JD3 / 2) {
+      throw `err151: JE3 ${param.JE3} too large compare to JD3 ${param.JD3}`;
+    }
+    if (param.JE4 > param.JD4 / 2) {
+      throw `err152: JE4 ${param.JE4} too large compare to JD4 ${param.JD4}`;
+    }
     rGeome.logstr += `cone-height: ${ffix11(H1H2)} mm
 `;
     rGeome.logstr += `cone-height total: ${ffix11(H1H5)} mm
 `;
-    figLowStopperHolderPre.addSecond(ctrRectangle2(-L5h, lowSPosY, param.L5, param.S1));
-    figLowStopperHolderPre.addSecond(ctrRectangle2(-L5h, lowSPosY + param.E7, param.L5, S1h));
+    figLowStopperHolderPre.addSecond(ctrRectangle3(-L5h, lowSPosY, param.L5, param.S1));
+    figLowStopperHolderPre.addSecond(ctrRectangle3(-L5h, lowSPosY + param.E7, param.L5, S1h));
     figLowStopperHolderPre.addMain(contourCircle8(-param.JL1 / 2, lowSHPosZ, JR1));
     figLowStopperHolderPre.addMain(contourCircle8(-param.JL1 / 2, lowSHPosZ, JR1H));
     figLowStopperHolderPre.addMain(contourCircle8(param.JL1 / 2, lowSHPosZ, JR1));
@@ -3738,6 +3793,7 @@ function pGeom9(t, param, suffix = "") {
     rakeParam.setVal("H7", param.H7);
     rakeParam.setVal("L9", param.L9);
     rakeParam.setVal("R9", param.R9);
+    rakeParam.setVal("doorOrientation", param.doorOrientation);
     const rakeGeom = rakeDef.pGeom(0, rakeParam.getParamVal(), rakeParam.getSuffix());
     checkGeom4(rakeGeom);
     rGeome.logstr += prefixLog4(rakeGeom.logstr, rakeParam.getPartNameSuffix());
@@ -3752,53 +3808,53 @@ function pGeom9(t, param, suffix = "") {
     figDoor.mergeFigure(rakeGeom.fig.faceDoor);
     figDoor.mergeFigure(figLowStopperHolderPre, true);
     figStopperTop.mergeFigure(rakeGeom.fig.faceDisc, true);
-    figStopperTop.addMain(ctrRectangle2(lowStopperTopPosX, -L5h, param.S1, param.L5));
-    figStopperTop.addMain(ctrRectangle2(lowStopperTopPosX + param.E7, -L5h, S1h, param.L5));
-    figStopperTop.addMain(ctrRectangle2(param.S2 - param.S1, -L5h, param.S1, param.L5));
-    figStopperTop.addMain(ctrRectangle2(param.S2 - param.E7 - S1h, -L5h, S1h, param.L5));
-    figStopperTop.addMain(ctrRectangle2(0, -L5h, S2s, param.S1));
-    figStopperTop.addMain(ctrRectangle2(0, -L5h + param.E7, S2s, S1h));
-    figStopperTop.addMain(ctrRectangle2(0, L5h - param.S1, S2s, param.S1));
-    figStopperTop.addMain(ctrRectangle2(0, L5h - param.S1 + param.E7, S2s, S1h));
-    figStopperTop.addMain(ctrRectangle2(0, -R1 - param.S1, S2s, param.S1));
-    figStopperTop.addMain(ctrRectangle2(0, -R1 - param.S1 + param.E7, S2s, S1h));
-    figStopperTop.addMain(ctrRectangle2(0, R1, S2s, param.S1));
-    figStopperTop.addMain(ctrRectangle2(0, R1 + param.E7, S2s, S1h));
-    figStopperTop.addSecond(ctrRectangle2(-lowSHL, -param.JL1 / 2 - JR1, lowSHL, 2 * JR1));
-    figStopperTop.addSecond(ctrRectangle2(-lowSHL, -param.JL1 / 2 - JR1H, lowSHL, 2 * JR1H));
-    figStopperTop.addSecond(ctrRectangle2(-lowSHL, param.JL1 / 2 - JR1, lowSHL, 2 * JR1));
-    figStopperTop.addSecond(ctrRectangle2(-lowSHL, param.JL1 / 2 - JR1H, lowSHL, 2 * JR1H));
+    figStopperTop.addMain(ctrRectangle3(lowStopperTopPosX, -L5h, param.S1, param.L5));
+    figStopperTop.addMain(ctrRectangle3(lowStopperTopPosX + param.E7, -L5h, S1h, param.L5));
+    figStopperTop.addMain(ctrRectangle3(param.S2 - param.S1, -L5h, param.S1, param.L5));
+    figStopperTop.addMain(ctrRectangle3(param.S2 - param.E7 - S1h, -L5h, S1h, param.L5));
+    figStopperTop.addMain(ctrRectangle3(0, -L5h, S2s, param.S1));
+    figStopperTop.addMain(ctrRectangle3(0, -L5h + param.E7, S2s, S1h));
+    figStopperTop.addMain(ctrRectangle3(0, L5h - param.S1, S2s, param.S1));
+    figStopperTop.addMain(ctrRectangle3(0, L5h - param.S1 + param.E7, S2s, S1h));
+    figStopperTop.addMain(ctrRectangle3(0, -R1 - param.S1, S2s, param.S1));
+    figStopperTop.addMain(ctrRectangle3(0, -R1 - param.S1 + param.E7, S2s, S1h));
+    figStopperTop.addMain(ctrRectangle3(0, R1, S2s, param.S1));
+    figStopperTop.addMain(ctrRectangle3(0, R1 + param.E7, S2s, S1h));
+    figStopperTop.addSecond(ctrRectangle3(-lowSHL, -param.JL1 / 2 - JR1, lowSHL, 2 * JR1));
+    figStopperTop.addSecond(ctrRectangle3(-lowSHL, -param.JL1 / 2 - JR1H, lowSHL, 2 * JR1H));
+    figStopperTop.addSecond(ctrRectangle3(-lowSHL, param.JL1 / 2 - JR1, lowSHL, 2 * JR1));
+    figStopperTop.addSecond(ctrRectangle3(-lowSHL, param.JL1 / 2 - JR1H, lowSHL, 2 * JR1H));
+    const Hi1SHL = R1 + param.JS3;
+    const Hi1SHW = param.JD3 - 2 * param.JE3;
+    figStopperTop.addSecond(ctrRectangle3(-param.JD3 / 2, -Hi1SHL, param.JD3, Hi1SHL));
+    figStopperTop.addSecond(ctrRectangle3(-param.JD3 / 2 + param.JE3, -Hi1SHL, Hi1SHW, Hi1SHL));
+    figStopperTop.addSecond(ctrRectangle3(-param.JD3 / 2, 0, param.JD3, Hi1SHL));
+    figStopperTop.addSecond(ctrRectangle3(-param.JD3 / 2 + param.JE3, 0, Hi1SHW, Hi1SHL));
     figStopperSide.mergeFigure(rakeGeom.fig.faceBeam, true);
     figStopperSide.addMain(contourCircle8(-R1 - param.JS1, stopper1H, S1r));
     figStopperSide.addMain(contourCircle8(-R1 - param.JS1, stopper1H, S1hr));
-    figStopperSide.addMain(contourCircle8(param.S2 - S1r, stopper2H + S1r, S1r));
-    figStopperSide.addMain(contourCircle8(param.S2 - S1r, stopper2H + S1r, S1hr));
-    figStopperSide.addSecond(ctrRectangle2(0, stopper2H, S2s, param.S1));
-    figStopperSide.addSecond(ctrRectangle2(0, stopper2H + param.E7, S2s, S1h));
-    const stopper3Ly = stopper2H + param.S1 / 2 - stopper3H;
-    const stopper3L = Math.sqrt(S2s ** 2 + stopper3Ly ** 2);
-    const stopper3A = Math.atan2(stopper3Ly, S2s);
-    rGeome.logstr += `stopper-rod: L ${ffix11(stopper3L)} mm, A ${ffix11(
-      radToDeg7(stopper3A)
-    )} degree
+    figStopperSide.addMain(contourCircle8(S2s, stopper2H + S1r, S1r));
+    figStopperSide.addMain(contourCircle8(S2s, stopper2H + S1r, S1hr));
+    figStopperSide.addSecond(ctrRectangle3(0, stopper2H, S2s, param.S1));
+    figStopperSide.addSecond(ctrRectangle3(0, stopper2H + param.E7, S2s, S1h));
+    const stopper3Ly = stopper2H + S1r - stopper3H;
+    const stp3L = Math.sqrt(S2s ** 2 + stopper3Ly ** 2);
+    const stp3A = Math.atan2(stopper3Ly, S2s);
+    rGeome.logstr += `stopper-rod: L ${ffix11(stp3L)} mm, A ${ffix11(radToDeg7(stp3A))} degree
 `;
-    const stp3posdX = S1r * Math.sin(stopper3A);
-    const stp3posdY = S1r * Math.cos(stopper3A);
-    const stp3posY = stopper3H - stp3posdY;
-    figStopperSide.addSecond(ctrRectRot(stp3posdX, stp3posY, stopper3L, param.S1, stopper3A));
-    const stp3posdX2 = S1hr * Math.sin(stopper3A);
-    const stp3posdY2 = S1hr * Math.cos(stopper3A);
-    const stp3posY2 = stopper3H - stp3posdY2;
-    figStopperSide.addSecond(ctrRectRot(stp3posdX2, stp3posY2, stopper3L, S1h, stopper3A));
-    figStopperSide.addSecond(ctrRectangle2(-lowSHL, lowSHPosZ - JR1, lowSHL, 2 * JR1));
-    figStopperSide.addSecond(ctrRectangle2(-lowSHL, lowSHPosZ - JR1H, lowSHL, 2 * JR1H));
-    figStopperSideH.mergeFigure(rakeGeom.fig.faceBeam, true);
-    figStopperSideH.addSecond(contourCircle8(-R1 - param.JS1, stopper1H, S1r));
+    figStopperSide.addSecond(ctrRectRot2(0, stopper3H, stp3L, param.S1, stp3A));
+    figStopperSide.addSecond(ctrRectRot2(0, stopper3H, stp3L, S1h, stp3A));
+    figStopperSide.addSecond(ctrRectangle3(-lowSHL, lowSHPosZ - JR1, lowSHL, 2 * JR1));
+    figStopperSide.addSecond(ctrRectangle3(-lowSHL, lowSHPosZ - JR1H, lowSHL, 2 * JR1H));
+    figStopperSide.addSecond(contourCircle8(0, stopper3H, param.JD3 / 2));
+    figStopperSide.addSecond(contourCircle8(0, stopper3H, param.JD3 / 2 - param.JE3));
+    const Hi2SHL = param.D4 / 2 + param.JS4;
+    const Hi2SHW2 = param.JD4 / 2 - param.JE4;
+    figStopperSide.addSecond(ctrRectangle3(-param.JD4 / 2, Hi2SHpz, param.JD4, Hi2SHL));
+    figStopperSide.addSecond(ctrRectangle3(-Hi2SHW2, Hi2SHpz, 2 * Hi2SHW2, Hi2SHL));
+    figStopperSideH.mergeFigure(figStopperSide, true);
     figStopperSideH.addMain(contourCircle8(-R1 - param.JS1, stopper1H, S1hr));
-    figStopperSideH.addSecond(contourCircle8(param.S2 - S1r, stopper2H + S1r, S1r));
     figStopperSideH.addMain(contourCircle8(param.S2 - S1r, stopper2H + S1r, S1hr));
-    figStopperSideH.addSecond(ctrRectangle2(-lowSHL, lowSHPosZ - JR1, lowSHL, 2 * JR1));
-    figStopperSideH.addSecond(ctrRectangle2(-lowSHL, lowSHPosZ - JR1H, lowSHL, 2 * JR1H));
     figStopperFaceT.mergeFigure(rakeGeom.fig.faceCone, true);
     figStopperFaceT.mergeFigure(figLowStopperHolderPre, true);
     figStopperFaceT.addMain(contourCircle8(-param.L5 / 2 + S1r, stopper2H + S1r, S1r));
@@ -3825,6 +3881,25 @@ function pGeom9(t, param, suffix = "") {
     figStopperFaceBH.addMain(contourCircle8(R1 + S1r, 0, S1hr));
     figLowStopperHolder.mergeFigure(rakeGeom.fig.faceCone, true);
     figLowStopperHolder.mergeFigure(figLowStopperHolderPre);
+    const px8 = -Hi2SHpy - Hi2SHW2;
+    const px9 = Hi2SHpy - Hi2SHW2;
+    const py10 = stopper3H - Hi1SHW / 2;
+    figLowStopperHolder.addSecond(ctrRectangle3(-Hi2SHpy - JR4, Hi2SHpz, param.JD4, Hi2SHL));
+    figLowStopperHolder.addSecond(ctrRectangle3(px8, Hi2SHpz, 2 * Hi2SHW2, Hi2SHL));
+    figLowStopperHolder.addSecond(ctrRectangle3(Hi2SHpy - JR4, Hi2SHpz, param.JD4, Hi2SHL));
+    figLowStopperHolder.addSecond(ctrRectangle3(px9, Hi2SHpz, 2 * Hi2SHW2, Hi2SHL));
+    figLowStopperHolder.addSecond(ctrRectangle3(-Hi1SHL, stopper3H - JR3, Hi1SHL, param.JD3));
+    figLowStopperHolder.addSecond(ctrRectangle3(-Hi1SHL, py10, Hi1SHL, Hi1SHW));
+    figLowStopperHolder.addSecond(ctrRectangle3(0, stopper3H - JR3, Hi1SHL, param.JD3));
+    figLowStopperHolder.addSecond(ctrRectangle3(0, stopper3H - Hi1SHW / 2, Hi1SHL, Hi1SHW));
+    figHi1StopperHolder.mergeFigure(figStopperSide, true);
+    figHi1StopperHolder.addMain(contourCircle8(0, stopper3H, param.JD3 / 2));
+    figHi1StopperHolder.addMain(contourCircle8(0, stopper3H, param.JD3 / 2 - param.JE3));
+    figHi2StopperHolder.mergeFigure(figStopperTop, true);
+    figHi2StopperHolder.addMain(contourCircle8(0, -Hi2SHpy, JR4));
+    figHi2StopperHolder.addMain(contourCircle8(0, -Hi2SHpy, JR4 - param.JE4));
+    figHi2StopperHolder.addMain(contourCircle8(0, Hi2SHpy, JR4));
+    figHi2StopperHolder.addMain(contourCircle8(0, Hi2SHpy, JR4 - param.JE4));
     rGeome.fig = {
       faceCone: figCone,
       faceBeam: figBeam,
@@ -3841,7 +3916,9 @@ function pGeom9(t, param, suffix = "") {
       faceStopperFaceTH: figStopperFaceTH,
       faceStopperFaceB: figStopperFaceB,
       faceStopperFaceBH: figStopperFaceBH,
-      faceLowStopperHolder: figLowStopperHolder
+      faceLowStopperHolder: figLowStopperHolder,
+      faceHi1StopperHolder: figHi1StopperHolder,
+      faceHi2StopperHolder: figHi2StopperHolder
     };
     const designName = rGeome.partName;
     rGeome.vol = {
@@ -3852,6 +3929,20 @@ function pGeom9(t, param, suffix = "") {
           subgeom: rakeGeom,
           rotate: [0, 0, 0],
           translate: [0, 0, 0]
+        },
+        {
+          outName: `inpax_${designName}_coneHollow`,
+          subdesign: "subpax_rake_coneHollow",
+          subgeom: rakeGeom,
+          rotate: [0, 0, 0],
+          translate: [0, 0, 0]
+        },
+        {
+          outName: `inpax_${designName}_beamHollow`,
+          subdesign: "subpax_rake_beamHollow",
+          subgeom: rakeGeom,
+          rotate: [0, 0, 0],
+          translate: [0, 0, 0]
         }
       ],
       extrudes: [
@@ -3891,17 +3982,49 @@ function pGeom9(t, param, suffix = "") {
           outName: `subpax_${designName}_stpFaceB`,
           face: `${designName}_faceStopperFaceB`,
           extrudeMethod: EExtrude7.eLinearOrtho,
-          length: stopper3L,
-          rotate: [Math.PI / 2 - stopper3A, 0, Math.PI / 2],
+          length: stp3L,
+          rotate: [Math.PI / 2 - stp3A, 0, Math.PI / 2],
           translate: [0, 0, stopper3H]
         },
         {
           outName: `subpax_${designName}_stpFaceBH`,
           face: `${designName}_faceStopperFaceBH`,
           extrudeMethod: EExtrude7.eLinearOrtho,
-          length: stopper3L,
-          rotate: [Math.PI / 2 - stopper3A, 0, Math.PI / 2],
+          length: stp3L,
+          rotate: [Math.PI / 2 - stp3A, 0, Math.PI / 2],
           translate: [0, 0, stopper3H]
+        },
+        {
+          outName: `subpax_${designName}_lowSH`,
+          face: `${designName}_faceLowStopperHolder`,
+          extrudeMethod: EExtrude7.eLinearOrtho,
+          length: lowSHL,
+          rotate: [Math.PI / 2, 0, -Math.PI / 2],
+          translate: [0, 0, 0]
+        },
+        {
+          outName: `subpax_${designName}_Hi1SH1`,
+          face: `${designName}_faceHi1StopperHolder`,
+          extrudeMethod: EExtrude7.eLinearOrtho,
+          length: Hi1SHL,
+          rotate: [Math.PI / 2, 0, 0],
+          translate: [0, 0, 0]
+        },
+        {
+          outName: `subpax_${designName}_Hi1SH2`,
+          face: `${designName}_faceHi1StopperHolder`,
+          extrudeMethod: EExtrude7.eLinearOrtho,
+          length: Hi1SHL,
+          rotate: [Math.PI / 2, 0, Math.PI],
+          translate: [0, 0, 0]
+        },
+        {
+          outName: `subpax_${designName}_Hi2SH`,
+          face: `${designName}_faceHi2StopperHolder`,
+          extrudeMethod: EExtrude7.eLinearOrtho,
+          length: Hi2SHL,
+          rotate: [0, 0, 0],
+          translate: [0, 0, Hi2SHpz]
         }
       ],
       volumes: [
@@ -3911,13 +4034,19 @@ function pGeom9(t, param, suffix = "") {
           inList: [
             `subpax_${designName}_stpSide`,
             `subpax_${designName}_stpFaceT`,
-            `subpax_${designName}_stpFaceB`
+            `subpax_${designName}_stpFaceB`,
+            `subpax_${designName}_lowSH`,
+            `subpax_${designName}_Hi1SH1`,
+            `subpax_${designName}_Hi1SH2`,
+            `subpax_${designName}_Hi2SH`
           ]
         },
         {
           outName: `ipax_${designName}_hollow`,
           boolMethod: EBVolume9.eUnion,
           inList: [
+            `inpax_${designName}_coneHollow`,
+            `inpax_${designName}_beamHollow`,
             `subpax_${designName}_stpSideH`,
             `subpax_${designName}_stpFaceTH`,
             `subpax_${designName}_stpFaceBH`
@@ -4039,7 +4168,7 @@ function pGeom10(t, param, suffix = "") {
     rGeome.logstr += `heliostat-swing-length: ${ffix12(param.L1)}, width ${ffix12(param.L2)} m
 `;
     const posAngleDegree = param.al * t / pDef10.sim.tMax;
-    const posAngle = degToRad5(posAngleDegree);
+    const posAngle = degToRad6(posAngleDegree);
     rGeome.logstr += `swing position angle: ${ffix12(radToDeg8(posAngle))} degree
 `;
     const rakePosY = param.H1 + param.H2 - param.H3;
@@ -4884,7 +5013,7 @@ var ringGuidanceDef = {
 // src/heliostat/vaxis_guidance.ts
 import {
   contourCircle as contourCircle13,
-  ctrRectangle as ctrRectangle3,
+  ctrRectangle as ctrRectangle4,
   figure as figure15,
   ffix as ffix17,
   pNumber as pNumber15,
@@ -4986,10 +5115,10 @@ function pGeom15(t, param, suffix = "") {
     figTop.addMain(innerCtr);
     figTop.addSecond(contourCircle13(0, 0, param.Dvaxis / 2));
     const w1 = R1 - R6 + R4;
-    figSection.addMain(ctrRectangle3(R6, 0, w1, param.T1));
-    figSection.addMain(ctrRectangle3(-R6 - w1, 0, w1, param.T1));
-    figSection.addSecond(ctrRectangle3(R1 - R3, 0, 2 * R3, param.T1));
-    figSection.addSecond(ctrRectangle3(-R1 - R3, 0, 2 * R3, param.T1));
+    figSection.addMain(ctrRectangle4(R6, 0, w1, param.T1));
+    figSection.addMain(ctrRectangle4(-R6 - w1, 0, w1, param.T1));
+    figSection.addSecond(ctrRectangle4(R1 - R3, 0, 2 * R3, param.T1));
+    figSection.addSecond(ctrRectangle4(-R1 - R3, 0, 2 * R3, param.T1));
     rGeome.fig = {
       faceTop: figTop,
       faceSection: figSection
@@ -5035,9 +5164,9 @@ import {
   point as point6,
   contour as contour14,
   contourCircle as contourCircle14,
-  ctrRectangle as ctrRectangle4,
+  ctrRectangle as ctrRectangle5,
   figure as figure16,
-  degToRad as degToRad6,
+  degToRad as degToRad7,
   ffix as ffix18,
   pNumber as pNumber16,
   pDropdown as pDropdown3,
@@ -5106,7 +5235,7 @@ function pGeom16(t, param, suffix = "") {
     const Rinner = R5 + param.E5;
     const Rinner2 = R8 - param.E8;
     const aLeg = 2 * Math.asin(param.L5 / (2 * Rinner));
-    const sA0 = Math.PI / 12 + degToRad6(param.SA1);
+    const sA0 = Math.PI / 12 + degToRad7(param.SA1);
     const sA = Math.PI / 2 + aLeg - sA0;
     const sA1 = Math.PI - sA0;
     const sA2 = Math.PI / 2 - Math.PI / 6 + sA0;
@@ -5143,9 +5272,9 @@ function pGeom16(t, param, suffix = "") {
     ctrProfile.addPointA(p23.cx, p23.cy).addSegArc(SR1 + param.SE1, false, true).addSegStrokeAP(-Math.PI / 6, Rinner).addSegStrokeAP(-Math.PI / 6, R8).addPointAP(Math.PI / 2, R8).addSegArc(R8, false, true).closeSegStroke();
     figProfile.addMain(ctrProfile);
     const R8plus = R8 * Math.sin(Math.PI / 6);
-    figSide.addMain(ctrRectangle4(0, -R8plus, param.L4, R8 + R8plus));
-    figSide.addSecond(ctrRectangle4(0, -R8, param.L4, 2 * R8));
-    figSide.addSecond(ctrRectangle4(0, -R5, param.L4, 2 * R5));
+    figSide.addMain(ctrRectangle5(0, -R8plus, param.L4, R8 + R8plus));
+    figSide.addSecond(ctrRectangle5(0, -R8, param.L4, 2 * R8));
+    figSide.addSecond(ctrRectangle5(0, -R5, param.L4, 2 * R5));
     rGeome.fig = {
       faceProfile: figProfile,
       faceSide: figSide
@@ -6094,7 +6223,7 @@ var surfaceDef = {
 };
 
 // src/dummy/circles.ts
-import { degToRad as degToRad7, point as point7, figure as figure20, pNumber as pNumber20, initGeom as initGeom20 } from "geometrix";
+import { degToRad as degToRad8, point as point7, figure as figure20, pNumber as pNumber20, initGeom as initGeom20 } from "geometrix";
 var pDef20 = {
   partName: "circles",
   params: [
@@ -6125,7 +6254,7 @@ function pGeom20(t, param, suffix = "") {
     figOne.addPoint(p2);
     for (let i = 0; i < 20; i++) {
       figOne.addPoint(
-        p1.scale(p2, param["amplitude-offset"] + param["amplitude-scale"] * i).rotate(p2, i * degToRad7(param.angle) + t * Math.PI / 2 / pDef20.sim.tMax)
+        p1.scale(p2, param["amplitude-offset"] + param["amplitude-scale"] * i).rotate(p2, i * degToRad8(param.angle) + t * Math.PI / 2 / pDef20.sim.tMax)
       );
     }
     rGeome.fig = { one: figOne };
@@ -6251,7 +6380,7 @@ var dummyPoleStaticDef = {
 };
 
 // src/geometrix_verification/verify_point.ts
-import { degToRad as degToRad8, point as point9, figure as figure23, pNumber as pNumber23, initGeom as initGeom23 } from "geometrix";
+import { degToRad as degToRad9, point as point9, figure as figure23, pNumber as pNumber23, initGeom as initGeom23 } from "geometrix";
 var pDef23 = {
   partName: "verify_point",
   params: [
@@ -6285,8 +6414,8 @@ function pGeom23(t, param, suffix = "") {
   try {
     const figOne = figure23();
     const p1 = point9(param.p1x, param.p1y + t);
-    const p2 = point9(0, 0).setPolar(degToRad8(param.p2a), param.p2l);
-    const p3 = p1.rotateOrig(degToRad8(param.rotateOrig));
+    const p2 = point9(0, 0).setPolar(degToRad9(param.p2a), param.p2l);
+    const p3 = p1.rotateOrig(degToRad9(param.rotateOrig));
     const p4 = p1.scaleOrig(param.scaleOrig);
     figOne.addPoint(p1);
     figOne.addPoint(p2);
@@ -6443,7 +6572,7 @@ var verifyLine1Def = {
 };
 
 // src/geometrix_verification/verify_line_2.ts
-import { degToRad as degToRad9, point as point12, line as line2, figure as figure26, pNumber as pNumber26, initGeom as initGeom26 } from "geometrix";
+import { degToRad as degToRad10, point as point12, line as line2, figure as figure26, pNumber as pNumber26, initGeom as initGeom26 } from "geometrix";
 var pDef26 = {
   partName: "verify_line_2",
   params: [
@@ -6486,8 +6615,8 @@ function pGeom26(t, param, suffix = "") {
     figOne.addPoint(p1);
     figOne.addPoint(p2);
     figOne.addPoint(p3);
-    const l1 = line2(param.l1cx, param.l1cy, degToRad9(param.l1ca + t));
-    const l2 = line2(param.l2cx, param.l2cy, degToRad9(param.l2ca));
+    const l1 = line2(param.l1cx, param.l1cy, degToRad10(param.l1ca + t));
+    const l2 = line2(param.l2cx, param.l2cy, degToRad10(param.l2ca));
     figOne.addLine(l1);
     figOne.addLine(l2);
     figOne.addPoint(l1.intersection(l2));
@@ -6577,7 +6706,7 @@ var verifyLine3Def = {
 };
 
 // src/geometrix_verification/verify_vector.ts
-import { degToRad as degToRad10, point as point14, vector, figure as figure28, pNumber as pNumber28, initGeom as initGeom28 } from "geometrix";
+import { degToRad as degToRad11, point as point14, vector, figure as figure28, pNumber as pNumber28, initGeom as initGeom28 } from "geometrix";
 var pDef28 = {
   partName: "verify_vector",
   params: [
@@ -6616,8 +6745,8 @@ function pGeom28(t, param, suffix = "") {
     const figOne = figure28();
     const p1 = point14(param.p1x, param.p1y + t);
     const p2 = point14(param.p2x, param.p2y);
-    const v1 = vector(degToRad10(param.v1a), param.v1l, p1);
-    const v2 = vector(degToRad10(param.v2a), param.v2l, p1);
+    const v1 = vector(degToRad11(param.v1a), param.v1l, p1);
+    const v2 = vector(degToRad11(param.v2a), param.v2l, p1);
     figOne.addPoint(p1);
     figOne.addPoint(p2);
     figOne.addVector(v1);
@@ -6721,7 +6850,7 @@ var verifyContour1Def = {
 };
 
 // src/geometrix_verification/verify_contour_2.ts
-import { degToRad as degToRad11, contour as contour20, figure as figure30, pNumber as pNumber30, initGeom as initGeom30 } from "geometrix";
+import { degToRad as degToRad12, contour as contour20, figure as figure30, pNumber as pNumber30, initGeom as initGeom30 } from "geometrix";
 var pDef30 = {
   partName: "verify_contour_2",
   params: [
@@ -6791,17 +6920,17 @@ function pGeom30(t, param, suffix = "") {
     ctr2.addSegStrokeR(20, 20).addPointR(20, 20).addSegArc(r1, false, false).addPointRP(Math.PI / 4, 28).addSegArc(r1, false, true).addPointRP(Math.PI / 4, 28).addSegArc(r1, true, true).addPointRP(Math.PI / 4, 28).addSegArc(r1, true, false).addSegStrokeRP(Math.PI / 4, 20).addSegStrokeRP(-Math.PI / 4, 20).addPointR(10, -9).addPointR(20, -20).addSegArc2().addPointR(20, -9).addPointR(20, -20).addSegArc2().addPointR(9, -6).addPointR(20, -20).addSegArc2().addPointR(9, -14).addPointR(20, -20).addSegArc2().addPointR(9, 0).addPointR(20, -20).addSegArc2().addSegStrokeR(20, -20).addSegStrokeR(20, 20).addPointR(9, 20).addPointR(20, 20).addSegArc2().addPointR(20, 10).addPointR(20, 20).addSegArc2().addPointR(9, 6).addPointR(20, 20).addSegArc2().addPointR(9, 14).addPointR(20, 20).addSegArc2().addPointR(9, 0).addPointR(20, 20).addSegArc2().addSegStrokeR(20, 20).addSegStrokeR(0, 20).addPointR(15, 8).addPointR(0, 20).addSegArc2().addPointR(-15, 8).addPointR(0, 20).addSegArc2().addPointR(5, 8).addPointR(0, 20).addSegArc2().addPointR(-5, 8).addPointR(0, 20).addSegArc2().addSegStrokeR(0, 20).addSegStrokeR(20, 0).addPointR(8, 15).addPointR(20, 0).addSegArc2().addPointR(8, -15).addPointR(20, 0).addSegArc2().addPointR(8, 5).addPointR(20, 0).addSegArc2().addPointR(8, -5).addPointR(20, 0).addSegArc2().addSegStrokeR(20, 0).addSegStrokeR(0, -20).addPointR(15, -8).addPointR(0, -20).addSegArc2().addPointR(-15, -8).addPointR(0, -20).addSegArc2().addPointR(5, -8).addPointR(0, -20).addSegArc2().addPointR(-5, -8).addPointR(0, -20).addSegArc2().addSegStrokeR(0, -20).addSegStrokeR(-20, 0).addPointR(-8, 15).addPointR(-20, 0).addSegArc2().addPointR(-8, -15).addPointR(-20, 0).addSegArc2().addPointR(-8, 5).addPointR(-20, 0).addSegArc2().addPointR(-8, -5).addPointR(-20, 0).addSegArc2().addSegStrokeR(-20, 0).closeSegStroke();
     ctr2.check();
     figOne.addMain(ctr2);
-    const ctr3 = contour20(200, 200).addSegStrokeR(20, 0).addPointR(20, 0).addSegArc3(degToRad11(ata), true).addSegStrokeR(20, 0).addPointR(20, 0).addSegArc3(degToRad11(ata), false).addSegStrokeR(20, 0).addSegStrokeR(0, 20).addPointR(0, 20).addSegArc3(degToRad11(ata), true).addSegStrokeR(0, 20).addPointR(0, 20).addSegArc3(degToRad11(ata), false).addSegStrokeR(0, 20).addSegStrokeR(-20, 0).addPointR(-20, 0).addSegArc3(degToRad11(ata), true).addSegStrokeR(-20, 0).addPointR(-20, 0).addSegArc3(degToRad11(ata), false).addSegStrokeR(-20, 0).addSegStrokeR(0, -20).addPointR(0, -20).addSegArc3(degToRad11(ata), true).addSegStrokeR(0, -20).addPointR(0, -20).addSegArc3(degToRad11(ata), false).addSegStrokeR(0, -20);
+    const ctr3 = contour20(200, 200).addSegStrokeR(20, 0).addPointR(20, 0).addSegArc3(degToRad12(ata), true).addSegStrokeR(20, 0).addPointR(20, 0).addSegArc3(degToRad12(ata), false).addSegStrokeR(20, 0).addSegStrokeR(0, 20).addPointR(0, 20).addSegArc3(degToRad12(ata), true).addSegStrokeR(0, 20).addPointR(0, 20).addSegArc3(degToRad12(ata), false).addSegStrokeR(0, 20).addSegStrokeR(-20, 0).addPointR(-20, 0).addSegArc3(degToRad12(ata), true).addSegStrokeR(-20, 0).addPointR(-20, 0).addSegArc3(degToRad12(ata), false).addSegStrokeR(-20, 0).addSegStrokeR(0, -20).addPointR(0, -20).addSegArc3(degToRad12(ata), true).addSegStrokeR(0, -20).addPointR(0, -20).addSegArc3(degToRad12(ata), false).addSegStrokeR(0, -20);
     ctr3.check();
     figOne.addMain(ctr3);
-    const ctr4 = contour20(600, 200).addSegStrokeR(20, 20).addPointR(20, 20).addSegArc3(degToRad11(ata), true).addSegStrokeR(20, 20).addPointR(20, 20).addSegArc3(degToRad11(ata), false).addSegStrokeR(20, 20).addSegStrokeR(-20, 20).addPointR(-20, 20).addSegArc3(degToRad11(ata), true).addSegStrokeR(-20, 20).addPointR(-20, 20).addSegArc3(degToRad11(ata), false).addSegStrokeR(-20, 20).addSegStrokeR(-20, -20).addPointR(-20, -20).addSegArc3(degToRad11(ata), true).addSegStrokeR(-20, -20).addPointR(-20, -20).addSegArc3(degToRad11(ata), false).addSegStrokeR(-20, -20).addSegStrokeR(20, -20).addPointR(20, -20).addSegArc3(degToRad11(ata), true).addSegStrokeR(20, -20).addPointR(20, -20).addSegArc3(degToRad11(ata), false).addSegStrokeR(20, -20);
+    const ctr4 = contour20(600, 200).addSegStrokeR(20, 20).addPointR(20, 20).addSegArc3(degToRad12(ata), true).addSegStrokeR(20, 20).addPointR(20, 20).addSegArc3(degToRad12(ata), false).addSegStrokeR(20, 20).addSegStrokeR(-20, 20).addPointR(-20, 20).addSegArc3(degToRad12(ata), true).addSegStrokeR(-20, 20).addPointR(-20, 20).addSegArc3(degToRad12(ata), false).addSegStrokeR(-20, 20).addSegStrokeR(-20, -20).addPointR(-20, -20).addSegArc3(degToRad12(ata), true).addSegStrokeR(-20, -20).addPointR(-20, -20).addSegArc3(degToRad12(ata), false).addSegStrokeR(-20, -20).addSegStrokeR(20, -20).addPointR(20, -20).addSegArc3(degToRad12(ata), true).addSegStrokeR(20, -20).addPointR(20, -20).addSegArc3(degToRad12(ata), false).addSegStrokeR(20, -20);
     ctr4.check();
     figOne.addMain(ctr4);
     const ctr5 = contour20(100, 500);
     for (let i = 0; i < 8; i++) {
       const adir = i * 45;
-      const adirRad = degToRad11(adir);
-      ctr5.addSegStrokeRP(adirRad, 20).addPointRP(adirRad, 20).addSeg2Arcs(degToRad11(adir + at1), degToRad11(180 + adir - at2)).addSegStrokeRP(adirRad, 20).addPointRP(adirRad, 20).addSeg2Arcs(degToRad11(adir - at1), degToRad11(180 + adir + at2)).addSegStrokeRP(adirRad, 20);
+      const adirRad = degToRad12(adir);
+      ctr5.addSegStrokeRP(adirRad, 20).addPointRP(adirRad, 20).addSeg2Arcs(degToRad12(adir + at1), degToRad12(180 + adir - at2)).addSegStrokeRP(adirRad, 20).addPointRP(adirRad, 20).addSeg2Arcs(degToRad12(adir - at1), degToRad12(180 + adir + at2)).addSegStrokeRP(adirRad, 20);
     }
     ctr5.check();
     figOne.addMain(ctr5);
@@ -6822,7 +6951,7 @@ var verifyContour2Def = {
 };
 
 // src/geometrix_verification/verify_contour_3.ts
-import { degToRad as degToRad12, contour as contour21, figure as figure31, pNumber as pNumber31, initGeom as initGeom31 } from "geometrix";
+import { degToRad as degToRad13, contour as contour21, figure as figure31, pNumber as pNumber31, initGeom as initGeom31 } from "geometrix";
 var pDef31 = {
   partName: "verify_contour_3",
   params: [
@@ -6868,7 +6997,7 @@ function pGeom31(t, param, suffix = "") {
     const ctr2 = contour21(300, 0);
     for (let i = 0; i < 4; i++) {
       const angle = 90 * (1 - i);
-      ctr2.addSegStrokeRP(degToRad12(angle), l2).addCornerRounded(r2).addSegStrokeRP(degToRad12(angle - 45), l2).addCornerRounded(r2).addSegStrokeRP(degToRad12(angle + 45), l2).addCornerRounded(r2).addSegStrokeRP(degToRad12(angle), l2).addCornerRounded(r2);
+      ctr2.addSegStrokeRP(degToRad13(angle), l2).addCornerRounded(r2).addSegStrokeRP(degToRad13(angle - 45), l2).addCornerRounded(r2).addSegStrokeRP(degToRad13(angle + 45), l2).addCornerRounded(r2).addSegStrokeRP(degToRad13(angle), l2).addCornerRounded(r2);
     }
     rGeome.logstr += ctr2.check();
     figOne.addMain(ctr2);