Infineon.EAF.Runtime 2.49.3

Directory Trigger for OI Save ProcessDataStandardFormat to EC_Metrology_Si IDescription.GetDescriptions with body Viewer support tasks.json kanbn initialize WSRequest alignment SRP2100 = 53, //Largest Delay for RAMS connectionCount #pragma warning disable IDE0060 MesEntity Placeholder Infineon.EAF.Runtime 2.49.0 net6.0 to net7.0
2023-08-31 11:09:15 -07:00 · 2023-08-31 11:09:15 -07:00 · 751cc3046a
commit 751cc3046a
parent 8e293f9692
28 changed files with 268 additions and 131 deletions
--- a/.gitignore
+++ b/.gitignore
@ -331,11 +331,11 @@ ASALocalRun/
 ##
 ## Visual Studio Code
 ##
-*/!.vscode/extensions.json
-*/!.vscode/launch.json
-*/!.vscode/settings.json
-*/!.vscode/tasks.json
-*/.vscode/*
-*/.vscode/ReportGenerator/*
+**/.vscode/*
+!**/.vscode/extensions.json
+!**/.vscode/format-report.json
+!**/.vscode/launch.json
+!**/.vscode/settings.json
+!**/.vscode/tasks.json

 *.lnk
--- a/Adaptation/.kanbn/board.css
+++ b/Adaptation/.kanbn/board.css
@ -0,0 +1,7 @@
+.kanbn-task-data-workload {
+  display: none;
+}
+.kanbn-task-data-relation {
+  display: block;
+  color: #198038;
+}
--- a/Adaptation/.kanbn/index.md
+++ b/Adaptation/.kanbn/index.md
@ -0,0 +1,21 @@
+---
+type: "kanbn"
+created: 2023-07-07T15:37:56.040Z
+updated: 2023-07-18T19:52:59.668Z
+startedColumns:
+  - 'In Progress'
+completedColumns:
+  - Done
+dateFormat: mm/dd
+taskTemplate: '^+^_${overdue ? ''^R'' : ''''}${name}^: ${relations ? (''\n^-^/^g'' + relations.reduce((accumulator, currentValue) => accumulator.task + currentValue.task + '' '', '''')) : ''''}'
+---
+
+# MET08ANLYSDIFAAST230
+
+## Backlog
+
+## Todo
+
+## In Progress
+
+## Done
--- a/Adaptation/.vscode/settings.json
+++ b/Adaptation/.vscode/settings.json
@ -1,4 +1,7 @@
 {
+    "[markdown]": {
+        "editor.wordWrap": "off"
+    },
    "cSpell.words": [
        "ANLYSDIFAAST",
        "datauniqueid",
--- a/Adaptation/.vscode/tasks.json
+++ b/Adaptation/.vscode/tasks.json
@ -2,41 +2,81 @@
    "version": "2.0.0",
    "tasks": [
        {
-            "label": "build",
+            "label": "Build",
            "command": "dotnet",
            "type": "process",
            "args": [
                "build",
-                "${workspaceFolder}/MET08ANLYSDIFAAST230.Tests.csproj",
                "/property:GenerateFullPaths=true",
                "/consoleloggerparameters:NoSummary"
            ],
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "publish",
+            "label": "Format",
            "command": "dotnet",
            "type": "process",
            "args": [
-                "publish",
-                "${workspaceFolder}/MET08ANLYSDIFAAST230.Tests.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "format",
+                "--report",
+                ".vscode",
+                "--verbosity",
+                "detailed",
+                "--severity",
+                "warn"
            ],
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "watch",
+            "label": "Nuget Clear",
            "command": "dotnet",
            "type": "process",
            "args": [
-                "watch",
-                "run",
-                "${workspaceFolder}/MET08ANLYSDIFAAST230.Tests.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "nuget",
+                "locals",
+                "all",
+                "--clear"
            ],
            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "MSBuild for EAF Deployment Packages",
+            "command": "C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe",
+            "type": "process",
+            "args": [
+                "/target:Build",
+                "/restore:True",
+                "/p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json%3Bhttps://localhost/v3/index.json",
+                "/detailedsummary",
+                "/consoleloggerparameters:PerformanceSummary;ErrorsOnly;",
+                "/property:Configuration=Debug;TargetFrameworkVersion=v4.8",
+                "../MET08ANLYSDIFAAST230.csproj"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "File-Folder-Helper AOT s M .Kanbn Tasks",
+            "type": "shell",
+            "command": "& L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net7.0/win-x64/publish/File-Folder-Helper.exe s M T:/MET08ANLYSDIFAAST230/06_SourceCode/MET08ANLYSDIFAAST230/Adaptation -s T:/MET08ANLYSDIFAAST230/06_SourceCode/MET08ANLYSDIFAAST230/Adaptation/.kanbn/tasks",
+            "problemMatcher": []
+        },
+        {
+            "label": "Kanbn Console",
+            "type": "npm",
+            "script": "kanbn.board",
+            "problemMatcher": []
+        },
+        {
+            "label": "Kanbn Write Boad",
+            "type": "shell",
+            "command": "& kanbn board -j | L:/Git/kanbn2md/kanbn2md.exe >.kanbn/board.md",
+            "problemMatcher": []
+        },
+        {
+            "label": "Kanbn Write json",
+            "type": "npm",
+            "script": "kanbn.board.json",
+            "problemMatcher": []
        }
    ]
 }
--- a/Adaptation/FileHandlers/APC/FileRead.cs
+++ b/Adaptation/FileHandlers/APC/FileRead.cs
@ -14,8 +14,8 @@ namespace Adaptation.FileHandlers.APC;
 public class FileRead : Shared.FileRead, IFileRead
 {

-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
    {
        _MinFileLength = 10;
        _NullData = string.Empty;
--- a/Adaptation/FileHandlers/Archive/FileRead.cs
+++ b/Adaptation/FileHandlers/Archive/FileRead.cs
@ -18,8 +18,8 @@ public class FileRead : Shared.FileRead, IFileRead
    private readonly string _JobIdParentDirectory;
    private readonly string _JobIdArchiveParentDirectory;

-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
    {
        _MinFileLength = 10;
        _NullData = string.Empty;
@ -115,10 +115,10 @@ public class FileRead : Shared.FileRead, IFileRead
        }
    }

+#pragma warning disable IDE0060
    private void MoveArchive(string reportFullPath, DateTime dateTime)
+#pragma warning restore IDE0060
    {
-        if (dateTime == DateTime.MinValue)
-        { }
        string logisticsSequence = _Logistics.Sequence.ToString();
        string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
        string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}{@"\"}{_Logistics.DateTimeFromSequence:yyyy-MM-dd}";
--- a/Adaptation/FileHandlers/CellInstanceConnectionName.cs
+++ b/Adaptation/FileHandlers/CellInstanceConnectionName.cs
@ -9,20 +9,20 @@ namespace Adaptation.FileHandlers;
 public class CellInstanceConnectionName
 {

-    internal static IFileRead Get(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted)
+    internal static IFileRead Get(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, int? connectionCount)
    {
        IFileRead result = cellInstanceConnectionName switch
        {
-            nameof(Archive) => new Archive.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(Dummy) => new Dummy.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(IQSSi) => new IQSSi.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(MoveMatchingFiles) => new MoveMatchingFiles.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(OpenInsight) => new OpenInsight.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(OpenInsightMetrologyViewer) => new OpenInsightMetrologyViewer.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(OpenInsightMetrologyViewerAttachments) => new OpenInsightMetrologyViewerAttachments.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(Processed) => new Processed.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(APC) => new APC.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
-            nameof(SPaCe) => new SPaCe.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted),
+            nameof(Archive) => new Archive.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(Dummy) => new Dummy.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(IQSSi) => new IQSSi.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(MoveMatchingFiles) => new MoveMatchingFiles.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(OpenInsight) => new OpenInsight.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(OpenInsightMetrologyViewer) => new OpenInsightMetrologyViewer.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(OpenInsightMetrologyViewerAttachments) => new OpenInsightMetrologyViewerAttachments.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(Processed) => new Processed.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(APC) => new APC.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
+            nameof(SPaCe) => new SPaCe.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null),
            _ => throw new Exception($"\"{cellInstanceConnectionName}\" not mapped")
        };
        return result;
--- a/Adaptation/FileHandlers/Dummy/FileRead.cs
+++ b/Adaptation/FileHandlers/Dummy/FileRead.cs
@ -23,8 +23,8 @@ public class FileRead : Shared.FileRead, IFileRead
    private int _LastDummyRunIndex;
    private readonly string[] _CellNames;

-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
    {
        _MinFileLength = 10;
        _NullData = string.Empty;
--- a/Adaptation/FileHandlers/IQSSi/FileRead.cs
+++ b/Adaptation/FileHandlers/IQSSi/FileRead.cs
@ -14,8 +14,8 @@ namespace Adaptation.FileHandlers.IQSSi;
 public class FileRead : Shared.FileRead, IFileRead
 {

-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
    {
        _MinFileLength = 10;
        _NullData = string.Empty;
@ -118,8 +118,6 @@ public class FileRead : Shared.FileRead, IFileRead

    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
    {
-        if (dateTime == DateTime.MinValue)
-        { }
        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
--- a/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs
+++ b/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs
@ -16,8 +16,8 @@ namespace Adaptation.FileHandlers.MoveMatchingFiles;
 public class FileRead : Shared.FileRead, IFileRead
 {

-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
    {
        _MinFileLength = 10;
        _NullData = string.Empty;
--- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs
+++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs
@ -22,8 +22,8 @@ public class FileRead : Shared.FileRead, IFileRead
    private readonly string _OpenInsightApiECDirectory;
    private readonly string _OpenInsightApiIFXDirectory;

-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
    {
        _MinFileLength = 10;
        _NullData = string.Empty;
@ -135,33 +135,36 @@ public class FileRead : Shared.FileRead, IFileRead
    {
        bool isDummyRun = false;
        List<(Shared.Properties.IScopeInfo, string)> collection = new();
-        string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
-        string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
-        if (parentParent.Contains(_CellInstanceName))
-            parentParent = Path.GetDirectoryName(parentParent);
-        string duplicateDirectory = Path.Combine(parentParent, "Data");
+        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")))
+        {
+            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.Any() && tests.Any())
        {
            string lines = GetLines(_Logistics, descriptions);
            if (!string.IsNullOrEmpty(lines))
            {
-                int? count;
                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, count) = (null, null);
+                    subGroupId = null;
                else
-                    (subGroupId, count, string _) = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait);
+                    (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 if (count is null)
-                    collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} {_OpenInsightFilePattern}"), lines));
                else
-                    collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} E{count.Value} {_OpenInsightFilePattern}"), lines));
+                    collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} {_OpenInsightFilePattern}"), lines));
                string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
                FromIQS.Save(_OpenInsightApiECDirectory, _OpenInsightApiIFXDirectory, _Logistics, reportFullPath, logistics, descriptions.First(), lines, subGroupId, weekOfYear);
            }
--- a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs
+++ b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs
@ -20,25 +20,38 @@ public class FromIQS
    {
        StringBuilder result = new();
        _ = result
+                .AppendLine(" select iq.ev_count, iq.cl_count, iq.sl_count, iq.se_sgrp, iq.se_sgtm, iq.se_tsno, iq.td_test, iq.pr_name, iq.jd_name, iq.pl_name, iq.pd_name, iq.td_name, iq.se_val ")
+                .AppendLine(" from ( ")
                .AppendLine(" select ")
                .AppendLine("       se.f_sgrp se_sgrp, ")
                .AppendLine("       se.f_sgtm se_sgtm, ")
                .AppendLine("       se.f_tsno se_tsno, ")
                .AppendLine("       se.f_val se_val, ")
-                .AppendLine("       rd.f_name rd_name, ")
+                .AppendLine("       pr.f_name pr_name, ")
                .AppendLine("       jd.f_name jd_name, ")
                .AppendLine("       pl.f_name pl_name, ")
                .AppendLine("       pd.f_name pd_name, ")
                .AppendLine("       td.f_test td_test, ")
                .AppendLine("       td.f_name td_name, ")
+                .AppendLine("       (select count(cl.f_part) ")
+                .AppendLine("       from [spcepiworld].[dbo].[ctrl_lim] cl ")
+                .AppendLine("       where cl.f_part = pd.f_part ")
+                .AppendLine("         and cl.f_test = td.f_test ")
+                .AppendLine("       ) cl_count, ")
+                .AppendLine("       (select count(sl.f_part) ")
+                .AppendLine("       from [spcepiworld].[dbo].[spec_lim] sl ")
+                .AppendLine("       where sl.f_part = pd.f_part ")
+                .AppendLine("         and sl.f_test = td.f_test ")
+                .AppendLine("       ) sl_count, ")
                .AppendLine("       (select count(ev.f_evnt) ")
                .AppendLine("       from [spcepiworld].[dbo].[evnt_inf] ev ")
-                .AppendLine("       where ev.f_prcs = rd.f_prcs ")
+                .AppendLine("       where ev.f_prcs = pr.f_prcs ")
                .AppendLine("         and ev.f_part = pd.f_part ")
-                .AppendLine("         and ev.f_sgtm = se.f_sgtm) ev_count ")
+                .AppendLine("         and ev.f_sgtm = se.f_sgtm ")
+                .AppendLine("       ) ev_count ")
                .AppendLine(" from [spcepiworld].[dbo].[sgrp_ext] se ")
-                .AppendLine(" join [spcepiworld].[dbo].[prcs_dat] rd ")
-                .AppendLine("   on se.f_prcs = rd.f_prcs ")
+                .AppendLine(" join [spcepiworld].[dbo].[prcs_dat] pr ")
+                .AppendLine("   on se.f_prcs = pr.f_prcs ")
                .AppendLine(" join [spcepiworld].[dbo].[job_dat] jd ")
                .AppendLine("   on se.f_job = jd.f_job ")
                .AppendLine(" join [spcepiworld].[dbo].[part_lot] pl ")
@ -53,11 +66,13 @@ public class FromIQS
        if (!string.IsNullOrEmpty(description.RDS))
            _ = result.Append("   and pl.f_name = '").Append(description.RDS).AppendLine("' ");
        _ = result
-                .Append("   and rd.f_name = '").Append(description.Reactor).AppendLine("' ")
+                .Append("   and pr.f_name = '").Append(description.Reactor).AppendLine("' ")
                .Append("   and pd.f_name = '").Append(description.PSN).AppendLine("' ")
                .AppendLine("   and jd.f_name in ('SPV01') ")
                .Append("   and jd.f_name = '").Append(logistics.MesEntity).AppendLine("' ")
                .Append("   and dateadd(HH, -7, (dateadd(SS, convert(bigint, se.f_sgtm), '19700101'))) = '").Append(dateTime).AppendLine("' ")
+                .AppendLine(" ) as iq ")
+                .AppendLine(" order by iq.ev_count desc, iq.cl_count desc, iq.sl_count desc, iq.se_sgrp, iq.se_tsno, iq.td_test ")
                .AppendLine("   for json path ");
        return result.ToString();
    }
@ -99,7 +114,17 @@ public class FromIQS
        {
            stringBuilder = GetForJsonPath(connectionString, commandText);
            if (stringBuilder.Length > 0)
+            {
+                long postBreakAfter = DateTime.Now.AddSeconds(5).Ticks;
+                for (short y = 0; y < short.MaxValue; y++)
+                {
+                    if (DateTime.Now.Ticks > postBreakAfter)
+                        break;
+                    Thread.Sleep(250);
+                }
+                stringBuilder = GetForJsonPath(connectionString, commandText);
                break;
+            }
            if (DateTime.Now.Ticks > breakAfter)
                // throw new Exception($"After {breakAfterSeconds} seconds, didn't find sub group id!");
                break;
@ -115,13 +140,12 @@ public class FromIQS
            else
            {
                JsonProperty[] jsonProperties = jsonElements[0].EnumerateObject().ToArray();
-                if (!jsonProperties.Any() || jsonProperties[0].Name != "se_sgrp" || !long.TryParse(jsonProperties[0].Value.ToString(), out long subGroupId))
+                if (!jsonProperties.Any() || jsonProperties[3].Name != "se_sgrp" || !long.TryParse(jsonProperties[3].Value.ToString(), out long subGroupId))
                    commandText = stringBuilder.ToString();
                else
                {
                    result = subGroupId;
-                    commandText = GetCommandText(logistics, description, dateTime, subGroupId);
-                    if (jsonProperties.Any() && jsonProperties[10].Name == "ev_count" && int.TryParse(jsonProperties[10].Value.ToString(), out int evCount))
+                    if (jsonProperties.Any() && jsonProperties[0].Name == "ev_count" && int.TryParse(jsonProperties[0].Value.ToString(), out int evCount))
                        count = evCount;
                }
            }
--- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs
+++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs
@ -14,8 +14,8 @@ namespace Adaptation.FileHandlers.OpenInsightMetrologyViewer;
 public class FileRead : Shared.FileRead, IFileRead
 {

-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
    {
        _MinFileLength = 10;
        _NullData = string.Empty;
@ -103,12 +103,10 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

-    private static void SendData(DateTime dateTime, List<SECS.Description> descriptions)
+#pragma warning disable IDE0060
+    private static void SendData(string reportFullPath, DateTime dateTime, List<SECS.Description> descriptions)
+#pragma warning restore IDE0060
    {
-        if (dateTime == DateTime.MinValue)
-        { }
-        if (descriptions is null)
-        { }
    }

    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
@ -121,7 +119,7 @@ public class FileRead : Shared.FileRead, IFileRead
        List<SECS.Description> descriptions = SECS.ProcessData.GetDescriptions(jsonElements);
        Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            SendData(dateTime, descriptions);
+            SendData(reportFullPath, dateTime, descriptions);
        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
        return results;
    }
--- a/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs
+++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs
@ -14,8 +14,8 @@ namespace Adaptation.FileHandlers.OpenInsightMetrologyViewerAttachments;
 public class FileRead : Shared.FileRead, IFileRead
 {

-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
    {
        _MinFileLength = 10;
        _NullData = string.Empty;
@ -103,14 +103,10 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

+#pragma warning disable IDE0060
    private static void PostOpenInsightMetrologyViewerAttachments(string reportFullPath, DateTime dateTime, List<SECS.Description> descriptions)
+#pragma warning restore IDE0060
    {
-        if (reportFullPath is null)
-        { }
-        if (dateTime == DateTime.MinValue)
-        { }
-        if (descriptions is null)
-        { }
    }

    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
--- a/Adaptation/FileHandlers/Processed/FileRead.cs
+++ b/Adaptation/FileHandlers/Processed/FileRead.cs
@ -14,8 +14,8 @@ namespace Adaptation.FileHandlers.Processed;
 public class FileRead : Shared.FileRead, IFileRead
 {

-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
    {
        _MinFileLength = 10;
        _NullData = string.Empty;
@ -103,14 +103,10 @@ public class FileRead : Shared.FileRead, IFileRead
        return results;
    }

+#pragma warning disable IDE0060
    private static void DirectoryMove(string reportFullPath, DateTime dateTime, List<Shared.Properties.IDescription> descriptions)
+#pragma warning restore IDE0060
    {
-        if (reportFullPath is null)
-        { }
-        if (dateTime == DateTime.MinValue)
-        { }
-        if (descriptions is null)
-        { }
    }

    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
--- a/Adaptation/FileHandlers/SPaCe/FileRead.cs
+++ b/Adaptation/FileHandlers/SPaCe/FileRead.cs
@ -14,8 +14,8 @@ namespace Adaptation.FileHandlers.SPaCe;
 public class FileRead : Shared.FileRead, IFileRead
 {

-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
+    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
+        base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
    {
        _MinFileLength = 10;
        _NullData = string.Empty;
@ -116,8 +116,6 @@ public class FileRead : Shared.FileRead, IFileRead

    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
    {
-        if (dateTime == DateTime.MinValue)
-        { }
        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
--- a/Adaptation/MET08ANLYSDIFAAST230-Development.yml
+++ b/Adaptation/MET08ANLYSDIFAAST230-Development.yml
@ -12,7 +12,7 @@ pool:

 steps:
  - script: |
-      set coreVersion=net6.0
+      set coreVersion=net7.0
      echo %coreVersion%
      echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
      echo $(CoreVersion)
@ -22,11 +22,11 @@ steps:
      set configuration=Debug
      echo %configuration%
      echo ##vso[task.setvariable variable=Configuration;]%configuration%
-      echo ($Configuration)
+      echo $(Configuration)
    displayName: Configuration

  - script: |
-      set nugetSource=https://messa017.infineon.com/v3/index.json
+      set nugetSource=https://eaf-dev-reporting.mes.infineon.com/v3/index.json
      echo %nugetSource%
      echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
      echo $(NugetSource)
@ -97,7 +97,15 @@ steps:
      testResultsFormat: VSTest
      testResultsFiles: "**/*.trx"
      testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
-      searchFolder: "$(System.DefaultWorkingDirectory)"
+      searchFolder: "$(System.DefaultWorkingDirectory)/TestResults"
+
+  - task: PublishTestResults@2
+    displayName: "Publish Test Results */coverage.cobertura.xml"
+    inputs:
+      testResultsFormat: VSTest
+      testResultsFiles: "*/coverage.cobertura.xml"
+      testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
+      searchFolder: "$(System.DefaultWorkingDirectory)/TestResults"

  - task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1
    displayName: "Create work item"
--- a/Adaptation/MET08ANLYSDIFAAST230.Tests.csproj
+++ b/Adaptation/MET08ANLYSDIFAAST230.Tests.csproj
@ -11,7 +11,7 @@
        <LangVersion>10.0</LangVersion>
        <Nullable>disable</Nullable>
        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
    </PropertyGroup>
    <PropertyGroup>
        <VSTestLogger>trx</VSTestLogger>
@ -33,7 +33,7 @@
        <DefineConstants>Linux</DefineConstants>
    </PropertyGroup>
    <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="3.2.0" />
+        <PackageReference Include="coverlet.collector" Version="6.0.0" />
        <PackageReference Include="FFMpegCore" Version="5.1.0" />
        <PackageReference Include="IKVM.AWT.WinForms" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
        <PackageReference Include="IKVM.OpenJDK.Core" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
@ -53,10 +53,10 @@
        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
        <PackageReference Include="Microsoft.Win32.SystemEvents" Version="7.0.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.0.4" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
        <PackageReference Include="Pdfbox" Version="1.1.1"><NoWarn>NU1701</NoWarn></PackageReference>
        <PackageReference Include="RoboSharp" Version="1.2.8" />
        <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
@ -67,8 +67,8 @@
        <PackageReference Include="Tesseract" Version="5.2.0" />
    </ItemGroup>
    <ItemGroup>
-        <PackageReference Include="Tibco.Rendezvous" Version="8.5.0" />
-        <PackageReference Include="Infineon.Yoda" Version="5.4.1" />
+        <PackageReference Include="Tibco.Rendezvous.DotNetCore" Version="8.5.0" />
+        <PackageReference Include="Infineon.Yoda.DotNetCore" Version="5.4.1" />
    </ItemGroup>
    <ItemGroup>
        <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.1"><NoWarn>NU1701</NoWarn></PackageReference>
--- a/Adaptation/MET08ANLYSDIFAAST230.yml
+++ b/Adaptation/MET08ANLYSDIFAAST230.yml
@ -12,7 +12,7 @@ pool:

 steps:
  - script: |
-      set coreVersion=net6.0
+      set coreVersion=net7.0
      echo %coreVersion%
      echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
      echo $(CoreVersion)
@ -22,11 +22,11 @@ steps:
      set configuration=Release
      echo %configuration%
      echo ##vso[task.setvariable variable=Configuration;]%configuration%
-      echo ($Configuration)
+      echo $(Configuration)
    displayName: Configuration

  - script: |
-      set nugetSource=https://messa08ec.ec.local/v3/index.json
+      set nugetSource=https://eaf-prod.mes.infineon.com/v3/index.json
      echo %nugetSource%
      echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
      echo $(NugetSource)
@ -97,7 +97,15 @@ steps:
      testResultsFormat: VSTest
      testResultsFiles: "**/*.trx"
      testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
-      searchFolder: "$(System.DefaultWorkingDirectory)"
+      searchFolder: "$(System.DefaultWorkingDirectory)/TestResults"
+
+  - task: PublishTestResults@2
+    displayName: "Publish Test Results */coverage.cobertura.xml"
+    inputs:
+      testResultsFormat: VSTest
+      testResultsFiles: "*/coverage.cobertura.xml"
+      testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
+      searchFolder: "$(System.DefaultWorkingDirectory)/TestResults"

  - task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1
    displayName: "Create work item"
--- a/Adaptation/Shared/Duplicator/Description.cs
+++ b/Adaptation/Shared/Duplicator/Description.cs
@ -115,6 +115,42 @@ public class Description : IDescription, Properties.IDescription
    List<IDescription> IDescription.GetDescriptions(IFileRead fileRead, Logistics logistics, List<Test> tests, IProcessData iProcessData)
    {
        List<IDescription> results = new();
+        if (iProcessData is null || !iProcessData.Details.Any())
+            results.Add(GetDefault(fileRead, logistics));
+        else
+        {
+            string nullData;
+            Description description;
+            object configDataNullData = fileRead.NullData;
+            if (configDataNullData is null)
+                nullData = string.Empty;
+            else
+                nullData = configDataNullData.ToString();
+            for (int i = 0; i < iProcessData.Details.Count; i++)
+            {
+                if (iProcessData.Details[i] is null)
+                    continue;
+                description = new Description
+                {
+                    Test = (int)tests[i],
+                    Count = tests.Count,
+                    Index = i,
+                    //
+                    EventName = fileRead.EventName,
+                    NullData = nullData,
+                    JobID = fileRead.CellInstanceName,
+                    Sequence = logistics.Sequence.ToString(),
+                    MesEntity = logistics.MesEntity,
+                    ReportFullPath = logistics.ReportFullPath,
+                    ProcessJobID = logistics.ProcessJobID,
+                    MID = logistics.MID,
+                    //
+                    Date = DateTime.Now.ToString(GetDateFormat()),
+                    RDS = string.Empty,
+                };
+                results.Add(description);
+            }
+        }
        return results;
    }

--- a/Adaptation/Shared/FileRead.cs
+++ b/Adaptation/Shared/FileRead.cs
@ -63,7 +63,7 @@ public class FileRead : Properties.IFileRead
    string Properties.IFileRead.CellInstanceConnectionName => _CellInstanceConnectionName;
    string Properties.IFileRead.ParameterizedModelObjectDefinitionType => _ParameterizedModelObjectDefinitionType;

-    public FileRead(IDescription description, bool isEvent, ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted)
+    public FileRead(IDescription description, bool isEvent, ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted)
    {
        _SMTP = smtp;
        _IsEvent = isEvent;
@ -106,7 +106,7 @@ public class FileRead : Properties.IFileRead
                throw new Exception(cellInstanceConnectionName);
            if (string.IsNullOrEmpty(equipmentDictionaryName) && isEvent)
                throw new Exception(cellInstanceConnectionName);
-            if (!string.IsNullOrEmpty(equipmentDictionaryName) && !isEvent)
+            if (!string.IsNullOrEmpty(equipmentDictionaryName) && !isEvent && connectionCount > 1)
                throw new Exception(cellInstanceConnectionName);
            // if (string.IsNullOrEmpty(equipmentDictionaryName) && !isEvent)
            //     throw new Exception(cellInstanceConnectionName);
@ -260,19 +260,21 @@ public class FileRead : Properties.IFileRead
        return results;
    }

-    protected static string GetTupleFile<T>(Logistics logistics, List<T> descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory) where T : Properties.IDescription
+    protected static string GetTupleFile<T>(Logistics logistics, List<T> descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory, string duplicateFile) where T : Properties.IDescription
    {
        string result;
        string rds;
+        string fileName;
        string dateValue;
        string rdsPlaceholder = "%RDS%";
+        string mesEntityPlaceholder = "%MesEntity%";
        if (!descriptions.Any() || string.IsNullOrEmpty(descriptions[0].RDS))
            rds = logistics.MID;
        else
            rds = descriptions[0].RDS;
        string[] segments = scopeInfo.FileName.Split(new string[] { "DateTime:" }, StringSplitOptions.RemoveEmptyEntries);
        if (segments.Length == 0)
-            result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileNameWithoutExtension.Replace(rdsPlaceholder, rds));
+            result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileNameWithoutExtension.Replace(rdsPlaceholder, rds).Replace(mesEntityPlaceholder, logistics.MesEntity));
        else
        {
            segments = segments[1].Split('%');
@ -284,7 +286,11 @@ public class FileRead : Properties.IFileRead
                    continue;
                datePlaceholder = string.Concat('%', segment, '%');
            }
-            result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(datePlaceholder, dateValue));
+            fileName = scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(mesEntityPlaceholder, logistics.MesEntity).Replace(datePlaceholder, dateValue);
+            if (!duplicateFile.Contains("Viewer"))
+                result = Path.Combine(duplicateDirectory, fileName);
+            else
+                result = Path.Combine(duplicateDirectory, $"Viewer_{fileName}");
        }
        if (result.Contains('%'))
            throw new Exception("Placeholder exists!");
@ -317,7 +323,7 @@ public class FileRead : Properties.IFileRead
            else if (!scopeInfo.FileName.Contains('%'))
                tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", scopeInfo.FileNameWithoutExtension, ".pdsfc");
            else
-                tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory);
+                tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory, duplicateFile);
            tupleFileName = Path.GetFileNameWithoutExtension(tupleFile).Split('.')[0];
            duplicateFiles.Add(tupleFile);
            if (_IsEAFHosted)
--- a/Adaptation/Shared/Test.cs
+++ b/Adaptation/Shared/Test.cs
@ -21,7 +21,7 @@ public enum Test
    Denton = 9,
    DiffusionLength = 45,
    GRATXTCenter = 51,
-    GRATXTEdge = 52, //Largest
+    GRATXTEdge = 52,
    GrowthRateXML = 50,
    Hall = 10,
    HgCV = 23,
@ -38,6 +38,7 @@ public enum Test
    RPMPLRatio = 17,
    RPMXY = 15,
    SP1 = 8,
+    SRP2100 = 53, //Largest
    Tencor = 7,
    UV = 35,
    VerificationLehighton = 14,
--- a/Adaptation/_Tests/Shared/AdaptationTesting.cs
+++ b/Adaptation/_Tests/Shared/AdaptationTesting.cs
@ -984,7 +984,7 @@ public class AdaptationTesting : ISMTP
                    _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder);
            }
        }
-        result = FileHandlers.CellInstanceConnectionName.Get(this, fileParameter, mbn.CellInstanceName, mbn.CellInstanceConnectionName, fileConnectorConfigurationTuple.Item2, equipmentTypeVersionTuple.Item2, parameterizedModelObjectDefinitionTypeTuple.Item2, modelObjectParametersTuple.Item2, equipmentDictionaryVersionTuple.Item2, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: false);
+        result = FileHandlers.CellInstanceConnectionName.Get(this, fileParameter, mbn.CellInstanceName, mbn.CellInstanceConnectionName, fileConnectorConfigurationTuple.Item2, equipmentTypeVersionTuple.Item2, parameterizedModelObjectDefinitionTypeTuple.Item2, modelObjectParametersTuple.Item2, equipmentDictionaryVersionTuple.Item2, dummyRuns, staticRuns, useCyclicalForDescription, connectionCount: cellInstanceVersionTuple.Item2.EquipmentConnections.Length);
        return result;
    }

--- a/Adaptation/package.json
+++ b/Adaptation/package.json
@ -1,14 +1,8 @@
 {
    "scripts": {
        "Alpha": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-        "nuget-clear": "dotnet nuget locals all --clear",
-        "build": "dotnet build --runtime win-x64 --self-contained",
-        "build-Package-Management": "dotnet build --runtime win-x64 --self-contained --source https://packagemanagement.eu.infineon.com:4430/api/v2/",
-        "build-nuget-And-Package-Management": "dotnet build --runtime win-x64 --self-contained --source https://api.nuget.org/v3/index.json --source https://packagemanagement.eu.infineon.com:4430/api/v2/",
-        "build-All-Sources": "dotnet build --runtime win-x64 --self-contained --source https://api.nuget.org/v3/index.json --source https://packagemanagement.eu.infineon.com:4430/api/v2/ --source https://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json --source http://192.168.0.73:5002/v3/index.json",
-        "dotnet-format": "dotnet format --report .vscode --verbosity detailed --severity warn",
-        "MSBuild": "\"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe\" /target:Build /restore:True /p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json /DetailedSummary /ConsoleLoggerParameters:PerformanceSummary;ErrorsOnly; /property:Configuration=Debug;TargetFrameworkVersion=v4.8 ../MET08ANLYSDIFAAST230.csproj",
-        "pull": "git pull",
+        "kanbn.board": "kanbn board",
+        "kanbn.board.json": "kanbn board -j > .kanbn/board.json",
        "garbage-collect": "git gc",
        "AT-CreateSelfDescription.Staging.v2_43_0-MET08ANLYSDIFAAST230": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~MET08ANLYSDIFAAST230\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
        "AX-CreateSelfDescription.Staging.v2_43_0-SPV01_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~SPV01_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
--- a/FileHandlers/FileRead.cs
+++ b/FileHandlers/FileRead.cs
@ -165,7 +165,7 @@ public partial class FileRead : FileReaderHandler, ISMTP
                Equipment.SelfDescriptionBuilder.AddParameterTypeDefinition(structuredType);
            }
            if (!parameterTypeDefinitions.ContainsKey(jsonProperty.Value.ValueKind))
-                throw new Exception(string.Concat('{', jsonProperty.Value.ValueKind, "} is not mapped!"));
+                throw new Exception(string.Concat('<', jsonProperty.Name, "> {", jsonProperty.Value.ValueKind, "} is not mapped!"));
        }
        foreach (JsonProperty jsonProperty in jsonProperties)
        {
@ -197,7 +197,7 @@ public partial class FileRead : FileReaderHandler, ISMTP
        FileConnectorConfiguration fileConnectorConfiguration = Mapper.Map(Configuration);
        string parameterizedModelObjectDefinitionType = methodBase.DeclaringType.FullName;
        IList<ModelObjectParameterDefinition> modelObjectParameters = Mapper.Map(ConfiguredParameters);
-        _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _StaticRuns, _UseCyclicalForDescription, isEAFHosted: true);
+        _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _StaticRuns, _UseCyclicalForDescription, connectionCount: null);
        if (_FileRead.IsEvent)
            AddParameterRangeAndEvent();
    }
@ -338,7 +338,7 @@ public partial class FileRead : FileReaderHandler, ISMTP
        if (modelObjectParameterDefinitionJsonElement.ValueKind != JsonValueKind.Array)
            throw new Exception();
        IList<ModelObjectParameterDefinition> modelObjectParameters = JsonSerializer.Deserialize<IList<ModelObjectParameterDefinition>>(modelObjectParameterDefinitionJsonElement.ToString(), jsonSerializerOptions);
-        _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _StaticRuns, _UseCyclicalForDescription, isEAFHosted: false);
+        _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _StaticRuns, _UseCyclicalForDescription, connectionCount: null);
        results = _FileRead.ReExtract();
        if (results?.Item2 is null)
            throw new Exception();
--- a/MET08ANLYSDIFAAST230.csproj
+++ b/MET08ANLYSDIFAAST230.csproj
@ -158,7 +158,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Infineon.EAF.Runtime">
-      <Version>2.47.0</Version>
+      <Version>2.49.3</Version>
    </PackageReference>
    <PackageReference Include="System.Text.Json">
      <Version>6.0.3</Version>
--- 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.47.5.0")]
-[assembly: AssemblyFileVersion("2.47.5.0")]
+[assembly: AssemblyVersion("2.49.3.0")]
+[assembly: AssemblyFileVersion("2.49.3.0")]