Unify iterating over items, fix ts_template_match & threshold_picks bugs (#351)

Author: dtegunov

EstimateWeights/EstimateWeights.csproj

@@ -4,6 +4,7 @@
     <OutputType>Exe</OutputType>
     <Version>2.0.0</Version>
     <AssemblyVersion>2.0.0</AssemblyVersion>
+    <PublishSingleFile>true</PublishSingleFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\bin\</OutputPath>

Warp/MainWindow.xaml.cs

@@ -2286,7 +2286,7 @@ private void UpdateStatsStatus()
 
             try
             {
-                JsonArray ItemsJson = new JsonArray(Items.Select(m => m.ToMiniJson(Options.Filter.ParticlesSuffix)).ToArray());
+                JsonArray ItemsJson = new JsonArray(Items.Select(m => m.ToMiniJson()).ToArray());
                 File.WriteAllText(Path.Join(Options.Import.ProcessingOrDataFolder, "items.json"), ItemsJson.ToJsonString(new JsonSerializerOptions() { WriteIndented = true }));
             }
             catch { }

WarpLib/Movie/Movie.cs

@@ -2337,7 +2337,7 @@ public virtual int[] GetRelevantImageSizes(int fullSize, float weightingThreshol
             return Result;
         }
 
-        public JsonNode ToMiniJson(string particleSuffix)
+        public virtual JsonNode ToMiniJson(string particleSuffix = null)
         {
             JsonNode Json = new JsonObject();
 
@@ -2364,15 +2364,15 @@ public JsonNode ToMiniJson(string particleSuffix)
                 Json["AsY"] = CTF == null ? null : MathF.Round(MathF.Sin((float)CTF.DefocusAngle * 2 * Helper.ToRad) * (float)CTF.DefocusDelta, 4);
             }
 
-            // Motion
-            Json["Mtn"] = MeanFrameMovement <= 0 ? null : MathF.Round((float)MeanFrameMovement, 2);
-
             // 💩 percentage
             Json["Jnk"] = MaskPercentage < 0 ? null : MathF.Round((float)MaskPercentage, 1);
 
             // Particle count for given suffix
-            int ParticleCount = GetParticleCount(particleSuffix);
-            Json["Ptc"] = ParticleCount < 0 ? null : ParticleCount;
+            if (particleSuffix != null)
+            {
+                int ParticleCount = GetParticleCount(particleSuffix);
+                Json["Ptc"] = ParticleCount < 0 ? null : ParticleCount;
+            }
 
             return Json;
         }

WarpLib/TiltSeries/TiltSeries.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Nodes;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -2325,6 +2326,46 @@ public override void SaveMeta()
             }
         }
 
+        public override JsonNode ToMiniJson(string particleSuffix = null)
+        {
+            JsonNode Json = new JsonObject();
+
+            // Path relative to processing folder, i.e. just the file name
+            // Full path to data (including if it's in a nested folder) is stored in XML metadata
+            Json["Path"] = Helper.PathToNameWithExtension(Path);
+
+            // ProcessingStatus enum
+            Json["Stat"] = (int)ProcessingStatus;
+
+            // CTF
+            {
+                // Defocus
+                Json["Def"] = CTF == null ? null : MathF.Round((float)CTF.Defocus, 4);
+
+                // Phase shift
+                Json["Phs"] = CTF == null ? null : MathF.Round((float)CTF.PhaseShift, 2);
+
+                // Estimated resolution
+                Json["Rsn"] = CTFResolutionEstimate <= 0 ? null : MathF.Round((float)CTFResolutionEstimate, 2);
+
+                // Astigmatism plot X and Y
+                Json["AsX"] = CTF == null ? null : MathF.Round(MathF.Cos((float)CTF.DefocusAngle * 2 * Helper.ToRad) * (float)CTF.DefocusDelta, 4);
+                Json["AsY"] = CTF == null ? null : MathF.Round(MathF.Sin((float)CTF.DefocusAngle * 2 * Helper.ToRad) * (float)CTF.DefocusDelta, 4);
+            }
+
+            // Tilt count
+            Json["Tlts"] = NTilts;
+
+            // Particle count for given suffix
+            if (particleSuffix != null)
+            {
+                int ParticleCount = GetParticleCount(particleSuffix);
+                Json["Ptc"] = ParticleCount < 0 ? null : ParticleCount;
+            }
+
+            return Json;
+        }
+
         #endregion
 
         #region Hashes