From a20d2ea61e439b82c68cdb52957eab48af357b6d Mon Sep 17 00:00:00 2001 From: Anas Haddad Date: Thu, 18 Dec 2025 12:14:27 +0100 Subject: [PATCH 1/4] Repo path in package.json and README --- README.md | 2 +- package.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2a4414a..217f39b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Then, follow these commands: ```bash # Clone the repository using git clone. # (Adjust the URL if you're using a fork) -$ git clone git@github.com:haddadanas/Masterclass_UHH.git masterclass +$ git clone git@github.com:uhh-cms-tutorials/masterclasses.git $ cd masterclass/ # Installing Dependencies diff --git a/package.json b/package.json index aeadfc8..b673cc6 100644 --- a/package.json +++ b/package.json @@ -13,15 +13,15 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/haddadanas/Masterclass_UHH.git" + "url": "git+https://github.com/uhh-cms-tutorials/masterclasses" }, "author": "anas.haddad@uni-hamburg.de", "private": true, "license": "SEE LICENSE IN LICENSE", "bugs": { - "url": "https://github.com/haddadanas/Masterclass_UHH/issues" + "url": "https://github.com/uhh-cms-tutorials/masterclasses/issues" }, - "homepage": "https://github.com/haddadanas/Masterclass_UHH#readme", + "homepage": "https://github.com/uhh-cms-tutorials/masterclasses/#readme", "devDependencies": { "@types/bootstrap": "ts5.8", "@types/jquery": "^3.5.32", From 74bcc7e840a0cdffc62fe942476a89c6d57a8e83 Mon Sep 17 00:00:00 2001 From: Anas Haddad Date: Thu, 18 Dec 2025 12:39:06 +0100 Subject: [PATCH 2/4] added Help button to start page --- dist/assets/locales/de.json | 7 ++++--- dist/assets/locales/en.json | 7 ++++--- index.html | 7 ++++--- ts/controls.ts | 4 ++-- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dist/assets/locales/de.json b/dist/assets/locales/de.json index c071c09..b5389b7 100644 --- a/dist/assets/locales/de.json +++ b/dist/assets/locales/de.json @@ -38,7 +38,7 @@ "title": "Über uns", "description": "Die Masterclasses sind eintägige Workshops entwickelt vom Netzwerk Teilchenwelt für Schülerinnen und Schüler, um Ihnen einen Überblick in die Welt der Teilchenphysik, Datenanalyse zu geben, sowie erste Einblicke von der Forschung zu ermöglichen. Diese Software basiert auf dem Event-Display-Programm des CMS-Experiments am CERN. Sie wird in den Masterclasses verwendet, um Detektoraufnahmen von Proton-Proton-Kollisionen zu visualisieren. Ziel der Masterclass am Ende ist eine Massenbestimmung des Z- und Higgs-Bosons.", "sponsors": "Dieses Event-Display sowie die Masterclasses in Hamburg wurden durch folgende Institutionen ermöglicht:", - "github": "Der Quellcode ist auf GitHub verfügbar: ", + "github": "Der Quellcode ist auf GitHub verfügbar:", "origin": "Diese Software ist eine an Schüler und Schülerinnen angepasste Version des iSpy WebGL Event Displays für das CMS Experiment am CERN. Entwickelt wurde die Originalversion von F. Ali, L. Barnard, M. Hategan, S. Lee, C. Logrén, T. McCauley, P. Nguyen und M. Saunby.", "studyTitle": "Physikstudium an der Universität Hamburg", "studyText": "Interessierst du dich für ein Physikstudium? Warum nicht an der Universität Hamburg? 5 verschiedene Vertiefungsbereiche, große Vielfalt an Forschungsthemen, sowie das DESY-Forschungscampus in unmittelbarer Nähe. Hier findest du weitere Informationen dazu.", @@ -54,7 +54,8 @@ "links": "Nützliche Links und Physikangebote:", "start": "Event-Display starten", "impressum": "Impressum", - "contentresponsible": "Kontakt" + "contentresponsible": "Kontakt", + "help": "Hilfe und Anleitung kannst du über diesen Button oder oben rechts aufrufen:" }, "help": { "title": "Hilfe", @@ -134,4 +135,4 @@ "nSelected": "Gesamtzahl der Ereignisse, die die Auswahl in den geladenen Datei erfüllen.", "firstSelected": "Indizes der ersten 5 Ereignisse, die die Auswahl erfüllen" } -} +} \ No newline at end of file diff --git a/dist/assets/locales/en.json b/dist/assets/locales/en.json index 61e5083..6dd6521 100644 --- a/dist/assets/locales/en.json +++ b/dist/assets/locales/en.json @@ -38,7 +38,7 @@ "title": "About us", "description": "The masterclasses are one-day workshops developed by the Netzwerk Teilchenwelt for students, providing an overview of particle physics and data analysis, as well as initial insights into research. This software is based on the event display program of the CMS experiment at CERN. It is used in the masterclasses to visualize detector recordings of proton-proton collisions. The goal of the masterclass is to determine the mass of the Z and Higgs bosons.", "sponsors": "This Event-Display as well as the Masterclasses in Hamburg are made possible by the following institutions:", - "github": "The source code is available on GitHub: ", + "github": "The source code is available on GitHub:", "origin": "This software is a version of the iSpy WebGL event display for the CMS experiment at CERN, adapted for students. The original version was developed by F. Ali, L. Barnard, M. Hategan, S. Lee, C. Logrén, T. McCauley, P. Nguyen, and M. Saunby.", "studyTitle": "Study physics at the University of Hamburg", "studyText": "Are you interested in studying physics? Why not at the University of Hamburg? 5 different specialization fields, a wide variety of research topics, and the DESY research campus in close proximity. Here you can find more information about it.", @@ -54,7 +54,8 @@ "links": "Useful links and physics offers:", "start": "Start Event Display", "impressum": "Legal Notice", - "contentresponsible": "Contact" + "contentresponsible": "Contact", + "help": "Help and instructions can be accessed via this button or at the top right:" }, "help": { "title": "Help", @@ -134,4 +135,4 @@ "nSelected": "Total Number of events passing the selection within the loaded file.", "firstSelected": "Indices of the first 5 events passing the selection" } -} +} \ No newline at end of file diff --git a/index.html b/index.html index 8c7ffa3..bafbc5b 100644 --- a/index.html +++ b/index.html @@ -24,7 +24,7 @@
Masterclass @ Hamburg
- +
@@ -93,9 +93,10 @@

Masterclasses @ Hamburg

-

+

-

 uhh-cms-tutorials/masterclasses

+

 

+

  uhh-cms-tutorials/masterclasses


UHH LogoUHH LogoDESY Logo
Logos: () © UHH () © DESY

diff --git a/ts/controls.ts b/ts/controls.ts index d1361ca..229c52b 100644 --- a/ts/controls.ts +++ b/ts/controls.ts @@ -498,7 +498,7 @@ export function setupControls() { const jsCsvWp = getHTMLObject("js-csv-wp"); const jsCsvWm = getHTMLObject("js-csv-wm"); const jsAboutBtn = getHTMLObject("js-about-btn"); - const jsHelpBtn = getHTMLObject("js-help-btn"); + const jsHelpBtns = document.querySelectorAll(".js-btn-help"); const jsDisplayBtn = getHTMLObject("js-event-display"); const jsLangEN = getHTMLObject("js-lang-en"); const jsLangDE = getHTMLObject("js-lang-de"); @@ -524,7 +524,7 @@ export function setupControls() { // connect functions to the buttons jsStartBtn.addEventListener("click", () => switchMain("display")); jsAboutBtn.addEventListener("click", () => switchMain("about")); - jsHelpBtn.addEventListener("click", () => switchMain("help")); + jsHelpBtns.forEach(btn => btn.addEventListener("click", () => switchMain("help"))); jsDisplayBtn.addEventListener("click", () => switchMain("display")); jsLangEN.addEventListener("click", () => setLanguage("en")); From e2d0b3742a85f2d6a5029be4fedd81a71e3d696c Mon Sep 17 00:00:00 2001 From: Anas Haddad Date: Thu, 18 Dec 2025 12:41:25 +0100 Subject: [PATCH 3/4] version 3.1.2 --- package.json | 2 +- ts/config.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b673cc6..ae1d4d1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "masterclass-hamburg", "type": "module", - "version": "v3.1.1-HH", + "version": "v3.1.2-HH", "description": "A browser-based event display for the CMS experiment at the LHC, adjusted for the Masterclass in Hamburg.", "scripts": { "build": "tsc -p tsconfig.json && webpack --config webpack.config.js --mode production", diff --git a/ts/config.ts b/ts/config.ts index c93dd0d..f86e5c7 100644 --- a/ts/config.ts +++ b/ts/config.ts @@ -44,7 +44,7 @@ export { export const ispy: Ispy = { // Metadata and versioning - version: "v3.1.1-HH", + version: "v3.1.2-HH", lang: "en", event_list: [], ig_data: null, From 6dc61544b6c02063c1a630ea2c802c82707aa189 Mon Sep 17 00:00:00 2001 From: Anas <103462379+haddadanas@users.noreply.github.com> Date: Thu, 18 Dec 2025 12:47:40 +0100 Subject: [PATCH 4/4] Update README.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 217f39b..b048369 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Then, follow these commands: # Clone the repository using git clone. # (Adjust the URL if you're using a fork) $ git clone git@github.com:uhh-cms-tutorials/masterclasses.git -$ cd masterclass/ +$ cd masterclasses/ # Installing Dependencies $ npm update