Deploy preview for PR 25 🛫

key4hep · Jun 6, 2024 · afdb091 · afdb091
1 parent 212994f
commit afdb091
Show file tree

Hide file tree

Showing 10 changed files with 325 additions and 122 deletions.
diff --git a/...923358f7fe31a0e073b92765141e67fcb5579.idx → ...964a1e325ed338ecd63a990839efa6ecdd023.idx b/...923358f7fe31a0e073b92765141e67fcb5579.idx → ...964a1e325ed338ecd63a990839efa6ecdd023.idx
diff --git a/...23358f7fe31a0e073b92765141e67fcb5579.pack → ...64a1e325ed338ecd63a990839efa6ecdd023.pack b/...23358f7fe31a0e073b92765141e67fcb5579.pack → ...64a1e325ed338ecd63a990839efa6ecdd023.pack
diff --git a/...923358f7fe31a0e073b92765141e67fcb5579.rev → ...964a1e325ed338ecd63a990839efa6ecdd023.rev b/...923358f7fe31a0e073b92765141e67fcb5579.rev → ...964a1e325ed338ecd63a990839efa6ecdd023.rev
diff --git a/pr-preview/pr-25/js/types/dynamic.js b/pr-preview/pr-25/js/types/dynamic.js
@@ -0,0 +1,15 @@
+export function dynamicLoad(object, data, ignore = null) {
+  let filteredData = {};
+
+  if (ignore !== null) {
+    for (const key in data) {
+      if (!ignore.has(key)) filteredData[key] = data[key];
+    }
+  } else {
+    filteredData = data;
+  }
+
+  for (const [key, value] of Object.entries(filteredData)) {
+    object[key] = value;
+  }
+}
diff --git a/pr-preview/pr-25/js/types/load.js b/pr-preview/pr-25/js/types/load.js
@@ -1,21 +1,7 @@
 import jsonData from "../../input/wzp6_ee_mumuH_ecm240_CLD_RECO.edm4hep.json" assert { type: "json" }; // node 20
-import {
-  Cluster,
-  ParticleID,
-  ReconstructedParticle,
-  Vertex,
-  Track,
-} from "./reconstruction.js";
+import { types } from "./reconstruction.js";
 import { compatible } from "./version.js";
 
-const types = {
-  "Cluster": Cluster,
-  "ParticleID": ParticleID,
-  "ReconstructedParticle": ReconstructedParticle,
-  "Vertex": Vertex,
-  "Track": Track,
-};
-
 const loadersConfig = [
   "ReconstructedParticle",
   "ParticleID",
@@ -68,20 +54,4 @@ export function loadParticles(jsonData, event, loadersConfig) {
   return particles;
 }
 
-export function dynamicLoad(object, data, ignore = null) {
-  let filteredData = {};
-
-  if (ignore !== null) {
-    for (const key in data) {
-      if (!ignore.has(key)) filteredData[key] = data[key];
-    }
-  } else {
-    filteredData = data;
-  }
-
-  for (const [key, value] of Object.entries(filteredData)) {
-    object[key] = value;
-  }
-}
-
 loadParticles(jsonData, 0, loadersConfig);
diff --git a/pr-preview/pr-25/js/types/reconstruction.js b/pr-preview/pr-25/js/types/reconstruction.js
@@ -1,4 +1,4 @@
-import { dynamicLoad } from "./load.js";
+import { dynamicLoad } from "./dynamic.js";
 
 export class Cluster {
   static MIN_VERSION = "0.7.0"; // may vary per type of particle
@@ -46,7 +46,7 @@ export class ParticleID {
   constructor() {
     // Physics properties
     this.type = 0;
-    this.pdg = 0;
+    this.PDG = 0;
     this.algorithmType = 0;
     this.likelihood = 0;
     this.parameters = [];
@@ -78,7 +78,7 @@ export class ReconstructedParticle {
 
   constructor() {
     // Physics properties
-    this.pdg = 0;
+    this.PDG = 0;
     this.energy = 0; // GeV
     this.momentum = {}; // GeV
     this.referencePoint = {}; // mm
@@ -213,7 +213,7 @@ export class GenericLink {
   }
 }
 
-function createLinksManager(types) {
+export function createLinksManager(types) {
   const links = {};
   types.forEach((type) => (links[type] = []));
   return links;
@@ -225,7 +225,12 @@ export function createGenericLink(id, from, { collectionID, index }) {
   return genericLink;
 }
 
-function extractOneToManyLinks(linksManager, keys, newParticle, particleData) {
+export function extractOneToManyLinks(
+  linksManager,
+  keys,
+  newParticle,
+  particleData
+) {
   for (const key of keys) {
     particleData[key].map((val) => {
       const link = createGenericLink(
@@ -239,7 +244,12 @@ function extractOneToManyLinks(linksManager, keys, newParticle, particleData) {
   }
 }
 
-function extractOneToOneLink(linksManager, key, newParticle, particleData) {
+export function extractOneToOneLink(
+  linksManager,
+  key,
+  newParticle,
+  particleData
+) {
   const link = createGenericLink(
     linksManager[key].length,
     newParticle.index,
@@ -248,3 +258,11 @@ function extractOneToOneLink(linksManager, key, newParticle, particleData) {
   linksManager[key].push(link);
   newParticle[key] = link.id;
 }
+
+export const types = {
+  "Cluster": Cluster,
+  "ParticleID": ParticleID,
+  "ReconstructedParticle": ReconstructedParticle,
+  "Vertex": Vertex,
+  "Track": Track,
+};
diff --git a/pr-preview/pr-25/js/types/version.js b/pr-preview/pr-25/js/types/version.js
@@ -12,18 +12,18 @@ export class Version {
 
   greaterOrEqualThan(version) {
     return (
-      this.major >= version.major ||
+      this.major > version.major ||
       (this.major === version.major &&
-        (this.minor >= version.minor ||
+        (this.minor > version.minor ||
           (this.minor === version.minor && this.patch >= version.patch)))
     );
   }
 
   lessOrEqualThan(version) {
     return (
-      this.major <= version.major ||
+      this.major < version.major ||
       (this.major === version.major &&
-        (this.minor <= version.minor ||
+        (this.minor < version.minor ||
           (this.minor === version.minor && this.patch <= version.patch)))
     );
   }