Infineon.EAF.Runtime v2.61.1

Handle center point zero readings
Add IndexOf and AttemptCounter properties to WSRequest and Description classes; implement getValue function in recipes-and-patterns.js
2025-10-15 07:24:26 -07:00 · 2025-10-15 07:24:15 -07:00 · 2025-10-13 17:43:00 -07:00 · 2025-09-08 15:31:55 -07:00 · 2025-09-02 08:14:26 -07:00 · 2025-08-27 11:47:15 -07:00
50 changed files with 1921 additions and 402 deletions
--- a/Adaptation/.editorconfig
+++ b/Adaptation/.editorconfig
@ -110,7 +110,7 @@ dotnet_diagnostic.CA2254.severity = none # CA2254: The logging message template
 dotnet_diagnostic.IDE0001.severity = warning # IDE0001: Simplify name
 dotnet_diagnostic.IDE0002.severity = warning # Simplify (member access) - System.Version.Equals("1", "2"); Version.Equals("1", "2");
 dotnet_diagnostic.IDE0004.severity = warning # IDE0004: Cast is redundant.
-dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary
+dotnet_diagnostic.IDE0005.severity = none # Using directive is unnecessary
 dotnet_diagnostic.IDE0028.severity = none # IDE0028: Collection initialization can be simplified
 dotnet_diagnostic.IDE0031.severity = warning # Use null propagation (IDE0031)
 dotnet_diagnostic.IDE0047.severity = warning # IDE0047: Parentheses can be removed
@ -122,6 +122,7 @@ dotnet_diagnostic.IDE0290.severity = none # Use primary constructor [Distance]cs
 dotnet_diagnostic.IDE0300.severity = none # IDE0300: Collection initialization can be simplified
 dotnet_diagnostic.IDE0301.severity = none #IDE0301: Collection initialization can be simplified
 dotnet_diagnostic.IDE0305.severity = none # IDE0305: Collection initialization can be simplified
+dotnet_diagnostic.MSTEST0015.severity = none # MSTEST0015: Test method {method} should not be ignored
 dotnet_diagnostic.MSTEST0037.severity = error # MSTEST0037: Use proper 'Assert' methods
 dotnet_diagnostic.SYSLIB1045.severity = none # SYSLIB1045: diagnostics for regex source generation
 dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning
--- a/Adaptation/.vscode/launch.json
+++ b/Adaptation/.vscode/launch.json
@ -1,16 +1,43 @@
 {
  "configurations": [
    {
-      "name": ".NET Core Attach",
-      "type": "coreclr",
-      "request": "attach",
-      "processId": 24012
+      "mode": "debug",
+      "name": "Go launch file",
+      "program": "${file}",
+      "request": "launch",
+      "type": "go"
    },
    {
-        "type": "node",
-        "request": "launch",
-        "name": "node Launch Current Opened File",
-        "program": "${file}"
+      "name": "node Launch Current Opened File",
+      "program": "${file}",
+      "request": "launch",
+      "type": "node"
+    },
+    {
+      "cwd": "${workspaceFolder}",
+      "internalConsoleOptions": "neverOpen",
+      "name": "Debug File",
+      "program": "${file}",
+      "request": "launch",
+      "stopOnEntry": false,
+      "type": "bun",
+      "watchMode": false
+    },
+    {
+      "cwd": "${workspaceFolder}",
+      "internalConsoleOptions": "neverOpen",
+      "name": "Run File",
+      "noDebug": true,
+      "program": "${file}",
+      "request": "launch",
+      "type": "bun",
+      "watchMode": false
+    },
+    {
+      "name": ".NET Core Attach",
+      "processId": 32760,
+      "request": "attach",
+      "type": "coreclr"
    }
  ]
-}
+}
--- a/Adaptation/.vscode/tasks.json
+++ b/Adaptation/.vscode/tasks.json
@ -1,19 +1,134 @@
 {
    "version": "2.0.0",
+    "inputs": [
+        {
+            "default": "Development",
+            "description": "Which ASP Net Core Environment?",
+            "id": "ASPNETCORE_ENVIRONMENT",
+            "options": [
+                "Development",
+                "Production"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "{AssemblyTitle}",
+            "description": "What Assembly Title?",
+            "id": "AssemblyTitle",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.BuildId}",
+            "description": "Which Build BuildId?",
+            "id": "Build.BuildId",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.Reason}",
+            "description": "Which Build Reason?",
+            "id": "Build.Reason",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.Repository.Id}",
+            "description": "Which Build Repository Id?",
+            "id": "Build.Repository.Id",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.Repository.Name}",
+            "description": "Which Build Repository Name?",
+            "id": "Build.Repository.Name",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.SourceVersion}",
+            "description": "Which Build Source Version?",
+            "id": "Build.SourceVersion",
+            "type": "promptString"
+        },
+        {
+            "default": "Debug",
+            "description": "Which Configuration?",
+            "id": "Configuration",
+            "options": [
+                "Debug",
+                "Release"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "net8.0",
+            "description": "Which Core Version?",
+            "id": "CoreVersion",
+            "options": [
+                "net8.0"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe",
+            "description": "Which MS Build?",
+            "id": "MSBuild",
+            "type": "promptString"
+        },
+        {
+            "default": "https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/",
+            "description": "Which Nuget Source?",
+            "id": "NugetSource",
+            "type": "promptString"
+        },
+        {
+            "default": "win-x64",
+            "description": "Which Runtime?",
+            "id": "Runtime",
+            "options": [
+                "win-x64",
+                "win-x32",
+                "linux-x64",
+                "linux-x32"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "L:/",
+            "description": "Which System DefaultWorkingDirectory?",
+            "id": "System.DefaultWorkingDirectory",
+            "options": [
+                "L:/",
+                "D:/",
+                "C:/"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "v4.8",
+            "description": "Which Core Target Framework Version?",
+            "id": "TargetFrameworkVersion",
+            "options": [
+                "v4.8"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "{UserSecretsId}",
+            "description": "Which Core User Secrets Id?",
+            "id": "UserSecretsId",
+            "type": "promptString"
+        }
+    ],
    "tasks": [
        {
            "label": "Build",
            "command": "dotnet",
            "type": "process",
            "args": [
-                "build",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "build"
            ],
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Test-Debug",
+            "label": "Test Debug",
            "command": "dotnet",
            "type": "process",
            "args": [
@ -24,7 +139,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Test-Release",
+            "label": "Test Release",
            "command": "dotnet",
            "type": "process",
            "args": [
@ -50,7 +165,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Format-Whitespaces",
+            "label": "Format Whitespaces",
            "command": "dotnet",
            "type": "process",
            "args": [
@ -87,13 +202,13 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Project",
+            "label": "Code Project",
            "type": "shell",
            "command": "code ../MET08THFTIRSTRATUS.csproj",
            "problemMatcher": []
        },
        {
-            "label": "Readme",
+            "label": "Code Read Me",
            "type": "shell",
            "command": "code ../README.md",
            "problemMatcher": []
@ -113,7 +228,7 @@
            "problemMatcher": []
        },
        {
-            "label": "Git Config",
+            "label": "Code Git Config",
            "type": "shell",
            "command": "code ../.git/config",
            "problemMatcher": []
--- a/Adaptation/FileHandlers/APC/FileRead.cs
+++ b/Adaptation/FileHandlers/APC/FileRead.cs
@ -128,7 +128,7 @@ public class FileRead : Shared.FileRead, IFileRead
        Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
            FileCopy(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/Archive/FileRead.cs
+++ b/Adaptation/FileHandlers/Archive/FileRead.cs
@ -153,7 +153,7 @@ public class FileRead : Shared.FileRead, IFileRead
        Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
            MoveArchive(reportFullPath, dateTime);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/IQSSi/FileRead.cs
+++ b/Adaptation/FileHandlers/IQSSi/FileRead.cs
@ -103,7 +103,7 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

-    private void FileCopy<T>(string reportFullPath, DateTime dateTime, List<T> descriptions) where T : Shared.Properties.IDescription
+    private void WriteFile<T>(string reportFullPath, DateTime dateTime, List<T> descriptions) where T : Shared.Properties.IDescription
    {
        bool isDummyRun = false;
        string successDirectory = string.Empty;
@ -111,8 +111,9 @@ public class FileRead : Shared.FileRead, IFileRead
        string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
        if (!Directory.Exists(duplicateDirectory))
            _ = Directory.CreateDirectory(duplicateDirectory);
-        string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
-        File.Copy(reportFullPath, duplicateFile, overwrite: true);
+        string duplicateFile = Path.Combine(duplicateDirectory, $"{Path.GetFileName(reportFullPath)}.xml");
+        string xml = ProcessDataStandardFormat.GetXml(reportFullPath);
+        File.WriteAllText(duplicateFile, xml);
        WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
    }

@ -126,8 +127,8 @@ public class FileRead : Shared.FileRead, IFileRead
        List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
        Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            FileCopy(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+            WriteFile(reportFullPath, dateTime, descriptions);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs
+++ b/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs
@ -88,9 +88,9 @@ public class FileRead : Shared.FileRead, IFileRead
        string processDataStandardFormatMappingOldColumnNames = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Process.Data.Standard.Format.Mapping.Old.Column.Names");
        string processDataStandardFormatMappingNewColumnNames = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Process.Data.Standard.Format.Mapping.New.Column.Names");
        string processDataStandardFormatMappingColumnIndices = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Process.Data.Standard.Format.Mapping.Column.Indices");
-        _ProcessDataStandardFormatMapping = GetProcessDataStandardFormatMapping(processDataStandardFormatMappingOldColumnNames,
-                                                                                processDataStandardFormatMappingNewColumnNames,
-                                                                                processDataStandardFormatMappingColumnIndices);
+        _ProcessDataStandardFormatMapping = ProcessDataStandardFormatMapping.Get(processDataStandardFormatMappingOldColumnNames,
+                                                                                 processDataStandardFormatMappingNewColumnNames,
+                                                                                 processDataStandardFormatMappingColumnIndices);
    }

    void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception)
@ -169,46 +169,6 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

-    private static ProcessDataStandardFormatMapping GetProcessDataStandardFormatMapping(string processDataStandardFormatMappingOldColumnNames, string processDataStandardFormatMappingNewColumnNames, string processDataStandardFormatMappingColumnIndices)
-    {
-        ProcessDataStandardFormatMapping result;
-        string[] segmentsB;
-        List<string> distinct = new();
-        Dictionary<string, string> keyValuePairs = new();
-        string args4 = "Time,HeaderUniqueId,UniqueId,Date,Wafer,Position,BIORAD4";
-        string args5 = ",BIORAD4";
-        string args6 = ",BIORAD4";
-        string args7 = "Test|EventId,Date|DateTime,Position|Slot,DeltaThicknessSlotsOneAndTwentyFive|Actual Delta Thick Pts 1 and 25,PercentDeltaThicknessSlotsOneAndTwentyFive|% Delta Thick Pts 1 and 25,MID|Cassette,Lot|Batch,Title|Batch,Wafer|Text,Thickness|Site,MeanThickness|GradeMean,|BIORAD4";
-        // string args8 = "Time,A_LOGISTICS,B_LOGISTICS,Test,Count,Index,MesEntity,MID,Date,Employee,Lot,PSN,Reactor,Recipe,Cassette,GradeStdDev,HeaderUniqueId,Layer,MeanThickness,PassFail,RDS,Slot,Title,UniqueId,Wafer,Zone,Mean,Position,StdDev,Thickness,ThicknessSlotOne,ThicknessSlotTwentyFive,DeltaThicknessSlotsOneAndTwentyFive,PercentDeltaThicknessSlotsOneAndTwentyFive";
-        // string args9 = "Time,A_LOGISTICS,B_LOGISTICS,Count,Sequence,MesEntity,Index,Batch,Cassette,DateTime,Destination,Mean,PassFail,Recipe,Reference,Site,Slot,Source,StdDev,Text,GradeMean,GradeStdDev,RDS,PSN,Reactor,Layer,Zone,Employee,InferredLot,Actual Delta Thick Pts 1 and 25,% Delta Thick Pts 1 and 25,EventId",
-        // string args10 = "0,1,2,31,3,6,5,8,9,27,7,23,24,13,8,21,-1,25,20,12,22,16,7,-1,19,26,11,16,18,15,-1,-1,29,30";
-        string[] segments = args7.Split(',');
-        ReadOnlyCollection<string> ignoreColumns = new(args4.Split(','));
-        ReadOnlyCollection<string> backfillColumns = new(args5.Split(','));
-        ReadOnlyCollection<string> indexOnlyColumns = new(args6.Split(','));
-        ReadOnlyCollection<string> newColumnNames = new(processDataStandardFormatMappingNewColumnNames.Split(','));
-        ReadOnlyCollection<string> oldColumnNames = new(processDataStandardFormatMappingOldColumnNames.Split(','));
-        ReadOnlyCollection<int> columnIndices = new(processDataStandardFormatMappingColumnIndices.Split(',').Select(int.Parse).ToArray());
-        foreach (string segment in segments)
-        {
-            segmentsB = segment.Split('|');
-            if (segmentsB.Length != 2)
-                continue;
-            if (distinct.Contains(segmentsB[0]))
-                continue;
-            distinct.Add(segmentsB[0]);
-            keyValuePairs.Add(segmentsB[0], segmentsB[1]);
-        }
-        result = new(backfillColumns: backfillColumns,
-                     columnIndices: columnIndices,
-                     newColumnNames: newColumnNames,
-                     ignoreColumns: ignoreColumns,
-                     indexOnlyColumns: indexOnlyColumns,
-                     keyValuePairs: new(keyValuePairs),
-                     oldColumnNames: oldColumnNames);
-        return result;
-    }
-
    private static ReadOnlyCollection<PreWith> GetPreWithCollection(ReadOnlyCollection<Pre> preCollection)
    {
        List<PreWith> results = new();
@ -268,7 +228,7 @@ public class FileRead : Shared.FileRead, IFileRead
        }
    }

-    private static ReadOnlyCollection<Pre> GetPreCollection(int numberLength, string parentDirectory, ReadOnlyCollection<string> matchingFiles, bool mesEntityMatchesProcess)
+    private static ReadOnlyCollection<Pre> GetPreCollection(int numberLength, string parentDirectory, ReadOnlyCollection<string> matchingFiles)
    {
        List<Pre> results = new();
        Pre pre;
@ -277,8 +237,6 @@ public class FileRead : Shared.FileRead, IFileRead
        foreach (string matchingFile in matchingFiles)
        {
            checkFile = $"{matchingFile[0]}{matchingFile.Substring(parentDirectoryLength + numberLength + 1)}";
-            if (mesEntityMatchesProcess)
-                checkFile = checkFile.Replace("MET08THFTIRSTRATUS", "MET08THFTIRQS408M");
            pre = new(matchingFile, checkFile);
            results.Add(pre);
        }
@ -315,8 +273,13 @@ public class FileRead : Shared.FileRead, IFileRead
                continue;
            if (!_StaticRuns.TryGetValue(_Logistics.Sequence, out List<Shared.Metrology.WS.Results>? wsResults))
                wsResults = null;
-            ProcessDataStandardFormat.Write(preWith.CheckFile, processDataStandardFormat, wsResults);
-            File.Delete(preWith.MatchingFile);
+            if (processDataStandardFormat.InputPDSF is null)
+                File.Move(preWith.MatchingFile, preWith.CheckFile);
+            else
+            {
+                ProcessDataStandardFormat.Write(preWith.CheckFile, processDataStandardFormat, wsResults);
+                File.Delete(preWith.MatchingFile);
+            }
            if (Directory.Exists(preWith.NoWaitDirectory))
            {
                post = new(preWith.CheckFile, preWith.ErrFile);
@ -368,10 +331,7 @@ public class FileRead : Shared.FileRead, IFileRead
            { CreatePointerFile(numberLength, parentParentDirectory, matchingFiles); }
            catch (Exception) { }
        }
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
-        List<Stratus.Description> descriptions = Stratus.ProcessData.GetDescriptions(jsonElements);
-        bool mesEntityMatchesProcess = descriptions.Count > 0 && descriptions[0].MesEntity == descriptions[0].Reactor;
-        ReadOnlyCollection<Pre> preCollection = GetPreCollection(numberLength, parentParentDirectory, matchingFiles, mesEntityMatchesProcess);
+        ReadOnlyCollection<Pre> preCollection = GetPreCollection(numberLength, parentParentDirectory, matchingFiles);
        ReadOnlyCollection<PreWith> preWithCollection = GetPreWithCollection(preCollection);
        MoveCollection(dateTime, processDataStandardFormat, preWithCollection);
        return results;
--- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs
+++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs
@ -113,89 +113,60 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

-    private static string GetLines(Logistics logistics, List<Stratus.Description> descriptions)
-    {
-        StringBuilder results = new();
-        char del = '\t';
-        Stratus.Description x = descriptions[0];
-        _ = results.Append("Stratus_").Append(logistics.MID).Append('_').Append(logistics.DateTimeFromSequence.ToString("yyyyMMddhhmmssfff")).Append(del).
-            Append(x.Date).Append(del).
-            Append(logistics.JobID).Append(del).
-            Append("FQA Thickness").Append(del).
-            Append(x.Employee).Append(del).
-            Append(x.Recipe).Append(del).
-            Append(x.Reactor).Append(del).
-            Append(x.RDS).Append(del).
-            Append(x.PSN).Append(del).
-            Append(x.Lot).Append(del).
-            Append(x.Cassette).Append(del).
-            Append(x.MeanThickness);
-        for (int i = 0; i < descriptions.Count; i++)
-            _ = results.Append(del).Append(descriptions[i].Slot).
-                        Append(del).Append(descriptions[i].Mean);
-        return results.ToString();
-    }
-
-    private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, ProcessDataStandardFormat processDataStandardFormat, List<Stratus.Description> descriptions, Test[] tests)
+    private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, List<Stratus.Description> descriptions, Test[] tests)
    {
+        string duplicateFile;
        bool isDummyRun = false;
        List<(Shared.Properties.IScopeInfo, string)> collection = new();
        string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
        if (!Directory.Exists(duplicateDirectory))
            _ = Directory.CreateDirectory(duplicateDirectory);
        string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
-        if (!Directory.Exists(Path.Combine(duplicateDirectory, "1")))
+        if (descriptions.Count == 0 || tests.Length == 0)
+            duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
+        else
        {
-            string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
-            if (parentParent.Contains(_CellInstanceName))
-                parentParent = Path.GetDirectoryName(parentParent);
-            duplicateDirectory = Path.Combine(parentParent, "Data");
-            if (!Directory.Exists(duplicateDirectory))
-                _ = Directory.CreateDirectory(duplicateDirectory);
-        }
-        string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
-        if (descriptions.Count != 0 && tests.Length != 0)
-        {
-            string lines = GetLines(_Logistics, descriptions);
-            if (!string.IsNullOrEmpty(lines))
+            long? subgroupId;
+            string fileName = Path.GetFileName(reportFullPath);
+            long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks;
+            long preWait = _FileConnectorConfiguration?.FileHandleWaitTime is null ? dateTime.AddMilliseconds(1234).Ticks : dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
+            if (string.IsNullOrEmpty(descriptions[0].Reactor) || string.IsNullOrEmpty(descriptions[0].PSN))
+                subgroupId = null;
+            else
+                (subgroupId, int? _, string _) = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait);
+            if (_StaticRuns.TryGetValue(_Logistics.Sequence, out List<WS.Results> wsResults))
            {
-                long? subgroupId;
-                long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks;
-                long preWait = _FileConnectorConfiguration?.FileHandleWaitTime is null ? dateTime.AddMilliseconds(1234).Ticks : dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
-                if (string.IsNullOrEmpty(descriptions[0].Reactor) || string.IsNullOrEmpty(descriptions[0].PSN))
-                    subgroupId = null;
-                else
-                    (subgroupId, int? _, string _) = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait);
-                if (subgroupId is null)
-                    collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), lines));
-                else
-                    collection.Add(new(new ScopeInfo(tests[0], $"{subgroupId.Value} {_OpenInsightFilePattern}"), lines));
-                if (_StaticRuns.TryGetValue(_Logistics.Sequence, out List<WS.Results> wsResults))
-                {
-                    if (wsResults is null || wsResults.Count != 1)
-                        throw new NullReferenceException($"{nameof(wsResults)} {wsResults?.Count} != 1 {_Logistics.Sequence}!");
-                    lock (_StaticRuns)
-                        wsResults[0] = WS.Results.Get(wsResults[0], subgroupId);
-                }
-                string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
-                FromIQS.Save(_OpenInsightApiECDirectory, _Logistics, reportFullPath, processDataStandardFormat, descriptions.First(), lines, subgroupId, weekOfYear);
+                if (wsResults is null || wsResults.Count != 1)
+                    throw new NullReferenceException($"{nameof(wsResults)} {wsResults?.Count} != 1 {_Logistics.Sequence}!");
+                lock (_StaticRuns)
+                    wsResults[0] = WS.Results.Get(wsResults[0], subgroupId);
            }
+            if (!fileName.StartsWith("Viewer"))
+                duplicateFile = Path.Combine(duplicateDirectory, $"{subgroupId} {fileName}".TrimStart());
+            else
+                duplicateFile = Path.Combine(duplicateDirectory, $"{$"Viewer {subgroupId}".TrimEnd()} {fileName.Replace("Viewer", string.Empty)}");
+            string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
+            FromIQS.Save(_OpenInsightApiECDirectory, _Logistics, reportFullPath, descriptions.First(), subgroupId, weekOfYear);
        }
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
+        {
+            File.Copy(reportFullPath, duplicateFile, overwrite: true);
            WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
+        }
    }

    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
    {
        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        string[] lines = File.ReadAllLines(reportFullPath);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines);
        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
        SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(reportFullPath, lines, processDataStandardFormat);
        List<Stratus.Description> descriptions = Stratus.ProcessData.GetDescriptions(jsonElements);
        Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            SaveOpenInsightFile(reportFullPath, dateTime, processDataStandardFormat, descriptions, tests);
+            SaveOpenInsightFile(reportFullPath, dateTime, descriptions, tests);
        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
        return results;
    }
--- a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs
+++ b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs
@ -325,80 +325,18 @@ public class FromIQS
        return new(result, count, commandText);
    }

