Largest Update of Code after 2 Years.

Finished alpha Testing.
Gipfelgrab · Sep 7, 2021 · 62f5f63 · 62f5f63
1 parent f173dbc
commit 62f5f63
Show file tree

Hide file tree

Showing 53 changed files with 25,502 additions and 6,412 deletions.
diff --git a/CalScec/Analysis/Fitting/LMA.cs b/CalScec/Analysis/Fitting/LMA.cs
@@ -6817,14 +6817,29 @@ private static bool FitBackground(Analysis.Peaks.Functions.PeakFunction PF, doub
 
         #region Peak region routines
 
+        //private static void FitPeakRegionFunction(Analysis.Peaks.Functions.PeakRegionFunction PRF, double lambda)
+        //{
+        //    bool Converged = false;
+        //    double Lambda = lambda;
+
+        //    Analysis.Peaks.Functions.PeakRegionFunction TrialPeakRegion = PRF.Clone() as Analysis.Peaks.Functions.PeakRegionFunction;
+
+        //    double FirstChi2 = TrialPeakRegion.Chi2Function;
+        //    for (int TotalTrials = 0; TotalTrials < CalScec.Properties.Settings.Default.MaxFittingTrials; TotalTrials++)
+        //    {
+
+        //    }
+
+        //}
+
         private static void CorrectFWHMLorentzRatioDown(Analysis.Peaks.Functions.PeakRegionFunction PRF)
         {
             for (int i = 0; i < 5; i++)
             {
                 for (int n = 0; n < PRF.Count; n++)
                 {
-                    PRF[n].Sigma *= 0.9;
-                    PRF[n].LorentzRatio *= 0.9;
+                    PRF[n].Sigma *= 0.95;
+                    //PRF[n].LorentzRatio *= 0.9;
                 }
 
                 FitAngleSigmaIntensityLorentzRatioBackground(PRF, LMA._lambda, true);

diff --git a/CalScec/Analysis/Fitting/PeakFittingWindow.xaml b/CalScec/Analysis/Fitting/PeakFittingWindow.xaml
@@ -68,7 +68,7 @@
                         <MenuItem Name="ResidualMinorGridStyleDash" Header="Dash" IsCheckable="True"  Click="ChangeResidualMinorGridLineStyle_Click"/>
                     </MenuItem>
                 </MenuItem>
-                <MenuItem Header="Reflex auto correction active" IsCheckable="True" Name="ReflexAutoCorrection" Click="ReflexAutoCorrection_Click"/>
+                <MenuItem Header="Peak auto correction active" IsCheckable="True" Name="ReflexAutoCorrection" Click="ReflexAutoCorrection_Click"/>
             </MenuItem>
             <Separator Width="35"/>
             <MenuItem Header="Region manipulations">