update

seto77 · May 24, 2024 · fb7f89b · fb7f89b
1 parent 12aea2c
commit fb7f89b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj
@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2024.4.17.1120</AssemblyVersion>
-    <FileVersion>2024.4.17.1120</FileVersion>
+    <AssemblyVersion>2024.5.24.0949</AssemblyVersion>
+    <FileVersion>2024.5.24.0949</FileVersion>
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
     <ApplicationUseCompatibleTextRendering>true</ApplicationUseCompatibleTextRendering>
     <ApplicationVisualStyles>true</ApplicationVisualStyles>

diff --git a/Crystallography.OpenGL/Crystallography.OpenGL.csproj b/Crystallography.OpenGL/Crystallography.OpenGL.csproj
@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2024.4.11.1000</AssemblyVersion>
-    <FileVersion>2024.4.11.1000</FileVersion>
+    <AssemblyVersion>2024.5.24.0949</AssemblyVersion>
+    <FileVersion>2024.5.24.0949</FileVersion>
     <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 

diff --git a/Crystallography/BetheMethod.cs b/Crystallography/BetheMethod.cs
@@ -1603,7 +1603,7 @@ public void GetHRTEMImage(int BlochNum, double AccVol, Matrix3D rot, (double R,
                                 h == null ? es.FactorImaginaryAnnular(kV, g.Vec, m, inner, outer) : es.FactorImaginaryAnnular(kV, g.Vec, h.Vec, m, inner, outer);//非弾性散乱因子 答えは無次元
                         }
                     }
-                    var d = Exp(-m * s2 - TwoPiI * (atom * index)) * atoms.Occ;//expの中がマイナスなのが、U'マトリックスを転置させなければいけない理由かも。違うか。。
+                    var d = Exp(-m * s2 + TwoPiI * (atom * index)) * atoms.Occ;
                     fReal += real * d;
                     fImag += imag * d;
                 }

diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj
@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2024.4.17.1120</AssemblyVersion>
-    <FileVersion>2024.4.17.1120</FileVersion>
+    <AssemblyVersion>2024.5.24.0949</AssemblyVersion>
+    <FileVersion>2024.5.24.0949</FileVersion>
     <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 

diff --git a/ReciPro/ReciPro.csproj b/ReciPro/ReciPro.csproj
@@ -4,8 +4,8 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2024.4.11.1000</AssemblyVersion>
-    <FileVersion>2024.4.11.1000</FileVersion>
+    <AssemblyVersion>2024.5.24.0949</AssemblyVersion>
+    <FileVersion>2024.5.24.0949</FileVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <ApplicationIcon>App.ico</ApplicationIcon>

diff --git a/ReciPro/Version.cs b/ReciPro/Version.cs
@@ -7,6 +7,7 @@ internal static class Version
 
     public const string History =
         "History" +
+        "\r\n ver4.884(2024/05/24)  Fixed a bug in the calculations of dynamical theory." +
         "\r\n ver4.883(2024/04/06)  Fixed minor bugs in the 'CBED setting'. Update bundled libraries." +
         "\r\n ver4.882(2024/03/16)  Improved GUI in the 'Diffraction simulator'. (see https://github.com/seto77/ReciPro/issues/30, thanks to lukmuk-san)" +
         "\r\n ver4.881(2024/03/11)  Checked security problem ((see https://github.com/seto77/ReciPro/issues/31)." +