-    private static string GetJson(Logistics logistics, ProcessDataStandardFormat processDataStandardFormat, Stratus.Description description)
+    internal static void Save(string openInsightApiECDirectory, Logistics logistics, string reportFullPath, Stratus.Description description, long? subGroupId, string weekOfYear)
    {
-        string result;
-        StringBuilder stringBuilder = new();
-        var @object = new
-        {
-            description.MesEntity,
-            description.Employee,
-            description.Layer,
-            description.PSN,
-            description.RDS,
-            description.Reactor,
-            description.Recipe,
-            description.Zone,
-            logistics.DateTimeFromSequence.Ticks
-        };
-        string[] pair;
-        string safeValue;
-        string[] segments;
-        string serializerValue;
-        foreach (string line in processDataStandardFormat.Logistics)
-        {
-            segments = line.Split('\t');
-            if (segments.Length < 2)
-                continue;
-            segments = segments[1].Split(';');
-            _ = stringBuilder.Append('{');
-            foreach (string segment in segments)
-            {
-                pair = segment.Split('=');
-                if (pair.Length != 2 || pair[0].Length < 3)
-                    continue;
-                serializerValue = JsonSerializer.Serialize(pair[1]);
-                safeValue = serializerValue.Substring(1, serializerValue.Length - 2);
-                _ = stringBuilder.Append('"').Append(pair[0].Substring(2)).Append('"').Append(':').Append('"').Append(safeValue).Append('"').Append(',');
-            }
-            if (stringBuilder.Length > 0)
-                _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
-            _ = stringBuilder.Append('}').Append(',');
-        }
-        if (stringBuilder.Length > 0)
-            _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
-        _ = stringBuilder.Append(']').Append('}');
-        _ = stringBuilder.Insert(0, ",\"Logistics\":[");
-        string json = JsonSerializer.Serialize(@object);
-        _ = stringBuilder.Insert(0, json.Substring(0, json.Length - 1));
-        JsonElement? jsonElement = JsonSerializer.Deserialize<JsonElement>(stringBuilder.ToString());
-        result = jsonElement is null ? "{}" : JsonSerializer.Serialize(jsonElement, new JsonSerializerOptions { WriteIndented = true });
-        return result;
-    }
-
-    internal static void Save(string openInsightApiECDirectory, Logistics logistics, string reportFullPath, ProcessDataStandardFormat processDataStandardFormat, Stratus.Description description, string lines, long? subGroupId, string weekOfYear)
-    {
-        string checkFile;
        string fileName = Path.GetFileName(reportFullPath);
-        string json = GetJson(logistics, processDataStandardFormat, description);
        string? ecPathRoot = Path.GetPathRoot(openInsightApiECDirectory);
        bool ecExists = ecPathRoot is not null && Directory.Exists(ecPathRoot);
        string weekYear = $"{logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}";
        string ecDirectory = Path.Combine(openInsightApiECDirectory, weekYear, $"-{description.PSN}", $"-{description.Reactor}", $"-{description.RDS}", $"-{subGroupId}");
        if (ecExists && !Directory.Exists(ecDirectory))
            _ = Directory.CreateDirectory(ecDirectory);
-        checkFile = Path.Combine(ecDirectory, fileName);
+        string checkFile = Path.Combine(ecDirectory, fileName);
        if (ecExists && !File.Exists(checkFile))
            File.Copy(reportFullPath, checkFile);
-        checkFile = Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.txt");
-        if (ecExists && !File.Exists(checkFile))
-            File.WriteAllText(checkFile, lines);
-        checkFile = Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.json");
-        if (ecExists && !File.Exists(checkFile))
-            File.WriteAllText(checkFile, json);
-        checkFile = Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.lbl");
-        if (ecExists && !File.Exists(checkFile))
-            File.WriteAllText(checkFile, processDataStandardFormat.Body[processDataStandardFormat.Body.Count - 1]);
    }

    private static string GetCommandText(string[] iqsCopyValues)
--- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs
+++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs
@ -110,10 +110,10 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

