lhcb-ntuple-wizard-test 2.2.1 → 2.2.3

package/dist/models/dtt.js

@@ -17,14 +17,15 @@ export default class Dtt {
     static formatToolsForLoading(tools, toolMetadata) {
         return Object.fromEntries(tools
             .map((toolConfig) => {
-            const toolClass = Object.keys(toolConfig)[0];
-            const params = toolConfig[toolClass];
+            const toolString = Object.keys(toolConfig)[0];
+            const params = toolConfig[toolString];
+            const toolClass = toolString.split("/")[0];
             const toolInterface = toolMetadata[toolClass]?.interface;
             if (!toolInterface) {
                 return null;
             }
             return [
-                toolClass,
+                toolString,
                 Object.fromEntries(Object.entries(params)
                     .map(([paramName, value]) => {
                     const paramMetadata = toolInterface.find((param) => param.name === paramName);
@@ -40,7 +41,8 @@ export default class Dtt {
     }
     static fromSavedConfig(savedConfig, toolMetadata) {
         const config = {
-            ...savedConfig,
+            input: savedConfig.inputs?.length ? savedConfig.inputs[0] : undefined,
+            descriptorTemplate: savedConfig.descriptorTemplate,
             tools: Dtt.formatToolsForLoading(savedConfig.tools, toolMetadata),
             branches: Object.fromEntries(Object.entries(savedConfig.branches).map(([branchId, branchConfig]) => [
                 branchId,
@@ -56,12 +58,14 @@ export default class Dtt {
                     tools: Dtt.formatToolsForLoading(groupConfig.tools, toolMetadata),
                 },
             ])),
+            name: savedConfig.name,
         };
         return new Dtt(config, {});
     }
     toSavedConfig() {
         return {
-            ...this.config,
+            inputs: this.config.input ? [this.config.input] : undefined,
+            descriptorTemplate: this.config.descriptorTemplate,
             tools: Dtt.formatToolsForSaving(this.config.tools),
             branches: Object.fromEntries(Object.entries(this.config.branches).map(([branchId, branchConfig]) => [
                 branchId,
@@ -77,6 +81,7 @@ export default class Dtt {
                     tools: Dtt.formatToolsForSaving(groupConfig.tools),
                 },
             ])),
+            name: this.config.name,
         };
     }
     static getBranchConfigs(branchItemsList) {

package/dist/tests/models/Dtt.test.js

@@ -1,5 +1,9 @@
 import { describe, expect, it } from "vitest";
+import yaml from "js-yaml";
 import Dtt from "../../models/dtt";
+// @ts-expect-error this fixture import shows an error for some reason
+// but doesn't cause any problems in practice
+import fixtureYaml from "../fixtures/example_dtt.yaml?raw";
 import { TupleTool } from "../../models/tupleTool";
 import { mockBranchItems, mockToolMetadata } from "../testUtils";
 const DEFAULT_TOOLS = [
@@ -374,3 +378,140 @@ describe("Dtt", () => {
         });
     });
 });
+// ---------------------------------------------------------------------------
+// Fixture-based tests
+// ---------------------------------------------------------------------------
+const fixtureParsed = yaml.load(fixtureYaml);
+const fixtureToolMetadata = {
+    TupleToolKinematic: {
+        description: "",
+        documentation: "",
+        tags: [],
+        interface: [
+            { name: "ExtraName", type: "str", cpp_type: "std::string", default: "", description: "" },
+            { name: "Verbose", type: "bool", cpp_type: "bool", default: false, description: "" },
+            { name: "MaxPV", type: "uint", cpp_type: "unsigned int", default: 100, description: "" },
+            {
+                name: "Transporter",
+                type: "str",
+                cpp_type: "std::string",
+                default: "ParticleTransporter:PUBLIC",
+                description: "",
+            },
+        ],
+    },
+    TupleToolPid: {
+        description: "",
+        documentation: "",
+        tags: [],
+        interface: [
+            { name: "ExtraName", type: "str", cpp_type: "std::string", default: "", description: "" },
+            { name: "Verbose", type: "bool", cpp_type: "bool", default: false, description: "" },
+            { name: "MaxPV", type: "uint", cpp_type: "unsigned int", default: 100, description: "" },
+        ],
+    },
+    TupleToolANNPID: {
+        description: "",
+        documentation: "",
+        tags: [],
+        interface: [
+            { name: "ExtraName", type: "str", cpp_type: "std::string", default: "", description: "" },
+            { name: "Verbose", type: "bool", cpp_type: "bool", default: false, description: "" },
+            { name: "MaxPV", type: "uint", cpp_type: "unsigned int", default: 100, description: "" },
+            {
+                name: "ANNPIDTunes",
+                type: "text",
+                cpp_type: "std::vector<std::string>",
+                default: ["MC12TuneV2", "MC12TuneV3", "MC12TuneV4", "MC15TuneV1"],
+                description: "",
+            },
+            {
+                name: "PIDTypes",
+                type: "text",
+                cpp_type: "std::vector<std::string>",
+                default: ["Electron", "Muon", "Pion", "Kaon", "Proton", "Ghost"],
+                description: "",
+            },
+        ],
+    },
+    TupleToolAngles: {
+        description: "",
+        documentation: "",
+        tags: [],
+        interface: [
+            { name: "ExtraName", type: "str", cpp_type: "std::string", default: "", description: "" },
+            { name: "Verbose", type: "bool", cpp_type: "bool", default: false, description: "" },
+            { name: "MaxPV", type: "uint", cpp_type: "unsigned int", default: 100, description: "" },
+            { name: "WRTMother", type: "bool", cpp_type: "bool", default: false, description: "" },
+        ],
+    },
+    TupleToolCorrectedMass: {
+        description: "",
+        documentation: "",
+        tags: [],
+        interface: [
+            { name: "ExtraName", type: "str", cpp_type: "std::string", default: "", description: "" },
+            { name: "Verbose", type: "bool", cpp_type: "bool", default: false, description: "" },
+            { name: "MaxPV", type: "uint", cpp_type: "unsigned int", default: 100, description: "" },
+            { name: "MassInvisible", type: "float", cpp_type: "double", default: 0, description: "" },
+        ],
+    },
+};
+describe("fromSavedConfig() with fixture", () => {
+    let dtt;
+    dtt = Dtt.fromSavedConfig(fixtureParsed, fixtureToolMetadata);
+    it("loads the correct branch IDs and particle assignments", () => {
+        expect(Object.keys(dtt.config.branches).sort()).toEqual(["eminus", "eplus", "gamma"]);
+        expect(dtt.config.branches["gamma"].particle).toBe("gamma");
+        expect(dtt.config.branches["eplus"].particle).toBe("e+");
+        expect(dtt.config.branches["eminus"].particle).toBe("e-");
+    });
+    it("loads the descriptor template", () => {
+        expect(dtt.config.descriptorTemplate).toBe("${gamma}gamma -> ${eplus}e+ ${eminus}e-");
+    });
+    it("loads the name", () => {
+        expect(dtt.config.name).toBe("DecayTreeTuple/MyDecayTree0");
+    });
+    it("loads the input location", () => {
+        expect(dtt.config.input).toBe("/Event/Leptonic/Phys/BuToKJpsiee2Line/Particles");
+    });
+    it("loads global tools by class", () => {
+        expect(dtt.toolExists(TupleTool.fromString("TupleToolKinematic"))).toBe(true);
+        expect(dtt.toolExists(TupleTool.fromString("TupleToolPid"))).toBe(true);
+        expect(dtt.toolExists(TupleTool.fromString("TupleToolANNPID"))).toBe(true);
+    });
+    it("loads a named tool instance", () => {
+        expect(dtt.toolExists(TupleTool.fromString("TupleToolAngles/myNamedTool"))).toBe(true);
+    });
+    it("loads a modified string param (TupleToolPid ExtraName)", () => {
+        expect(dtt.config.tools["TupleToolPid"]["ExtraName"].value).toBe("myExtraName");
+    });
+    it("loads a string param (TupleToolKinematic Transporter)", () => {
+        expect(dtt.config.tools["TupleToolKinematic"]["Transporter"].value).toBe("ParticleTransporter:PUBLIC");
+    });
+    it("loads an array param (TupleToolANNPID ANNPIDTunes)", () => {
+        expect(dtt.config.tools["TupleToolANNPID"]["ANNPIDTunes"].value).toEqual([
+            "MC12TuneV2",
+            "MC12TuneV3",
+            "MC12TuneV4",
+            "MC15TuneV1",
+        ]);
+    });
+    it("loads a bool param on a named tool (TupleToolAngles/myNamedTool WRTMother)", () => {
+        expect(dtt.config.tools["TupleToolAngles/myNamedTool"]["WRTMother"].value).toBe(true);
+    });
+    it("loads the group key and its particle list", () => {
+        expect(dtt.config.groups["eminus,gamma"].particles).toEqual(["e-", "gamma"]);
+    });
+    it("loads the named group tool and its params", () => {
+        const groupTool = dtt.config.groups["eminus,gamma"].tools["TupleToolCorrectedMass/myGroupTool"];
+        expect(groupTool["MassInvisible"].value).toBe(0);
+        expect(groupTool["MaxPV"].value).toBe(100);
+    });
+});
+describe("toSavedConfig() roundtrip with fixture", () => {
+    it("fromSavedConfig -> toSavedConfig reproduces the fixture exactly", () => {
+        const dtt = Dtt.fromSavedConfig(fixtureParsed, fixtureToolMetadata);
+        expect(dtt.toSavedConfig()).toEqual(fixtureParsed);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lhcb-ntuple-wizard-test",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "An application to access large-scale open data from LHCb",
   "url": "https://gitlab.cern.ch/lhcb-dpa/wp6-analysis-preservation-and-open-data/lhcb-ntuple-wizard-frontend/issues",
   "private": false,
@@ -16,6 +16,7 @@
     ".": "./dist/index.js"
   },
   "dependencies": {
+    "@mathjax/src": "4.1.0",
     "bootstrap": "5.3.8",
     "cytoscape": "3.33.1",
     "cytoscape-dagre": "^2.5.0",
@@ -42,7 +43,7 @@
   },
   "overrides": {
     "autoprefixer": "10.4.5",
-    "@xmldom/xmldom": "0.9.9"
+    "@xmldom/xmldom": "0.9.10"
   },
   "scripts": {
     "start": "vite --open",
@@ -73,7 +74,6 @@
     "@babel/preset-react": "7.27.1",
     "@eslint/js": "^9.17.0",
     "@kennethwkz/unplugin-typia": "^2.6.7",
-    "@mathjax/src": "4.1.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",