From a7d97b6aa3deee863ef17ee42fb0423ee580a33b Mon Sep 17 00:00:00 2001 From: seto Date: Mon, 30 Jan 2023 17:21:21 +0900 Subject: [PATCH] update --- .../Crystallography.Controls.csproj | 4 +- Crystallography/Crystallography.csproj | 4 +- Crystallography/Mathematics/Geometriy.cs | 48 +++++++------------ PDIndexer/FormSequentialAnalysis.cs | 4 +- PDIndexer/PDIndexer.csproj | 4 +- 5 files changed, 25 insertions(+), 39 deletions(-) diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj index c126add..b0a9ed1 100644 --- a/Crystallography.Controls/Crystallography.Controls.csproj +++ b/Crystallography.Controls/Crystallography.Controls.csproj @@ -4,8 +4,8 @@ Library net7.0-windows true - 2023.1.30.0802 - 2023.1.30.0802 + 2023.1.30.0818 + 2023.1.30.0818 PerMonitorV2 true true diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj index 6059e81..018809f 100644 --- a/Crystallography/Crystallography.csproj +++ b/Crystallography/Crystallography.csproj @@ -4,8 +4,8 @@ Library net7.0-windows true - 2023.1.30.0802 - 2023.1.30.0802 + 2023.1.30.0818 + 2023.1.30.0818 diff --git a/Crystallography/Mathematics/Geometriy.cs b/Crystallography/Mathematics/Geometriy.cs index a6331e8..ce94ee7 100644 --- a/Crystallography/Mathematics/Geometriy.cs +++ b/Crystallography/Mathematics/Geometriy.cs @@ -35,18 +35,14 @@ public static PointD GetEllipseCenter(PointD[] pt) Q[i, 3] = pt[i].X; Q[i, 4] = pt[i].Y; } - var A = new DenseMatrix(pt.Length, 1); + var A = new DenseVector(pt.Length); for (int i = 0; i < pt.Length; i++) - A[i, 0] = 1000000; + A[i] = 1000000; if (!(Q.Transpose() * Q).TryInverse(out Matrix inv)) return new PointD(double.NaN, double.NaN); var C = inv * Q.Transpose() * A; - double a = C[0, 0]; - double b = C[1, 0]; - double c = C[2, 0]; - double d = C[3, 0]; - double e = C[4, 0]; + double a = C[0], b = C[1], c = C[2], d = C[3], e = C[4]; //このときの平行移動量(つまり中心位置)は //return new PointD(-d / 2 / a, -e / 2 / c); return new PointD(-(b * e - 2 * c * d) / (b * b - 4 * a * c), -(b * d - 2 * a * e) / (b * b - 4 * a * c)); @@ -111,10 +107,8 @@ public static (PointD OffSet, double Width, double Height, double Cos, double Si double Width, Height, Cos, Sin; //座標系は実空間(mm)で考える //a*x^2 + b*x*y + c*y^2 + d*x + e*y = 10000 - double CosPhi = Math.Cos(phi); - double SinPhi = Math.Sin(phi); - double CosTau = Math.Cos(tau); - double SinTau = Math.Sin(tau); + double CosPhi = Math.Cos(phi), SinPhi = Math.Sin(phi); + double CosTau = Math.Cos(tau), SinTau = Math.Sin(tau); double a = 10000 * ((CosPhi * CosPhi + CosTau * CosTau * SinPhi * SinPhi) / R / R - SinPhi * SinPhi * SinTau * SinTau / FD / FD); double b = 10000 * 2 * (FD * FD + R * R) * SinPhi * CosPhi * SinTau * SinTau / R / R / FD / FD; double c = 10000 * ((CosPhi * CosPhi * CosTau * CosTau + SinPhi * SinPhi) / R / R - CosPhi * CosPhi * SinTau * SinTau / FD / FD); @@ -225,15 +219,14 @@ public static void GetTiltAndOffset(PointD[] EllipseCenter, double[] Radius, dou double phi1, A; phi1 = A = 0; Statistics.LineFitting(EllipseCenter, ref phi1, ref A); - double CosPhi1 = Math.Cos(phi1); - double SinPhi1 = Math.Sin(phi1); + double CosPhi1 = Math.Cos(phi1), SinPhi1 = Math.Sin(phi1); bool xMode = Math.Abs(CosPhi1) > 1 / Math.Sqrt(2); //この直線上の点B(x,y)と、各CenterPtの距離Riとしたとき //δ^2= ( Ri - Cameralength * Tan(2θ)^2 *Sin(ψ) / pixelSize )^2　 //が最小になるような点Bとψをさがす - double[] TheoriticalRperSinPsi = new double[EllipseCenter.Length]; + //double[] TheoriticalRperSinPsi = new double[EllipseCenter.Length]; double startTau1 = -Math.PI / 180; double stepTau1 = Math.PI / 9000; double endTau1 = Math.PI / 180; @@ -366,14 +359,9 @@ public static void GetTiltAndOffset(PointD[] EllipseCenter, double[] Radius, dou phi = Math.Atan2(-Q.E31, Q.E32); bestResidual = double.PositiveInfinity; - double startPhi = phi - 0.1; - double endPhi = phi + 0.1; - double stepPhi = 0.01; - double startTau = tau - 0.01; - double endTau = tau + 0.01; - double stepTau = 0.001; - double bestPhi = phi; - double bestTau = tau; + double startPhi = phi - 0.1, endPhi = phi + 0.1, stepPhi = 0.01; + double startTau = tau - 0.01, endTau = tau + 0.01, stepTau = 0.001; + double bestPhi = phi, bestTau = tau; double temp; for (int n = 0; n < 30; n++) { @@ -453,9 +441,9 @@ public static void GetPixelShape(EllipseParameter[] ellipse, ref double PixX, re //B = - b /√(a) /√(4ac-b^2) //C = 2√(a) /√(4ac-b^2) - var tempPixX = new List(); - var tempPixY = new List(); - var tempKsi = new List(); + var tempPixX = new List(ellipse.Length); + var tempPixY = new List(ellipse.Length); + var tempKsi = new List(ellipse.Length); double A, B, C; for (int i = 0; i < ellipse.Length; i++) { @@ -664,10 +652,8 @@ private static (double X, double Y) getCrossPoint((double X, double Y, bool Flag /// /// /// - public static Vector3D GetCrossPoint(in double a, in double b, in double c, in double d, Vector3D p1, Vector3D p2) - { - return GetCrossPoint(a, b, c, d, new Vector3D(p1.X, p1.Y, p1.Z), new Vector3DBase(p2.X, p2.Y, p2.Z)); - } + public static Vector3D GetCrossPoint(in double a, in double b, in double c, in double d, Vector3D p1, Vector3D p2) + => GetCrossPoint(a, b, c, d, new Vector3D(p1.X, p1.Y, p1.Z), new Vector3DBase(p2.X, p2.Y, p2.Z)); /// /// 3次元において、平面 a x + b y + c z = d (法線ベクトル(a,b,c))と、点pt1とpt2を結ぶ直線と交わる交点を返す @@ -795,8 +781,8 @@ public static PointD[][] GetPointsWithinRectangle(IEnumerable sourcePoin private static PointD[] getCrossPoint(PointD p1, PointD p2, RectangleD rect) { //方程式は y= a x + b - double a = (p2.Y - p1.Y) / (p2.X - p1.X); - double b = p2.Y - a * p2.X; + var a = (p2.Y - p1.Y) / (p2.X - p1.X); + var b = p2.Y - a * p2.X; if (rect.IsInsde(p1))//p1が範囲内にあるとき { diff --git a/PDIndexer/FormSequentialAnalysis.cs b/PDIndexer/FormSequentialAnalysis.cs index 50221b0..460b6ed 100644 --- a/PDIndexer/FormSequentialAnalysis.cs +++ b/PDIndexer/FormSequentialAnalysis.cs @@ -79,7 +79,7 @@ private void buttonExecute_Click(object sender, EventArgs e) } textBox2theta.Text = textBoxDspacing.Text = textBoxFWHM.Text = textBoxIntensity.Text = $"{text}\r\n"; - textBoxCellConstants.Text = (stressMode ? "Degree" : "Profile Name") + "\tV\tV_err\tA\tA_err\tB\tB_err\tC\tC_err\tAlpha\tAlpha_err\tBeta\tBeta_err\tGamma\tGamma_err\r\n"; + textBoxCellConstants.Text = $"{(stressMode ? "Degree" : "Profile Name")}\tV\tV_err\tA\tA_err\tB\tB_err\tC\tC_err\tAlpha\tAlpha_err\tBeta\tBeta_err\tGamma\tGamma_err\r\n"; Func<(string Researcher, double Pressure)[]> eos = formMain.bindingSourceCrystal.Position switch { @@ -97,7 +97,7 @@ private void buttonExecute_Click(object sender, EventArgs e) }; if (eos == null) - textBoxPressure.Text = (stressMode ? "Degree" : "Profile Name") + "\tPressure\r\n"; + textBoxPressure.Text = $"{(stressMode ? "Degree" : "Profile Name")}\tPressure\r\n"; else { textBoxPressure.Text = stressMode ? "Degree" : "Profile Name"; diff --git a/PDIndexer/PDIndexer.csproj b/PDIndexer/PDIndexer.csproj index 1706202..eef2831 100644 --- a/PDIndexer/PDIndexer.csproj +++ b/PDIndexer/PDIndexer.csproj @@ -4,8 +4,8 @@ WinExe net7.0-windows true - 2023.1.30.0804 - 2023.1.30.0804 + 2023.1.30.0818 + 2023.1.30.0818 App.ico