-    private void SendData(string reportFullPath, DateTime dateTime, List<Stratus.Description> descriptions)
+    private void SendData(string reportFullPath, DateTime dateTime, JsonElement[] jsonElements, List<Stratus.Description> descriptions)
    {
        string checkDirectory;
-        WSRequest wsRequest = new(this, _Logistics, descriptions);
+        WSRequest wsRequest = new(this, _Logistics, jsonElements, descriptions);
        int weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
        string directory = Path.Combine(_OpenInsightMetrologyViewerFileShare, dateTime.Year.ToString(), $"WW{weekOfYear:00}");
        checkDirectory = Path.Combine(directory, _Logistics.Sequence.ToString());
@ -139,15 +139,16 @@ public class FileRead : Shared.FileRead, IFileRead
    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
    {
        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        string[] lines = File.ReadAllLines(reportFullPath);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines);
        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
        SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(reportFullPath, lines, processDataStandardFormat);
        List<Stratus.Description> descriptions = Stratus.ProcessData.GetDescriptions(jsonElements);
        Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            SendData(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+            SendData(reportFullPath, dateTime, jsonElements, descriptions);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs
+++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs
@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.Json;

 namespace Adaptation.FileHandlers.OpenInsightMetrologyViewer;

@ -12,11 +13,13 @@ public class WSRequest
 {

    public int Id { get; set; }
+    public string AttemptCounter { get; set; }
    public string Batch { get; set; }
    public string Cassette { get; set; }
    public string CellName { get; set; }
    public string Date { get; set; }
    public string FilePath { get; set; }
+    public string IndexOf { get; set; }
    public string MeanThickness { get; set; }
    public string Operator { get; set; }
    public string PSN { get; set; }
@ -31,7 +34,7 @@ public class WSRequest
    [Obsolete("For json")] public WSRequest() { }

 #pragma warning disable IDE0060
-    internal WSRequest(IFileRead fileRead, Logistics logistics, List<Stratus.Description> descriptions, string processDataStandardFormat = null)
+    internal WSRequest(IFileRead fileRead, Logistics logistics, JsonElement[] jsonElements, List<Stratus.Description> descriptions, string processDataStandardFormat = null)
 #pragma warning restore IDE0060
    {
        Id = -1;
@ -42,16 +45,18 @@ public class WSRequest
        Details = new List<Stratus.Detail>();
        //Header
        {
-            Batch = x.Lot;
+            AttemptCounter = x.AttemptCounter;
+            Batch = x.Lot; // different name
            Cassette = x.Cassette;
            Date = x.Date;
+            IndexOf = x.IndexOf;
            MeanThickness = x.MeanThickness;
-            Operator = x.Employee;
+            Operator = x.Employee; // different name
            PSN = x.PSN;
            RDS = x.RDS;
            Reactor = x.Reactor;
            Recipe = x.Recipe;
-            StdDev = x.GradeStdDev;
+            StdDev = x.GradeStdDev; // different name
            Title = x.Title;
            UniqueId = x.UniqueId;
        }
@ -64,7 +69,6 @@ public class WSRequest
                HeaderUniqueId = description.HeaderUniqueId,
                Mean = description.Mean,
                PassFail = description.PassFail,
-                Position = description.Position,
                Recipe = description.Recipe,
                Slot = description.Slot,
                StdDev = description.StdDev,
@ -73,7 +77,7 @@ public class WSRequest
                Wafer = description.Wafer,
                Points = new()
            };
-            segments = description.Position.Split(',');
+            segments = description.Slot.Split(',');
            foreach (string segment in segments)
                detail.Points.Add(new Stratus.Point { HeaderUniqueId = description.HeaderUniqueId, UniqueId = description.UniqueId, Position = segment });
            segments = description.Thickness.Split(',');
@ -92,14 +96,14 @@ public class WSRequest
        }
    }

-    internal static long GetHeaderId(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, string openInsightMetrologyViewerFileShare, int weekOfYear, WS.Results results, List<Stratus.Description> descriptions)
+    internal static long GetHeaderId(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, string openInsightMetrologyViewerFileShare, int weekOfYear, WS.Results results, JsonElement[] jsonElements, List<Stratus.Description> descriptions)
    {
        long result;
        if (results is not null && results.HeaderId is not null)
            result = results.HeaderId.Value;
        else
        {
-            WSRequest wsRequest = new(fileRead, logistics, descriptions);
+            WSRequest wsRequest = new(fileRead, logistics, jsonElements, descriptions);
            string directory = Path.Combine(openInsightMetrologyViewerFileShare, logistics.DateTimeFromSequence.Year.ToString(), $"WW{weekOfYear:00}");
            (_, WS.Results wsResults) = WS.SendData(openInsightMetrologyViewerAPI, logistics.Sequence, directory, wsRequest);
            if (wsResults.Success is null || !wsResults.Success.Value)
--- a/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs
+++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs
@ -137,7 +137,7 @@ public class FileRead : Shared.FileRead, IFileRead
        return result;
    }

-    private void PostOpenInsightMetrologyViewerAttachments(List<Stratus.Description> descriptions)
+    private void PostOpenInsightMetrologyViewerAttachments(JsonElement[] jsonElements, List<Stratus.Description> descriptions)
    {
        Shared.Metrology.WS.Results? results;
        string jobIdDirectory = Path.Combine(Path.GetDirectoryName(_FileConnectorConfiguration.AlternateTargetFolder) ?? throw new Exception(), _Logistics.JobID);
@ -153,7 +153,7 @@ public class FileRead : Shared.FileRead, IFileRead
            results = wsResults[0];
        }
        int weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
-        long headerId = !_IsEAFHosted ? -1 : OpenInsightMetrologyViewer.WSRequest.GetHeaderId(this, _Logistics, _OpenInsightMetrologyViewerAPI, _OpenInsightMetrologyViewerFileShare, weekOfYear, results, descriptions);
+        long headerId = !_IsEAFHosted ? -1 : OpenInsightMetrologyViewer.WSRequest.GetHeaderId(this, _Logistics, _OpenInsightMetrologyViewerAPI, _OpenInsightMetrologyViewerFileShare, weekOfYear, results, jsonElements, descriptions);
        string? headerIdDirectory = GetHeaderIdDirectory(headerId);
        if (string.IsNullOrEmpty(headerIdDirectory))
            throw new Exception($"Didn't find header id directory <{headerId}>");
@ -165,15 +165,16 @@ public class FileRead : Shared.FileRead, IFileRead
        if (dateTime == DateTime.MinValue)
            throw new ArgumentNullException(nameof(dateTime));
        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        string[] lines = File.ReadAllLines(reportFullPath);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines);
        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
        SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(reportFullPath, lines, processDataStandardFormat);
        List<Stratus.Description> descriptions = Stratus.ProcessData.GetDescriptions(jsonElements);
        Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            PostOpenInsightMetrologyViewerAttachments(descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+            PostOpenInsightMetrologyViewerAttachments(jsonElements, descriptions);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/Processed/FileRead.cs
+++ b/Adaptation/FileHandlers/Processed/FileRead.cs
@ -108,7 +108,7 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

-    private void DirectoryMove(string reportFullPath, DateTime dateTime, List<Stratus.Description> descriptions)
+    private void DirectoryMove(string reportFullPath, DateTime dateTime, JsonElement[] jsonElements, List<Stratus.Description> descriptions)
    {
        if (dateTime == DateTime.MinValue)
            throw new ArgumentNullException(nameof(dateTime));
@ -122,7 +122,7 @@ public class FileRead : Shared.FileRead, IFileRead
            throw new Exception("Didn't find directory by logistics sequence");
        if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime)
            File.SetLastWriteTime(reportFullPath, fileInfo.CreationTime);
-        OpenInsightMetrologyViewer.WSRequest wsRequest = new(this, _Logistics, descriptions);
+        OpenInsightMetrologyViewer.WSRequest wsRequest = new(this, _Logistics, jsonElements, descriptions);
        JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true };
        string json = JsonSerializer.Serialize(wsRequest, wsRequest.GetType(), jsonSerializerOptions);
        string directoryName = $"{Path.GetFileName(matchDirectories[0]).Split(new string[] { logisticsSequence }, StringSplitOptions.None)[0]}{_Logistics.DateTimeFromSequence:yyyy-MM-dd_hh;mm_tt_}{DateTime.Now.Ticks - _Logistics.Sequence}";
@ -166,23 +166,24 @@ public class FileRead : Shared.FileRead, IFileRead
    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
    {
        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath);
+        string[] lines = File.ReadAllLines(reportFullPath);
+        ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines);
        _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
        SetFileParameterLotIDToLogisticsMID();
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
+        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(reportFullPath, lines, processDataStandardFormat);
        List<Stratus.Description> descriptions = Stratus.ProcessData.GetDescriptions(jsonElements);
        Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            DirectoryMove(reportFullPath, dateTime, descriptions);
+            DirectoryMove(reportFullPath, dateTime, jsonElements, descriptions);
        else if (!_IsEAFHosted)
        {
-            OpenInsightMetrologyViewer.WSRequest wsRequest = new(this, _Logistics, descriptions);
+            OpenInsightMetrologyViewer.WSRequest wsRequest = new(this, _Logistics, jsonElements, descriptions);
            JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true };
-            string json = JsonSerializer.Serialize(wsRequest, wsRequest.GetType(), jsonSerializerOptions);
+            string check = JsonSerializer.Serialize(wsRequest, wsRequest.GetType(), jsonSerializerOptions);
            string jsonFileName = Path.ChangeExtension(reportFullPath, ".json");
            string historicalText = File.ReadAllText(jsonFileName);
-            if (json != historicalText)
+            if (check != historicalText)
                throw new Exception("File doesn't match historical!");
        }
        return results;
--- a/Adaptation/FileHandlers/SPaCe/FileRead.cs
+++ b/Adaptation/FileHandlers/SPaCe/FileRead.cs
@ -125,7 +125,7 @@ public class FileRead : Shared.FileRead, IFileRead
        Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
            FileCopy(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
        return results;
    }

--- a/Adaptation/FileHandlers/Stratus/Description.cs
+++ b/Adaptation/FileHandlers/Stratus/Description.cs
@ -4,54 +4,56 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
+using System.Text.Json.Serialization;

 namespace Adaptation.FileHandlers.Stratus;

 public class Description : IDescription, Shared.Properties.IDescription
 {

-    public int Test { get; set; }
-    public int Count { get; set; }
-    public int Index { get; set; }
+    [JsonPropertyName("EventId")] public int Test { get; set; }
+    [JsonPropertyName("Count")] public int Count { get; set; }
+    [JsonPropertyName("Index")] public int Index { get; set; }
    //
    public string EventName { get; set; }
    public string NullData { get; set; }
    public string JobID { get; set; }
    public string Sequence { get; set; }
-    public string MesEntity { get; set; }
+    [JsonPropertyName("MesEntity")] public string MesEntity { get; set; }
    public string ReportFullPath { get; set; }
    public string ProcessJobID { get; set; }
-    public string MID { get; set; }
+    public string MID { get; set; } // [JsonPropertyName("Cassette")]
    //
-    public string Date { get; set; }
-    public string Employee { get; set; }
-    public string Lot { get; set; }
-    public string PSN { get; set; }
-    public string Reactor { get; set; }
-    public string Recipe { get; set; }
+    [JsonPropertyName("DateTime")] public string Date { get; set; }
+    [JsonPropertyName("Employee")] public string Employee { get; set; }
+    [JsonPropertyName("Batch")] public string Lot { get; set; }
+    [JsonPropertyName("PSN")] public string PSN { get; set; }
+    [JsonPropertyName("Reactor")] public string Reactor { get; set; }
+    [JsonPropertyName("Recipe")] public string Recipe { get; set; }
+    [JsonPropertyName("IndexOf")] public string IndexOf { get; set; }
+    [JsonPropertyName("AttemptCounter")] public string AttemptCounter { get; set; }
    //
-    public string Cassette { get; set; }
-    public string GradeStdDev { get; set; }
+    [JsonPropertyName("Cassette")] public string Cassette { get; set; }
+    [JsonPropertyName("GradeStdDev")] public string GradeStdDev { get; set; }
    public string HeaderUniqueId { get; set; }
-    public string Layer { get; set; }
-    public string MeanThickness { get; set; }
-    public string PassFail { get; set; }
-    public string RDS { get; set; }
-    public string Slot { get; set; }
-    public string Title { get; set; }
+    [JsonPropertyName("Layer")] public string Layer { get; set; }
+    [JsonPropertyName("GradeMean")] public string MeanThickness { get; set; }
+    [JsonPropertyName("PassFail")] public string PassFail { get; set; }
+    [JsonPropertyName("RDS")] public string RDS { get; set; }
+    [JsonPropertyName("Slot")] public string Slot { get; set; }
+    public string Title { get; set; } // [JsonPropertyName("Batch")]
    public string UniqueId { get; set; }
-    public string Wafer { get; set; }
-    public string Zone { get; set; }
+    [JsonPropertyName("Text")] public string Wafer { get; set; }
+    [JsonPropertyName("Zone")] public string Zone { get; set; }
    //
-    public string Mean { get; set; }
-    public string Position { get; set; }
-    public string StdDev { get; set; }
-    public string Thickness { get; set; }
+    [JsonPropertyName("Mean")] public string Mean { get; set; }
+    [JsonPropertyName("StdDev")] public string StdDev { get; set; }
+    [JsonPropertyName("Site")] public string Thickness { get; set; }
    //
-    public string ThicknessSlotOne { get; set; }
-    public string ThicknessSlotTwentyFive { get; set; }
-    public string DeltaThicknessSlotsOneAndTwentyFive { get; set; }
-    public string PercentDeltaThicknessSlotsOneAndTwentyFive { get; set; }
+    [JsonPropertyName("ThicknessSlotOne")] public string ThicknessSlotOne { get; set; }
+    [JsonPropertyName("ThicknessSlotTwentyFive")] public string ThicknessSlotTwentyFive { get; set; }
+    [JsonPropertyName("Actual Delta Thick Pts 1 and 25")] public string DeltaThicknessSlotsOneAndTwentyFive { get; set; }
+    [JsonPropertyName("% Delta Thick Pts 1 and 25")] public string PercentDeltaThicknessSlotsOneAndTwentyFive { get; set; }

    string IDescription.GetEventDescription() => "File Has been read and parsed";

@ -113,7 +115,7 @@ public class Description : IDescription, Shared.Properties.IDescription
        List<string> results = new()
        {
            nameof(Mean),
-            nameof(Position),
+            nameof(Slot),
            nameof(StdDev),
            nameof(Thickness)
        };
@ -203,6 +205,8 @@ public class Description : IDescription, Shared.Properties.IDescription
                    PSN = processData.PSN,
                    Reactor = processData.Reactor,
                    Recipe = detail.Recipe,
+                    IndexOf = nameof(IndexOf),
+                    AttemptCounter = nameof(AttemptCounter),
                    //
                    Cassette = processData.Cassette,
                    GradeStdDev = processData.StdDev,
@ -218,7 +222,6 @@ public class Description : IDescription, Shared.Properties.IDescription
                    Zone = processData.Zone,
                    //
                    Mean = detail.Mean,
-                    Position = detail.Position,
                    StdDev = detail.StdDev,
                    Thickness = detail.Thickness,
                    //
@ -263,6 +266,8 @@ public class Description : IDescription, Shared.Properties.IDescription
            PSN = nameof(PSN),
            Reactor = nameof(Reactor),
            Recipe = nameof(Recipe),
+            IndexOf = nameof(IndexOf),
+            AttemptCounter = nameof(AttemptCounter),
            //
            Cassette = nameof(Cassette),
            GradeStdDev = nameof(GradeStdDev),
@ -278,7 +283,6 @@ public class Description : IDescription, Shared.Properties.IDescription
            Zone = nameof(Zone),
            //
            Mean = nameof(Mean),
-            Position = nameof(Position),
            StdDev = nameof(StdDev),
            Thickness = nameof(Thickness),
            //
@ -292,4 +296,16 @@ public class Description : IDescription, Shared.Properties.IDescription

    internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt";

+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description))]
+internal partial class DescriptionSourceGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description[]))]
+internal partial class DescriptionArraySourceGenerationContext : JsonSerializerContext
+{
 }
--- a/Adaptation/FileHandlers/Stratus/Detail.cs
+++ b/Adaptation/FileHandlers/Stratus/Detail.cs
@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Text.Json.Serialization;

 namespace Adaptation.FileHandlers.Stratus;

@ -6,15 +7,26 @@ public class Detail
 {

    public string HeaderUniqueId { get; set; }
-    public string Mean { get; set; }
-    public string PassFail { get; set; }
-    public string Position { get; set; }
-    public string Recipe { get; set; }
-    public string Slot { get; set; }
-    public string StdDev { get; set; }
+    [JsonPropertyName("Mean")] public string Mean { get; set; }
+    [JsonPropertyName("PassFail")] public string PassFail { get; set; }
+    [JsonPropertyName("Recipe")] public string Recipe { get; set; }
+    [JsonPropertyName("Slot")] public string Slot { get; set; }
+    [JsonPropertyName("StdDev")] public string StdDev { get; set; }
    public string UniqueId { get; set; }
-    public string Thickness { get; set; }
-    public string Wafer { get; set; }
+    [JsonPropertyName("Site")] public string Thickness { get; set; } // different name
+    [JsonPropertyName("Text")] public string Wafer { get; set; } // different name
    public List<Point> Points { get; set; }

+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Detail))]
+internal partial class DetailSourceGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Detail[]))]
+internal partial class DetailArraySourceGenerationContext : JsonSerializerContext
+{
 }
--- a/Adaptation/FileHandlers/Stratus/ProcessData.cs
+++ b/Adaptation/FileHandlers/Stratus/ProcessData.cs
@ -577,7 +577,7 @@ public partial class ProcessData : IProcessData
                            _Log.Debug("****ProcessData Removing stdDev");
                            detail.StdDev = detail.StdDev.Remove(detail.StdDev.Length - 1, 1);
                        }
-                        detail.UniqueId = string.Concat("_Wafer-", detail.Wafer, "_Slot-", detail.Slot, "_Point-", detail.Position);
+                        detail.UniqueId = string.Concat("_Wafer-", detail.Wafer, "_Slot-", detail.Slot);
                        details.Add(detail);
                        nextLine = PeekNextLine();
                        if (nextLine.Contains(cassette))
@ -630,11 +630,6 @@ public partial class ProcessData : IProcessData
                _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
            detail.Thickness = stringBuilder.ToString();
            _ = stringBuilder.Clear();
-            foreach (Point point in detail.Points)
-                _ = stringBuilder.Append(point.Position).Append(',');
-            if (stringBuilder.Length > 0)
-                _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
-            detail.Position = stringBuilder.ToString();
        }
        if (details.Count != 2
            || details[0].Slot != "1"
@ -666,12 +661,11 @@ public partial class ProcessData : IProcessData
    {
        List<Description> results = new();
        Description? description;
-        JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString };
        foreach (JsonElement jsonElement in jsonElements)
        {
            if (jsonElement.ValueKind != JsonValueKind.Object)
                throw new Exception();
-            description = JsonSerializer.Deserialize<Description>(jsonElement.ToString(), jsonSerializerOptions);
+            description = JsonSerializer.Deserialize(jsonElement.ToString(), DescriptionSourceGenerationContext.Default.Description);
            if (description is null)
                continue;
            results.Add(description);
--- a/Adaptation/FileHandlers/Stratus/Run.cs
+++ b/Adaptation/FileHandlers/Stratus/Run.cs
@ -37,18 +37,20 @@ internal class Run
                result = null;
            else
            {
-                ReadOnlyCollection<Wafer> wafers = Wafer.Get(constant, groups);
-                if (wafers.Count == 0)
+                Grade? grade = Grade.Get(constant, groups);
+                if (grade is null)
                    result = null;
                else
                {
-                    Grade? grade = Grade.Get(constant, groups);
-                    if (grade is null)
+                    ReadOnlyCollection<Wafer> wafers = Wafer.Get(constant, groups);
+                    if (wafers.Count == 0 && grade.MeanThickness != "0")
                        result = null;
                    else
+                    {
                        result = new(header, wafers, grade);
-                    // WriteJson(logistics, fileInfoCollection, result);
-                    // WriteCommaSeparatedValues(logistics, result);
+                        // WriteJson(logistics, fileInfoCollection, result);
+                        // WriteCommaSeparatedValues(logistics, result);
+                    }
                }
            }
        }
--- a/Adaptation/FileHandlers/txt/Run.cs
+++ b/Adaptation/FileHandlers/txt/Run.cs
@ -132,19 +132,28 @@ internal class Run
            {
                i = new int[] { 0 };
                Header? header = Header.Get(text, constant, i);
-                if (header is not null)
+                if (header is null)
+                    continue;
+                else
                {
                    ReadOnlyCollection<string> groups = Wafer.GetGroups(text, constant, i);
-                    if (groups.Count > 0)
+                    if (groups.Count == 0)
+                        continue;
+                    else
                    {
-                        ReadOnlyCollection<Wafer> wafers = Wafer.Get(constant, groups);
-                        if (wafers.Count > 0)
+                        Grade? grade = Grade.Get(constant, groups);
+                        if (grade is null)
+                            continue;
+                        else
                        {
-                            Grade? grade = Grade.Get(constant, groups);
-                            if (grade is null)
+                            ReadOnlyCollection<Wafer> wafers = Wafer.Get(constant, groups);
+                            if (wafers.Count == 0 && grade.MeanThickness != "0")
                                continue;
-                            run = new(header, wafers, grade);
-                            results.Add(run);
+                            else
+                            {
+                                run = new(header, wafers, grade);
+                                results.Add(run);
+                            }
                        }
                    }
                }
--- a/Adaptation/Infineon/Monitoring/MonA/MonIn.cs
+++ b/Adaptation/Infineon/Monitoring/MonA/MonIn.cs
@ -226,9 +226,9 @@ public class MonIn : IMonIn, IDisposable
    {
        StringBuilder stringBuilder = new();
        if (string.IsNullOrEmpty(subresource))
-            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} \n{5}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), stateName.Trim(), state.Trim(), description.Trim());
+            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} \n{5}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), stateName.Trim(), state.Trim(), description.Trim());
        else
-            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} \n{6}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), subresource.Trim(), stateName.Trim(), state.Trim(), description.Trim());
+            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} \n{6}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), subresource.Trim(), stateName.Trim(), state.Trim(), description.Trim());
        return stringBuilder.ToString();
    }

@ -247,14 +247,14 @@ public class MonIn : IMonIn, IDisposable
        if (string.IsNullOrEmpty(subresource))
        {
            if (unit.Equals(string.Empty) && !interval.HasValue)
-                _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} \n{5}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), performanceName.Trim(), value, description.Trim());
+                _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} \n{5}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), performanceName.Trim(), value, description.Trim());
            else
-                _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} {5} {{interval={6}, unit={7}}}\n", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), performanceName.Trim(), value, description.Trim(), interval.HasValue ? interval.Value.ToString() : (object)string.Empty, unit.Trim());
+                _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" {4} {5} {{interval={6}, unit={7}}}\n", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), performanceName.Trim(), value, description.Trim(), interval.HasValue ? interval.Value.ToString() : string.Empty, unit.Trim());
        }
        else if (unit.Equals(string.Empty) && !interval.HasValue)
-            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} \n{6}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), subresource.Trim(), performanceName.Trim(), value, description.Trim());
+            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} \n{6}", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), subresource.Trim(), performanceName.Trim(), value, description.Trim());
        else
-            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} {6} {{interval={7}, unit={8}}}\n", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : (object)"now", resource.Trim(), subresource.Trim(), performanceName.Trim(), value, description.Trim(), interval.HasValue ? interval.Value.ToString() : (object)string.Empty, unit.Trim());
+            _ = stringBuilder.AppendFormat(_CultureInfo, "> {0} {1} \"{2}\" \"{3}\" \"{4}\" {5} {6} {{interval={7}, unit={8}}}\n", site.Trim(), timeStamp.HasValue ? GetDateTimeNowAsPosix(timeStamp.Value) : "now", resource.Trim(), subresource.Trim(), performanceName.Trim(), value, description.Trim(), interval.HasValue ? interval.Value.ToString() : string.Empty, unit.Trim());
        return stringBuilder.ToString();
    }

--- a/Adaptation/Shared/Duplicator/Description.cs
+++ b/Adaptation/Shared/Duplicator/Description.cs
@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
+using System.Text.Json.Serialization;

 namespace Adaptation.Shared.Duplicator;

@ -178,4 +179,16 @@ public class Description : IDescription, Properties.IDescription

    internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt";

+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description))]
+internal partial class SharedDescriptionSourceGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description[]))]
+internal partial class SharedDescriptionArraySourceGenerationContext : JsonSerializerContext
+{
 }
--- a/Adaptation/Shared/FileRead.cs
+++ b/Adaptation/Shared/FileRead.cs
@ -9,7 +9,6 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading;

 namespace Adaptation.Shared;
@ -383,17 +382,24 @@ public class FileRead : Properties.IFileRead
        else
        {
            string[] files;
-            string logisticsSequence = _Logistics.Sequence.ToString();
-            string[] directories = Directory.GetDirectories(jobIdDirectory, $"*{logisticsSequence}*", SearchOption.TopDirectoryOnly);
-            foreach (string directory in directories)
+            string[] directories;
+            string logisticsSequence;
+            for (int i = 0; i < 10; i++)
            {
-                files = Directory.GetFiles(directory, "*", SearchOption.TopDirectoryOnly);
-                if (files.Length == 0)
-                    continue;
-                results.Add(directory);
+                logisticsSequence = (_Logistics.Sequence + -i).ToString();
+                directories = Directory.GetDirectories(jobIdDirectory, $"*{logisticsSequence}*", SearchOption.TopDirectoryOnly);
+                foreach (string directory in directories)
+                {
+                    files = Directory.GetFiles(directory, "*", SearchOption.TopDirectoryOnly);
+                    if (files.Length == 0)
+                        continue;
+                    results.Add(directory);
+                }
+                if (results.Count == 1)
+                    break;
            }
        }
-        if ((results is null) || results.Count != 1)
+        if (results.Count != 1)
            throw new Exception("Didn't find directory by logistics sequence");
        return results.ToArray();
    }
@ -440,12 +446,13 @@ public class FileRead : Properties.IFileRead
    {
        List<Properties.IDescription> results = new();
        Duplicator.Description description;
-        JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString };
        foreach (JsonElement jsonElement in jsonElements)
        {
            if (jsonElement.ValueKind != JsonValueKind.Object)
                throw new Exception();
-            description = JsonSerializer.Deserialize<Duplicator.Description>(jsonElement.ToString(), jsonSerializerOptions);
+            description = JsonSerializer.Deserialize(jsonElement.ToString(), Duplicator.SharedDescriptionSourceGenerationContext.Default.Description);
+            if (description is null)
+                continue;
            results.Add(description);
        }
        return results;
@ -478,27 +485,14 @@ public class FileRead : Properties.IFileRead
        }
    }

-    protected void WritePDSF(IFileRead fileRead, JsonElement[] jsonElements)
+    protected static void WritePDSF(IFileRead fileRead, JsonElement[] jsonElements)
    {
-        string directory;
-        string day = $"{_Logistics.DateTimeFromSequence:yyyy-MM-dd}";
-        string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
-        string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}";
-        if (!_CellInstanceConnectionName.StartsWith(_CellInstanceName) && _CellInstanceConnectionNameBase == _EquipmentType)
-            directory = Path.Combine(_TracePath, _EquipmentType, "Target", weekDirectory, day, _CellInstanceName, _CellInstanceConnectionName);
-        else
-            directory = Path.Combine(_TracePath, _EquipmentType, "Source", weekDirectory, day, _CellInstanceName, _CellInstanceConnectionName);
-        if (!Directory.Exists(directory))
-            _ = Directory.CreateDirectory(directory);
-        string file = Path.Combine(directory, string.Concat(_Logistics.MesEntity, "_", _Logistics.Sequence, ".ipdsf"));
-        string lines = ProcessDataStandardFormat.GetPDSFText(fileRead, _Logistics, jsonElements, logisticsText: string.Empty);
-        File.WriteAllText(file, lines);
-        if (_Logistics.TotalSecondsSinceLastWriteTimeFromSequence > 600)
-        {
-            try
-            { File.SetLastWriteTime(file, _Logistics.DateTimeFromSequence); }
-            catch (Exception) { }
-        }
+#pragma warning disable CA1510
+        if (fileRead is null)
+            throw new ArgumentNullException(nameof(fileRead));
+        if (jsonElements is null)
+            throw new ArgumentNullException(nameof(jsonElements));
+#pragma warning restore CA1510
    }

    protected void WaitForThread(Thread thread, List<Exception> threadExceptions)
--- a/Adaptation/Shared/ProcessDataStandardFormat.cs
+++ b/Adaptation/Shared/ProcessDataStandardFormat.cs
@ -2,12 +2,14 @@ using Adaptation.Shared.Methods;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;

 namespace Adaptation.Shared;

@ -136,6 +138,7 @@ internal class ProcessDataStandardFormat
    internal static ProcessDataStandardFormat GetProcessDataStandardFormat(string reportFullPath, string[]? lines = null, int columnsLine = 6)
    {
        ProcessDataStandardFormat result;
+        long? sequence;
        string segment;
        string[] segments;
        bool addToFooter = false;
@ -184,15 +187,27 @@ internal class ProcessDataStandardFormat
                    break;
            }
        }
-        string? linesOne = lines.Length > 0 && body.Count == 0 && columns.Count == 0 ? lines[1] : null;
+        string? linesOne = lines.Length > 1 && body.Count == 0 && columns.Count == 0 ? lines[1] : null;
        logistics = GetLogistics(footer, linesOne: linesOne);
+        if (logistics.Count == 0)
+            sequence = null;
+        else
+        {
+            segments = logistics[0].Split(new string[] { "SEQUENCE=" }, StringSplitOptions.None);
+            sequence = segments.Length < 2 || !long.TryParse(segments[1].Split(';')[0], out long s) ? null : s;
+        }
+        if (sequence is null && !string.IsNullOrEmpty(reportFullPath))
+        {
+            FileInfo fileInfo = new(reportFullPath);
+            sequence = fileInfo.LastWriteTime.Ticks;
+        }
        result = new(body: body.AsReadOnly(),
                     columns: columns.AsReadOnly(),
                     footer: footer.AsReadOnly(),
                     header: header.AsReadOnly(),
                     inputPDSF: null,
                     logistics: logistics,
-                     sequence: null);
+                     sequence: sequence);
        return result;
    }

@ -214,19 +229,19 @@ internal class ProcessDataStandardFormat
        return results.AsReadOnly();
    }

-    internal static ProcessDataStandardFormat GetProcessDataStandardFormat(string reportFullPath, ProcessDataStandardFormatMapping pdsfMapping)
+    internal static ProcessDataStandardFormat GetProcessDataStandardFormat(string reportFullPath, ProcessDataStandardFormatMapping processDataStandardFormatMapping)
    {
        ProcessDataStandardFormat result;
        const int columnsLine = 6;
        FileInfo fileInfo = new(reportFullPath);
        ProcessDataStandardFormat processDataStandardFormat = GetProcessDataStandardFormat(fileInfo.LastWriteTime, columnsLine, fileInfo.FullName, lines: null);
-        JsonElement[]? jsonElements = pdsfMapping.OldColumnNames.Count != pdsfMapping.ColumnIndices.Count ? null : GetFullArray(processDataStandardFormat);
+        JsonElement[]? jsonElements = processDataStandardFormatMapping.OldColumnNames.Count == 0 ? null : GetFullArray(processDataStandardFormat);
        JsonProperty[]? jsonProperties = jsonElements is null || jsonElements.Length == 0 ? null : jsonElements[0].EnumerateObject().ToArray();
-        if (jsonElements is null || jsonProperties is null || jsonProperties.Length != pdsfMapping.NewColumnNames.Count)
+        if (jsonElements is null || jsonProperties is null || jsonProperties.Length != processDataStandardFormatMapping.NewColumnNames.Count)
            result = processDataStandardFormat;
        else
        {
-            result = GetProcessDataStandardFormat(pdsfMapping, jsonElements, processDataStandardFormat);
+            result = GetProcessDataStandardFormat(processDataStandardFormatMapping, jsonElements, processDataStandardFormat);
            if (result.Sequence is null || result.Columns.Count == 0 || result.Body.Count == 0 || result.Logistics.Count == 0)
                result = processDataStandardFormat;
        }
@ -236,7 +251,7 @@ internal class ProcessDataStandardFormat
    private static ProcessDataStandardFormat GetProcessDataStandardFormat(DateTime lastWriteTime, int columnsLine, string path, string[]? lines)
    {
        ProcessDataStandardFormat result;
-        long sequence;
+        long? sequence;
        string[] segments;
        bool addToFooter = false;
        List<string> body = new();
@ -268,12 +283,13 @@ internal class ProcessDataStandardFormat
        }
        logistics = GetLogistics(footer, linesOne: null);
        if (logistics.Count == 0)
-            sequence = lastWriteTime.Ticks;
+            sequence = null;
        else
        {
            segments = logistics[0].Split(new string[] { "SEQUENCE=" }, StringSplitOptions.None);
-            sequence = segments.Length < 2 || !long.TryParse(segments[1].Split(';')[0], out long s) ? lastWriteTime.Ticks : s;
+            sequence = segments.Length < 2 || !long.TryParse(segments[1].Split(';')[0], out long s) ? null : s;
        }
+        sequence ??= lastWriteTime.Ticks;
        result = new(body: body.AsReadOnly(),
                     columns: new(columns),
                     footer: footer.AsReadOnly(),
@ -302,7 +318,7 @@ internal class ProcessDataStandardFormat
                segments = bodyLine.Split('\t').ToList();
                for (int c = 0; c < segments.Count; c++)
                {
-                    value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\");
+                    value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\"");
                    _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":\"").Append(value).Append("\",");
                }
                _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
@ -321,12 +337,14 @@ internal class ProcessDataStandardFormat
        int column;
        string value;
        JsonProperty jsonProperty;
+        List<string> debug = new();
        List<string> values = new();
        List<string> results = new();
        JsonProperty[] jsonProperties;
        List<string> unknownColumns = new();
        for (int i = 0; i < jsonElements.Length; i++)
        {
+            debug.Clear();
            values.Clear();
            if (jsonElements[i].ValueKind != JsonValueKind.Object)
            {
@ -340,16 +358,22 @@ internal class ProcessDataStandardFormat
            {
                column = processDataStandardFormatMapping.ColumnIndices[c];
                if (column == -1)
+                {
                    value = processDataStandardFormatMapping.OldColumnNames[c];
+                    debug.Add($"<Item C=-01 Name=\"{value}\" DataType=\"8\" XmlType=\"1\" XPath=\"//records/record/{value}\" />");
+                }
                else
                {
                    jsonProperty = jsonProperties[column];
                    value = jsonProperty.Value.ToString();
+                    debug.Add($"<Item C={column + 2:000} Name=\"{processDataStandardFormatMapping.OldColumnNames[c]}\" DataType=\"8\" XmlType=\"1\" XPath=\"//records/record/{jsonProperty.Name}\" />");
                }
                values.Add(value);
            }
            results.Add(string.Join("\t", values));
        }
+        if (Debugger.IsAttached)
+            File.WriteAllText("../../.txt", string.Join(Environment.NewLine, debug.OrderBy(l => l)));
        result = new(body: new(results),
                     columns: processDataStandardFormatMapping.OldColumnNames,
                     footer: processDataStandardFormat.Footer,
@ -364,7 +388,6 @@ internal class ProcessDataStandardFormat
    {
        if (processDataStandardFormat.InputPDSF is null)
            throw new NullReferenceException(nameof(processDataStandardFormat.InputPDSF));
-#pragma warning disable CA1845, IDE0057
        string result;
        string line;
        string value;
@ -378,19 +401,27 @@ internal class ProcessDataStandardFormat
                break;
            for (int c = 0; c < segments.Length; c++)
            {
-                value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\");
+                value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\"");
                line += string.Concat('"', processDataStandardFormat.InputPDSF.Columns[c].Trim('"'), '"', ':', '"', value, '"', ',');
            }
            line = string.Concat(line.Substring(0, line.Length - 1), '}');
            lines.Add(line);
        }
+        string? json = null;
+        if (processDataStandardFormat.Footer is not null && processDataStandardFormat.Footer.Count > 0)
+        {
+            Dictionary<string, string> footerKeyValuePairs = GetFooterKeyValuePairs(processDataStandardFormat.Footer);
+            Dictionary<string, Dictionary<string, string>> logisticKeyValuePairs = GetLogisticKeyValuePairs(processDataStandardFormat.Footer, footerKeyValuePairs);
+            json = JsonSerializer.Serialize(logisticKeyValuePairs, DictionaryStringDictionaryStringStringSourceGenerationContext.Default.DictionaryStringDictionaryStringString);
+        }
+        string footerText = string.IsNullOrEmpty(json) || json == "{}" ? string.Empty : $",{Environment.NewLine}\"PDSF\":{Environment.NewLine}{json}";
        result = string.Concat(
            '{',
            Environment.NewLine,
            '"',
            "Count",
            '"',
-            ": ",            
+            ": ",
            processDataStandardFormat.Body.Count,
            ',',
            Environment.NewLine,
@ -409,17 +440,95 @@ internal class ProcessDataStandardFormat
            '"',
            "Sequence",
            '"',
-            ": ",            
+            ": ",
            processDataStandardFormat.Sequence,
            Environment.NewLine,
+            footerText,
+            Environment.NewLine,
            '}');
        return result;
-#pragma warning restore CA1845, IDE0057
+    }
+
+    private static Dictionary<string, string> GetFooterKeyValuePairs(ReadOnlyCollection<string> footerLines)
+    {
+        Dictionary<string, string> results = new();
+        string[] segments;
+        foreach (string footerLine in footerLines)
+        {
+            segments = footerLine.Split('\t');
+            if (segments.Length != 2 || string.IsNullOrEmpty(segments[1].Trim()))
+            {
+                continue;
+            }
+            if (segments[1].Contains(';'))
+            {
+                continue;
+            }
+            else
+            {
+                if (results.ContainsKey(segments[0]))
+                {
+                    continue;
+                }
+                results.Add(segments[0], segments[1]);
+            }
+        }
+        return results;
+    }
+
+    private static Dictionary<string, Dictionary<string, string>> GetLogisticKeyValuePairs(ReadOnlyCollection<string> footerLines, Dictionary<string, string> footerKeyValuePairs)
+    {
+        Dictionary<string, Dictionary<string, string>> results = new();
+        string[] segments;
+        string[] subSegments;
+        string[] subSubSegments;
+        Dictionary<string, string>? keyValue;
+        results.Add("Footer", footerKeyValuePairs);
+        foreach (string footerLine in footerLines)
+        {
+            segments = footerLine.Split('\t');
+            if (segments.Length != 2 || string.IsNullOrEmpty(segments[1].Trim()))
+            {
+                continue;
+            }
+            if (!segments[1].Contains(';') || !segments[1].Contains('='))
+            {
+                continue;
+            }
+            else
+            {
+                subSegments = segments[1].Split(';');
+                if (subSegments.Length < 1)
+                {
+                    continue;
+                }
+                if (!results.TryGetValue(segments[0], out keyValue))
+                {
+                    results.Add(segments[0], new());
+                    if (!results.TryGetValue(segments[0], out keyValue))
+                    {
+                        throw new Exception();
+                    }
+                }
+                foreach (string segment in subSegments)
+                {
+                    subSubSegments = segment.Split('=');
+                    if (subSubSegments.Length != 2)
+                    {
+                        continue;
+                    }
+                    keyValue.Add(subSubSegments[0], subSubSegments[1]);
+                }
+            }
+        }
+        return results;
    }

    internal static void Write(string path, ProcessDataStandardFormat processDataStandardFormat, List<Metrology.WS.Results>? wsResults)
    {
        List<string> results = new();
+        if (processDataStandardFormat.InputPDSF is null)
+            throw new NullReferenceException(nameof(processDataStandardFormat.InputPDSF));
        if (processDataStandardFormat.Sequence is null)
            throw new NullReferenceException(nameof(processDataStandardFormat.Sequence));
        string endOffset = "E#######T";
@ -457,25 +566,25 @@ internal class ProcessDataStandardFormat
            }
        }
        results.Add("END_HEADER");
-        if (processDataStandardFormat.InputPDSF is not null)
-        {
-            results.Add(string.Empty);
-            List<char> hyphens = new();
-            results.AddRange(processDataStandardFormat.InputPDSF.Header.Select(l => l.Replace('\t', '|')));
-            results.Add(string.Empty);
-            results.Add($"|{string.Join("|", processDataStandardFormat.InputPDSF.Columns)}|");
-            for (int i = 0; i < processDataStandardFormat.InputPDSF.Columns.Count; i++)
-                hyphens.Add('-');
-            results.Add($"|{string.Join("|", hyphens)}|");
-            results.AddRange(processDataStandardFormat.InputPDSF.Body.Select(l => l.Replace('\t', '|')));
-            results.Add(string.Empty);
-            results.AddRange(processDataStandardFormat.InputPDSF.Footer.Select(l => l.Replace('\t', '|')));
-            results.Add(string.Empty);
-            results.Add("EOF");
-            results.Add(string.Empty);
-            string json = GetJson(processDataStandardFormat);
-            results.Add(json);
-        }
+        results.Add(string.Empty);
+        List<char> hyphens = new();
+        results.AddRange(processDataStandardFormat.InputPDSF.Header.Select(l => $"|{l.Replace('\t', '|')}|"));
+        results.Add(string.Empty);
+        results.Add($"|{string.Join("|", processDataStandardFormat.InputPDSF.Columns)}|");
+        for (int i = 0; i < processDataStandardFormat.InputPDSF.Columns.Count; i++)
+            hyphens.Add('-');
+        results.Add($"|{string.Join("|", hyphens)}|");
+        results.AddRange(processDataStandardFormat.InputPDSF.Body.Select(l => $"|{l.Replace('\t', '|')}|"));
+        results.Add(string.Empty);
+        results.AddRange(processDataStandardFormat.InputPDSF.Footer.Select(l => $"|{l.Replace('\t', '|')}|"));
+        results.Add(string.Empty);
+        string xml = GetXml(processDataStandardFormat);
+        results.Add(xml);
+        results.Add(string.Empty);
+        results.Add("EOF");
+        results.Add(string.Empty);
+        string json = GetJson(processDataStandardFormat);
+        results.Add(json);
        File.WriteAllText(path, string.Join(Environment.NewLine, results));
    }

@ -518,7 +627,7 @@ internal class ProcessDataStandardFormat
                {
                    for (int c = 1; c < segments.Length; c++)
                    {
-                        value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\");
+                        value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\"");
                        _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":\"").Append(value).Append("\",");
                    }
                }
@ -526,7 +635,7 @@ internal class ProcessDataStandardFormat
                {
                    for (int c = 1; c < segments.Length; c++)
                    {
-                        value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\");
+                        value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\"");
                        if (string.IsNullOrEmpty(value))
                            _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":").Append(value).Append("null,");
                        else if (value.All(char.IsDigit))
@ -545,6 +654,17 @@ internal class ProcessDataStandardFormat
        return results;
    }

+    internal static JsonElement[] GetArray(string reportFullPath, string[] lines, ProcessDataStandardFormat processDataStandardFormat)
+    {
+        JsonElement[] results;
+        string? json = GetRecordsJson(reportFullPath, lines);
+        if (string.IsNullOrEmpty(json))
+            results = GetArray(processDataStandardFormat);
+        else
+            results = JsonSerializer.Deserialize(json, JsonElementCollectionSourceGenerationContext.Default.JsonElementArray) ?? throw new Exception();
+        return results;
+    }
+
    internal static string GetPDSFText(IFileRead fileRead, Logistics logistics, JsonElement[] jsonElements, string logisticsText)
    {
        string result;
@ -757,10 +877,126 @@ internal class ProcessDataStandardFormat
        return result;
    }

+    internal static string GetXml(ProcessDataStandardFormat processDataStandardFormat)
+    {
+        string result;
+        string tag;
+        string value;
+        string[] segments;
+        List<string> values;
+        Dictionary<string, List<string>> results = new();
+        ReadOnlyCollection<string> body = processDataStandardFormat.InputPDSF is null ?
+            processDataStandardFormat.Body : processDataStandardFormat.InputPDSF.Body;
+        ReadOnlyCollection<string> columns = processDataStandardFormat.InputPDSF is null ?
+            processDataStandardFormat.Columns : processDataStandardFormat.InputPDSF.Columns;
+        List<string> lines = new() { "<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "<records>" };
+        for (int i = 0; i < body.Count; i++)
+        {
+            segments = body[i].Trim().Split('\t');
+            if (segments.Length != columns.Count)
+                break;
+            for (int c = 0; c < segments.Length; c++)
+            {
+                value = segments[c].Replace("&", "&amp;")
+                                   .Replace("<", "&lt;")
+                                   .Replace(">", "&gt;")
+                                   .Replace("\"", "&quot;")
+                                   .Replace("'", "&apos;");
+                tag = Regex.Replace(columns[c].Trim('"'), @"[^a-zA-Z0-9]", "_").Split('\r')[0].Split('\n')[0];
+                if (i == 0)
+                {
+                    if (results.ContainsKey(tag))
+                        continue;
+                    results.Add(tag, new List<string>());
+                }
+                results[tag].Add(value);
+            }
+        }
+        foreach (KeyValuePair<string, List<string>> keyValuePair in results)
+        {
+            if (body.Count < 2)
+                break;
+            if (keyValuePair.Value.Count != body.Count)
+                continue;
+            values = keyValuePair.Value.Distinct().ToList();
+            if (values.Count == 2 && (string.IsNullOrEmpty(values[0]) || string.IsNullOrEmpty(values[1])))
+            {
+                for (int i = 0; i < body.Count; i++)
+                    keyValuePair.Value[i] = string.Empty;
+                foreach (string v in values)
+                {
+                    if (string.IsNullOrEmpty(v))
+                        continue;
+                    keyValuePair.Value[0] = v;
+                }
+            }
+        }
+        for (int i = 0; i < body.Count; i++)
+        {
+            lines.Add("  <record>");
+            foreach (KeyValuePair<string, List<string>> keyValuePair in results)
+            {
+                if (keyValuePair.Value.Count != body.Count)
+                    continue;
+                lines.Add(string.Concat("    <", keyValuePair.Key, '>', keyValuePair.Value[i], "</", keyValuePair.Key, '>'));
+            }
+            lines.Add("  </record>");
+        }
+        lines.Add("</records>");
+        result = string.Join(Environment.NewLine, lines);
+        return result;
+    }
+
+    internal static string GetXml(string reportFullPath, string[]? lines = null)
+    {
+        string result;
+        bool foundXml = false;
+        List<string> results = new();
+        lines ??= File.ReadAllLines(reportFullPath);
+        foreach (string line in lines)
+        {
+            if (line.StartsWith("<?xml"))
+                foundXml = true;
+            if (!foundXml)
+                continue;
+            if (line.StartsWith("EOF"))
+                break;
+            results.Add(line);
+        }
+        result = string.Join(Environment.NewLine, results);
+        return result;
+    }
+
+    private static string? GetRecordsJson(string reportFullPath, string[] lines)
+    {
+        string? result;
+        bool foundRecords = false;
+        List<string> results = new();
+        lines ??= File.ReadAllLines(reportFullPath);
+        foreach (string line in lines)
+        {
+            if (line.StartsWith("\"Records\""))
+                foundRecords = true;
+            if (!foundRecords)
+                continue;
+            if (line == "],")
+                break;
+            results.Add(line);
+        }
+        result = results.Count == 0 ? null : $"{string.Join(Environment.NewLine, results.Skip(1))}{Environment.NewLine}]";
+        return result;
+    }
+
 }

 [JsonSourceGenerationOptions(WriteIndented = true)]
 [JsonSerializable(typeof(JsonElement[]))]
 internal partial class JsonElementCollectionSourceGenerationContext : JsonSerializerContext
 {
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(Dictionary<string, Dictionary<string, string>>))]
+internal partial class DictionaryStringDictionaryStringStringSourceGenerationContext : JsonSerializerContext
+{
 }
--- a/Adaptation/Shared/ProcessDataStandardFormatMapping.cs
+++ b/Adaptation/Shared/ProcessDataStandardFormatMapping.cs
@ -1,33 +1,34 @@
 using System.Collections.ObjectModel;
+using System.Linq;

 namespace Adaptation.Shared;

 public class ProcessDataStandardFormatMapping
 {

-    public ReadOnlyCollection<string> BackfillColumns { get; private set; }
    public ReadOnlyCollection<int> ColumnIndices { get; private set; }
-    public ReadOnlyCollection<string> IgnoreColumns { get; private set; }
-    public ReadOnlyCollection<string> IndexOnlyColumns { get; private set; }
-    public ReadOnlyDictionary<string, string> KeyValuePairs { get; private set; }
    public ReadOnlyCollection<string> NewColumnNames { get; private set; }
    public ReadOnlyCollection<string> OldColumnNames { get; private set; }

-    public ProcessDataStandardFormatMapping(ReadOnlyCollection<string> backfillColumns,
-                                            ReadOnlyCollection<int> columnIndices,
-                                            ReadOnlyCollection<string> ignoreColumns,
-                                            ReadOnlyCollection<string> indexOnlyColumns,
-                                            ReadOnlyDictionary<string, string> keyValuePairs,
+    public ProcessDataStandardFormatMapping(ReadOnlyCollection<int> columnIndices,
                                            ReadOnlyCollection<string> newColumnNames,
                                            ReadOnlyCollection<string> oldColumnNames)
    {
-        BackfillColumns = backfillColumns;
        ColumnIndices = columnIndices;
-        IgnoreColumns = ignoreColumns;
-        IndexOnlyColumns = indexOnlyColumns;
-        KeyValuePairs = keyValuePairs;
        NewColumnNames = newColumnNames;
        OldColumnNames = oldColumnNames;
    }

+    internal static ProcessDataStandardFormatMapping Get(string processDataStandardFormatMappingOldColumnNames, string processDataStandardFormatMappingNewColumnNames, string processDataStandardFormatMappingColumnIndices)
+    {
+        ProcessDataStandardFormatMapping result;
+        ReadOnlyCollection<string> newColumnNames = new(processDataStandardFormatMappingNewColumnNames.Split(','));
+        ReadOnlyCollection<string> oldColumnNames = new(processDataStandardFormatMappingOldColumnNames.Split(','));
+        ReadOnlyCollection<int> columnIndices = new(processDataStandardFormatMappingColumnIndices.Split(',').Select(int.Parse).ToArray());
+        result = new(columnIndices: columnIndices,
+                     newColumnNames: newColumnNames,
+                     oldColumnNames: oldColumnNames);
+        return result;
+    }
+
 }
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/BIORAD4-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/BIORAD4-EQPT.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_60_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/BIORAD4.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/BIORAD4.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_60_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/BIORAD5-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/BIORAD5-EQPT.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_60_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/BIORAD5.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/BIORAD5.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_60_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/MET08THFTIRSTRATUS.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.60.0/MET08THFTIRSTRATUS.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_60_0
 using Adaptation._Tests.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/BIORAD4-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/BIORAD4-EQPT.cs
@ -0,0 +1,63 @@
+#if true
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_61_1;
+
+[TestClass]
+public class BIORAD4_EQPT : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static BIORAD4_EQPT EAFLoggingUnitTesting { get; private set; }
+
+    static BIORAD4_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public BIORAD4_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public BIORAD4_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new BIORAD4_EQPT(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4_EQPT__DownloadTXTFile()
+    {
+        string check = "DataBioRad.txt";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/BIORAD4.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/BIORAD4.cs
@ -0,0 +1,93 @@
+#if true
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_61_1;
+
+[TestClass]
+public class BIORAD4 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static BIORAD4 EAFLoggingUnitTesting { get; private set; }
+
+    static BIORAD4() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public BIORAD4() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public BIORAD4(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new BIORAD4(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__txt()
+    {
+        string check = "*DataBioRad.txt";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__Stratus()
+    {
+        string check = "CassetteDataBioRad_*.txt";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__QS408M()
+    {
+        string check = "DetailDataBioRad_*.txt";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
+        Assert.IsTrue(fileNameAndJson[1].Contains(check));
+        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/BIORAD5-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/BIORAD5-EQPT.cs
@ -0,0 +1,63 @@
+#if true
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_61_1;
+
+[TestClass]
+public class BIORAD5_EQPT : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static BIORAD5_EQPT EAFLoggingUnitTesting { get; private set; }
+
+    static BIORAD5_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public BIORAD5_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public BIORAD5_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new BIORAD5_EQPT(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD5_EQPT__DownloadTXTFile()
+    {
+        string check = "DataBioRad.txt";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/BIORAD5.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/BIORAD5.cs
@ -0,0 +1,93 @@
+#if true
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_61_1;
+
+[TestClass]
+public class BIORAD5 : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static BIORAD5 EAFLoggingUnitTesting { get; private set; }
+
+    static BIORAD5() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public BIORAD5() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public BIORAD5(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new BIORAD5(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD5__txt()
+    {
+        string check = "*DataBioRad.txt";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD5__Stratus()
+    {
+        string check = "CassetteDataBioRad_*.txt";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD5__QS408M()
+    {
+        string check = "DetailDataBioRad_*.txt";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
+        Assert.IsTrue(fileNameAndJson[1].Contains(check));
+        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/MET08THFTIRSTRATUS.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.61.1/MET08THFTIRSTRATUS.cs
@ -0,0 +1,182 @@
+#if true
+using Adaptation._Tests.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Adaptation._Tests.CreateSelfDescription.Production.v2_61_1;
+
+[TestClass]
+public class MET08THFTIRSTRATUS : EAFLoggingUnitTesting
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    internal static string DummyRoot { get; private set; }
+    internal static MET08THFTIRSTRATUS EAFLoggingUnitTesting { get; private set; }
+
+    static MET08THFTIRSTRATUS() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy";
+
+    public MET08THFTIRSTRATUS() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)
+    {
+        if (EAFLoggingUnitTesting is null)
+            throw new Exception();
+    }
+
+    public MET08THFTIRSTRATUS(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false)
+    {
+    }
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        EAFLoggingUnitTesting ??= new MET08THFTIRSTRATUS(testContext);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize"));
+        string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName);
+        File.WriteAllText(fileNameAndText[0], fileNameAndText[1]);
+        File.WriteAllText(fileNameAndText[2], fileNameAndText[3]);
+    }
+
+    [ClassCleanup()]
+    public static void ClassCleanup()
+    {
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Dispose();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__MoveMatchingFiles()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsightMetrologyViewer()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__IQSSi()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsight()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsightMetrologyViewerAttachments()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__APC()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__SPaCe()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__Processed()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__Archive()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__Dummy()
+    {
+        string check = "637738592809956919.zip";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
+        _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
+        EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
+    }
+
+}
+#endif
--- a/Adaptation/_Tests/Extract/Production/v2.60.0/BIORAD4-EQPT.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.60.0/BIORAD4-EQPT.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_60_0
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Diagnostics;
 using System.Reflection;
--- a/Adaptation/_Tests/Extract/Production/v2.60.0/BIORAD4.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.60.0/BIORAD4.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_60_0
 using Adaptation.Shared;
 using Adaptation.Shared.Methods;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
--- a/Adaptation/_Tests/Extract/Production/v2.60.0/BIORAD5-EQPT.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.60.0/BIORAD5-EQPT.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_60_0
 using Microsoft.VisualStudio.TestTools.UnitTesting;

 namespace Adaptation._Tests.Extract.Production.v2_60_0;
--- a/Adaptation/_Tests/Extract/Production/v2.60.0/BIORAD5.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.60.0/BIORAD5.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_60_0
 using Adaptation.Shared;
 using Adaptation.Shared.Methods;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
--- a/Adaptation/_Tests/Extract/Production/v2.60.0/MET08THFTIRSTRATUS.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.60.0/MET08THFTIRSTRATUS.cs
@ -1,4 +1,4 @@
-#if true
+#if v2_60_0
 using Adaptation._Tests.Shared;
 using Adaptation.Shared;
 using Adaptation.Shared.Methods;
@ -34,14 +34,16 @@ public class MET08THFTIRSTRATUS
    [Ignore]
 #endif
    [TestMethod]
-    public void Production__v2_60_0__MET08THFTIRSTRATUS__MoveMatchingFiles638014829236768048__Normal()
+    public void Production__v2_60_0__MET08THFTIRSTRATUS__MoveMatchingFiles638918243047505986__Normal()
    {
        string check = "*.pdsf";
+        bool validatePDSF = false;
+        MethodBase methodBase = new StackFrame().GetMethod();
        _MET08THFTIRSTRATUS.Production__v2_60_0__MET08THFTIRSTRATUS__MoveMatchingFiles();
-        MethodBase method = new StackFrame().GetMethod();
-        string[] variables = _MET08THFTIRSTRATUS.AdaptationTesting.GetVariables(method, check);
-        _ = _MET08THFTIRSTRATUS.AdaptationTesting.Get(method, variables[2], variables[3], false).ReExtract();
-        AdaptationTesting.UpdatePassDirectory(variables[2]);
+        string[] variables = _MET08THFTIRSTRATUS.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _MET08THFTIRSTRATUS.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
    }

 #if DEBUG
--- a/Adaptation/_Tests/Extract/Production/v2.61.1/BIORAD4-EQPT.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.61.1/BIORAD4-EQPT.cs
@ -0,0 +1,44 @@
+#if true
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Diagnostics;
+using System.Reflection;
+using System.Threading;
+
+namespace Adaptation._Tests.Extract.Production.v2_61_1;
+
+[TestClass]
+public class BIORAD4_EQPT
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_61_1.BIORAD4_EQPT _BIORAD4_EQPT;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_61_1.BIORAD4_EQPT.ClassInitialize(testContext);
+        _BIORAD4_EQPT = CreateSelfDescription.Production.v2_61_1.BIORAD4_EQPT.EAFLoggingUnitTesting;
+    }
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4_EQPT__DownloadTXTFile() => _BIORAD4_EQPT.Production__v2_61_1__BIORAD4_EQPT__DownloadTXTFile();
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4_EQPT__DownloadTXTFile638574038162800870__First()
+    {
+        bool validatePDSF = false;
+        string check = "DataBioRad.txt";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _BIORAD4_EQPT.Production__v2_61_1__BIORAD4_EQPT__DownloadTXTFile();
+        string[] variables = _BIORAD4_EQPT.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        _ = _BIORAD4_EQPT.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        for (int i = 0; i < short.MaxValue; i++)
+            Thread.Sleep(500);
+    }
+
+}
+#endif
--- a/Adaptation/_Tests/Extract/Production/v2.61.1/BIORAD4.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.61.1/BIORAD4.cs
@ -0,0 +1,259 @@
+#if true
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Production.v2_61_1;
+
+[TestClass]
+public class BIORAD4
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_61_1.BIORAD4 _BIORAD4;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_61_1.BIORAD4.ClassInitialize(testContext);
+        _BIORAD4 = CreateSelfDescription.Production.v2_61_1.BIORAD4.EAFLoggingUnitTesting;
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__txt() => _BIORAD4.Production__v2_61_1__BIORAD4__txt();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__txt638763379187800166__Partial()
+    {
+        bool validatePDSF = false;
+        string check = "*DataBioRad.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__txt();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        _ = fileRead.ReExtract();
+        Shared.AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__txt637730081979221342__Normal()
+    {
+        bool validatePDSF = false;
+        string check = "*DataBioRad.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__txt();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        _ = fileRead.ReExtract();
+        Shared.AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__txt637818036815840307__ProcessFailed()
+    {
+        bool validatePDSF = false;
+        string check = "*DataBioRad.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__txt();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        _ = fileRead.ReExtract();
+        Shared.AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__txt637746296480404920__Failure()
+    {
+        bool validatePDSF = false;
+        string check = "*DataBioRad.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__txt();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        _ = fileRead.ReExtract();
+        Shared.AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__txt638187028378748930__THigh()
+    {
+        bool validatePDSF = false;
+        string check = "*DataBioRad.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__txt();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        _ = fileRead.ReExtract();
+        Shared.AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__Stratus() => _BIORAD4.Production__v2_61_1__BIORAD4__Stratus();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__Stratus637730081979221342__RDS()
+    {
+        bool validatePDSF = false;
+        string check = "CassetteDataBioRad_*.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__Stratus();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__Stratus637730081979221342__1TRDS()
+    {
+        bool validatePDSF = false;
+        string check = "CassetteDataBioRad_*.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__Stratus();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__Stratus637733400573863329__ReactorAndRDS()
+    {
+        DateTime dateTime;
+        bool validatePDSF = false;
+        string check = "CassetteDataBioRad_*.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__Stratus();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+        dateTime = FileHandlers.Stratus.ProcessData.GetDateTime(logistics, string.Empty);
+        Assert.AreEqual(logistics.DateTimeFromSequence, dateTime);
+        dateTime = FileHandlers.Stratus.ProcessData.GetDateTime(logistics, "11/24/21  08:39");
+        Assert.AreEqual(logistics.DateTimeFromSequence, dateTime);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__Stratus637818036815840307__ProcessFailed()
+    {
+        bool validatePDSF = false;
+        string check = "CassetteDataBioRad_*.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__Stratus();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        _ = fileRead.ReExtract();
+        Shared.AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__QS408M() => _BIORAD4.Production__v2_61_1__BIORAD4__QS408M();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__Stratus638010209430211312__MissingRecipe()
+    {
+        bool validatePDSF = false;
+        string check = "CassetteDataBioRad_*.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__Stratus();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        _ = fileRead.ReExtract();
+        Shared.AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__Stratus638613924531133783__14()
+    {
+        bool validatePDSF = false;
+        string check = "CassetteDataBioRad_*.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__Stratus();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        _ = fileRead.ReExtract();
+        Shared.AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__Stratus638675062726795419__T()
+    {
+        bool validatePDSF = false;
+        string check = "CassetteDataBioRad_*.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__Stratus();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        _ = fileRead.ReExtract();
+        Shared.AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD4__Stratus638960114557838333__Zero()
+    {
+        bool validatePDSF = false;
+        string check = "CassetteDataBioRad_*.txt";
+        _BIORAD4.Production__v2_61_1__BIORAD4__Stratus();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD4.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD4.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        _ = fileRead.ReExtract();
+        Shared.AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+}
+#endif
--- a/Adaptation/_Tests/Extract/Production/v2.61.1/BIORAD5-EQPT.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.61.1/BIORAD5-EQPT.cs
@ -0,0 +1,27 @@
+#if true
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Adaptation._Tests.Extract.Production.v2_61_1;
+
+[TestClass]
+public class BIORAD5_EQPT
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_61_1.BIORAD5_EQPT _BIORAD5_EQPT;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_61_1.BIORAD5_EQPT.ClassInitialize(testContext);
+        _BIORAD5_EQPT = CreateSelfDescription.Production.v2_61_1.BIORAD5_EQPT.EAFLoggingUnitTesting;
+    }
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD5_EQPT__DownloadTXTFile() => _BIORAD5_EQPT.Production__v2_61_1__BIORAD5_EQPT__DownloadTXTFile();
+
+}
+#endif
--- a/Adaptation/_Tests/Extract/Production/v2.61.1/BIORAD5.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.61.1/BIORAD5.cs
@ -0,0 +1,114 @@
+#if true
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Production.v2_61_1;
+
+[TestClass]
+public class BIORAD5
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_61_1.BIORAD5 _BIORAD5;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_61_1.BIORAD5.ClassInitialize(testContext);
+        _BIORAD5 = CreateSelfDescription.Production.v2_61_1.BIORAD5.EAFLoggingUnitTesting;
+    }
+
+    private static void NonThrowTryCatch()
+    {
+        try
+        { throw new Exception(); }
+        catch (Exception) { }
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD5__txt() => _BIORAD5.Production__v2_61_1__BIORAD5__txt();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD5__txt638221788953480284__MorePoints()
+    {
+        bool validatePDSF = false;
+        string check = "*DataBioRad.txt";
+        _BIORAD5.Production__v2_61_1__BIORAD5__txt();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD5.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD5.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD5__Stratus() => _BIORAD5.Production__v2_61_1__BIORAD5__Stratus();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD5__Stratus637738592809956919__ReactorAndRDS()
+    {
+        DateTime dateTime;
+        bool validatePDSF = false;
+        string check = "CassetteDataBioRad_*.txt";
+        _BIORAD5.Production__v2_61_1__BIORAD5__Stratus();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD5.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD5.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+        dateTime = FileHandlers.Stratus.ProcessData.GetDateTime(logistics, string.Empty);
+        Assert.AreEqual(logistics.DateTimeFromSequence, dateTime);
+        dateTime = FileHandlers.Stratus.ProcessData.GetDateTime(logistics, "11/24/21  08:39");
+        Assert.AreEqual(logistics.DateTimeFromSequence, dateTime);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD5__Stratus637805172599370243__Why()
+    {
+        DateTime dateTime;
+        bool validatePDSF = false;
+        string check = "CassetteDataBioRad_*.txt";
+        _BIORAD5.Production__v2_61_1__BIORAD5__Stratus();
+        MethodBase methodBase = new StackFrame().GetMethod();
+        string[] variables = _BIORAD5.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _BIORAD5.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+        dateTime = FileHandlers.Stratus.ProcessData.GetDateTime(logistics, string.Empty);
+        Assert.AreEqual(logistics.DateTimeFromSequence, dateTime);
+        dateTime = FileHandlers.Stratus.ProcessData.GetDateTime(logistics, "11/24/21  08:39");
+        Assert.AreEqual(logistics.DateTimeFromSequence, dateTime);
+        NonThrowTryCatch();
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__BIORAD5__QS408M() => _BIORAD5.Production__v2_61_1__BIORAD5__QS408M();
+
+}
+#endif
--- a/Adaptation/_Tests/Extract/Production/v2.61.1/MET08THFTIRSTRATUS.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.61.1/MET08THFTIRSTRATUS.cs
@ -0,0 +1,162 @@
+#if true
+using Adaptation._Tests.Shared;
+using Adaptation.Shared;
+using Adaptation.Shared.Methods;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Adaptation._Tests.Extract.Production.v2_61_1;
+
+[TestClass]
+public class MET08THFTIRSTRATUS
+{
+
+#pragma warning disable CA2254
+#pragma warning disable IDE0060
+
+    private static CreateSelfDescription.Production.v2_61_1.MET08THFTIRSTRATUS _MET08THFTIRSTRATUS;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext testContext)
+    {
+        CreateSelfDescription.Production.v2_61_1.MET08THFTIRSTRATUS.ClassInitialize(testContext);
+        _MET08THFTIRSTRATUS = CreateSelfDescription.Production.v2_61_1.MET08THFTIRSTRATUS.EAFLoggingUnitTesting;
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__MoveMatchingFiles() => _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__MoveMatchingFiles();
+
+    [Ignore]
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__MoveMatchingFiles638918243047505986__Normal()
+    {
+        string check = "*.pdsf";
+        bool validatePDSF = false;
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__MoveMatchingFiles();
+        string[] variables = _MET08THFTIRSTRATUS.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _MET08THFTIRSTRATUS.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsightMetrologyViewer() => _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsightMetrologyViewer();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__IQSSi() => _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__IQSSi();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsight() => _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsight();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsight638014829236768047__Normal()
+    {
+        string check = "*.pdsf";
+        _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsight();
+        MethodBase method = new StackFrame().GetMethod();
+        string[] variables = _MET08THFTIRSTRATUS.AdaptationTesting.GetVariables(method, check);
+        _ = _MET08THFTIRSTRATUS.AdaptationTesting.Get(method, variables[2], variables[3], false).ReExtract();
+        AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsight638015284160909324__WO()
+    {
+        string check = "*.pdsf";
+        _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsight();
+        MethodBase method = new StackFrame().GetMethod();
+        string[] variables = _MET08THFTIRSTRATUS.AdaptationTesting.GetVariables(method, check);
+        _ = _MET08THFTIRSTRATUS.AdaptationTesting.Get(method, variables[2], variables[3], false).ReExtract();
+        AdaptationTesting.UpdatePassDirectory(variables[2]);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsight638054540026319596__IqsSql()
+    {
+        string check = "*.pdsf";
+        bool validatePDSF = false;
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsight();
+        string[] variables = _MET08THFTIRSTRATUS.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _MET08THFTIRSTRATUS.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsightMetrologyViewerAttachments() => _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsightMetrologyViewerAttachments();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsightMetrologyViewerAttachments638131299562362655__Normal()
+    {
+        string check = "*.pdsf";
+        bool validatePDSF = false;
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__OpenInsightMetrologyViewerAttachments();
+        string[] variables = _MET08THFTIRSTRATUS.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
+        IFileRead fileRead = _MET08THFTIRSTRATUS.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+    }
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__APC() => _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__APC();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__SPaCe() => _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__SPaCe();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__Processed() => _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__Processed();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__Archive() => _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__Archive();
+
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_61_1__MET08THFTIRSTRATUS__Dummy() => _MET08THFTIRSTRATUS.Production__v2_61_1__MET08THFTIRSTRATUS__Dummy();
+
+}
+#endif
--- a/Adaptation/_Tests/Shared/AdaptationTesting.cs
+++ b/Adaptation/_Tests/Shared/AdaptationTesting.cs
@ -193,7 +193,12 @@ public class AdaptationTesting : ISMTP
            segments = withActualCICN.Split(new string[] { ticks }, StringSplitOptions.None);
            dummyDirectory = Path.Combine(dummyRoot, cellInstanceName, ticks, string.Join(null, segments));
            if (!Directory.Exists(dummyDirectory))
+            {
                _ = Directory.CreateDirectory(dummyDirectory);
+                try
+                { Directory.SetLastWriteTime(Path.Combine(dummyRoot, cellInstanceName), DateTime.Now); }
+                catch { }
+            }
        }
        if (string.IsNullOrEmpty(ticks))
        {
--- a/Adaptation/_Tests/Static/MET08THFTIRSTRATUS.cs
+++ b/Adaptation/_Tests/Static/MET08THFTIRSTRATUS.cs
@ -64,7 +64,7 @@ public class MET08THFTIRSTRATUS : LoggingUnitTesting, IDisposable
        StringBuilder results = new();
        (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[]
        {
-            new("MET08THFTIRSTRATUS", "v2.60.0"),
+            new("MET08THFTIRSTRATUS", "v2.61.1"),
        };
        string production = "http://messa08ec.infineon.com:9003/CellInstanceServiceV2";
        Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion;
--- a/Adaptation/_Tests/Static/Stratus.cs
+++ b/Adaptation/_Tests/Static/Stratus.cs
@ -203,8 +203,8 @@ public class Stratus : LoggingUnitTesting, IDisposable
        StringBuilder results = new();
        (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[]
        {
-            new("BIORAD4", "v2.60.0"),
-            new("BIORAD5", "v2.60.0"),
+            new("BIORAD4", "v2.61.1"),
+            new("BIORAD5", "v2.61.1"),
        };
        string production = "http://messa08ec.infineon.com:9003/CellInstanceServiceV2";
        Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion;
--- a/Adaptation/_Tests/Static/recipes-and-patterns.js
+++ b/Adaptation/_Tests/Static/recipes-and-patterns.js
@ -0,0 +1,115 @@
+// Recipe 1 = Matched
+// recipes-and-patterns.js under IndexOf
+// RecipesAndPatternsMatch
+// ($('dcp.BIORAD4/csv/Index', 0) + 1) == $('dcp.BIORAD4/csv/Count', 0)
+// getValue('FTIR', $('dcp.BIORAD4/csv/Count', 0), $('dcp.BIORAD4/csv/Recipe', ''), 'pattern', getContextData('2', 'cds.NULL_DATA', ''));
+
+function getValue(tool, patternSize, recipe, pattern, json) {
+    let result;
+    if (tool == undefined || tool.length === 0 || patternSize == undefined || patternSize.length === 0 || recipe == undefined || recipe.length === 0 || pattern == undefined || pattern.length === 0 || json == undefined || json.length === 0)
+        result = 'A) Invalid input!';
+    else {
+        let parsed;
+        try {
+            parsed = JSON.parse(json);
+        } catch (error) {
+            parsed = null;
+        }
+        if (parsed == null)
+            result = 'B) Invalid input!';
+        else if (parsed.rds == undefined || parsed.rds.prodSpec == undefined || parsed.rds.prodSpec.recipesAndPatterns == undefined)
+            result = 'C) No Spec!';
+        else {
+            let toolMatches = [];
+            for (let index = 0; index < parsed.rds.prodSpec.recipesAndPatterns.length; index++) {
+                if (parsed.rds.prodSpec.recipesAndPatterns[index].tool === tool) {
+                    toolMatches.push(parsed.rds.prodSpec.recipesAndPatterns[index]);
+                }
+            }
+            if (toolMatches == null || toolMatches.length === 0)
+                result = 'Tool [' + tool + '] not found in OI API results!';
+            else {
+                let debug = '';
+                let matches = 0;
+                for (let index = 0; index < toolMatches.length; index++) {
+                    debug += 'patternSize: ' + toolMatches[index].patternSize +
+                             '; recipe: ' + toolMatches[index].recipe +
+                             '; pattern: ' + toolMatches[index].pattern + ';~';
+                    if (toolMatches[index].recipe.localeCompare(recipe, ['en-US'], { sensitivity: 'base' }) === 0) {
+                        matches++;
+                    }
+                }
+                if (matches > 0)
+                    result = '1';
+                else
+                    result = 'Value not matched~Run~patternSize: ' + patternSize + '; recipe: ' + recipe + '; pattern: ' + pattern + ';~API~' + debug;
+            }
+        }
+    }
+    return result;
+}
+
+getValue('FTIR', 1, '6in_Centerpoint', 'pattern', '{"rds":{"prodSpec":{"recipesAndPatterns":[{"recipe":"6in_Centerpoint","pattern":"Centerpoint","patternSize":1,"tool":"FTIR"}]}}}');
+
+let json;
+let tool;
+let recipe;
+let pattern;
+let patternSize;
+
+tool = 'FTIR'
+patternSize = 1;
+recipe = '6in_Centerpoint';
+pattern = 'pattern';
+json = '{"rds":{"prodSpec":{"recipesAndPatterns":[{"recipe":"6in_Centerpoint","pattern":"Centerpoint","patternSize":1,"tool":"FTIR"}]}}}';
+const testA = getValue(tool, patternSize, recipe, pattern, json);
+if (testA !== '1')
+    throw 'Test A failed: ' + testA;
+tool = null;
+const testB = getValue(tool, patternSize, recipe, pattern, json);
+if (testB !== 'A) Invalid input!')
+    throw 'Test L failed: ' + testB;
+tool = '';
+const testC = getValue(tool, patternSize, recipe, pattern, json);
+if (testC !== 'A) Invalid input!')
+    throw 'Test M failed: ' + testC;
+patternSize = null;
+const testD = getValue(tool, patternSize, recipe, pattern, json);
+if (testD !== 'A) Invalid input!')
+    throw 'Test J failed: ' + testD;
+patternSize = '';
+const testE = getValue(tool, patternSize, recipe, pattern, json);
+if (testE !== 'A) Invalid input!')
+    throw 'Test K failed: ' + testE;
+recipe = null;
+const testF = getValue(tool, patternSize, recipe, pattern, json);
+if (testF !== 'A) Invalid input!')
+    throw 'Test F failed: ' + testF;
+recipe = '';
+const testG = getValue(tool, patternSize, recipe, pattern, json);
+if (testG !== 'A) Invalid input!')
+    throw 'Test G failed: ' + testG;
+pattern = null;
+const testH = getValue(tool, patternSize, recipe, pattern, json);
+if (testH !== 'A) Invalid input!')
+    throw 'Test H failed: ' + testH;
+pattern = '';
+const testI = getValue(tool, patternSize, recipe, pattern, json);
+if (testI !== 'A) Invalid input!')
+    throw 'Test I failed: ' + testI;
+json = '';
+const testK = getValue(tool, patternSize, recipe, pattern, json);
+if (testK !== 'A) Invalid input!')
+    throw 'Test B failed: ' + testK;
+json = 'invalid';
+const testL = getValue(tool, patternSize, recipe, pattern, json);
+if (testL !== 'B) Invalid input!')
+    throw 'Test C failed: ' + testL;
+json = '{"rds":{}}';
+const testM = getValue(tool, patternSize, recipe, pattern, json);
+if (testM !== 'C) No Spec!')
+    throw 'Test D failed: ' + testM;
+json = '{"rds":{"prodSpec":{"recipesAndPatterns":[]}}}';
+const testN = getValue(tool, patternSize, recipe, pattern, json);
+if (testN !== 'Tool [FTIR] not found in OI API results!')
+    throw 'Test E failed: ' + testN;
--- a/MET08THFTIRSTRATUS.csproj
+++ b/MET08THFTIRSTRATUS.csproj
@ -190,13 +190,13 @@
      <Version>7.2.4630.5</Version>
    </PackageReference>
    <PackageReference Include="Infineon.EAF.Runtime">
-      <Version>2.60.0</Version>
+      <Version>2.61.1</Version>
    </PackageReference>
    <PackageReference Include="Pdfbox">
      <Version>1.1.1</Version>
    </PackageReference>
    <PackageReference Include="System.Text.Json">
-      <Version>8.0.5</Version>
+      <Version>8.0.3</Version>
    </PackageReference>
  </ItemGroup>
  <ItemGroup />
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.60.0.0")]
-[assembly: AssemblyFileVersion("2.60.0.0")]
+[assembly: AssemblyVersion("2.61.1.0")]
+[assembly: AssemblyFileVersion("2.61.1.0")]
Author	SHA1	Message	Date
phares@iscn5cg20977xq	44df972fca	Infineon.EAF.Runtime v2.61.1	2025-10-15 07:24:26 -07:00
phares@iscn5cg20977xq	5dcbf1ff79	Handle center point zero readings	2025-10-15 07:24:15 -07:00
phares@iscn5cg20977xq	ccba3b8dba	Add IndexOf and AttemptCounter properties to WSRequest and Description classes; implement getValue function in recipes-and-patterns.js	2025-10-13 17:43:00 -07:00
phares@iscn5cg20977xq	48ad90c0f1	Refactor OpenInsight file handling to utilize JsonElement for data processing and enhance serialization with JsonSourceGeneration. Updated methods across multiple classes to improve data handling and reduce dependencies on ProcessDataStandardFormat.	2025-09-08 15:31:55 -07:00
phares@iscn5cg20977xq	7739ff03a2	Switched to xml for InfinityQS export	2025-09-02 08:14:26 -07:00
phares@iscn5cg20977xq	34ba8a4843	Preparation to switch to xml for InfinityQS export	2025-08-27 11:47:15 -07:00