From 63eef8a00de14c1db2aeff3e0245045bc7190865 Mon Sep 17 00:00:00 2001 From: Juraj Smiesko Date: Thu, 24 Nov 2022 15:57:51 +0100 Subject: [PATCH] Using detectors from FCCDetectors CI --- package.json | 4 ++++ src/app/detectors/fccee-cld/cld.component.ts | 2 +- src/app/detectors/fccee-idea/idea.component.ts | 6 +++++- src/app/detectors/fccee-nlq/nlq.component.ts | 4 ++-- .../detectors/fcchh-baseline/fcchh-baseline.component.ts | 4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a101b74..a16d502 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,10 @@ "ng": "ng", "start": "ng serve", "build": "ng build", + "build:prod": "ng build --base-href https://fccsw.web.cern.ch/fccsw/phoenix/", + "build:dev": "ng build --base-href https://fccsw.web.cern.ch/fccsw/phoenix-dev/", + "deploy:prod": "rsync -avh --delete dist/phoenix-at-fcc/ lxplus:/eos/project-f/fccsw-web/www/phoenix/", + "deploy:dev": "rsync -avh --delete dist/phoenix-at-fcc/ lxplus:/eos/project-f/fccsw-web/www/phoenix-dev/", "watch": "ng build --watch --configuration development", "test": "ng test" }, diff --git a/src/app/detectors/fccee-cld/cld.component.ts b/src/app/detectors/fccee-cld/cld.component.ts index 19e8e3e..df75344 100644 --- a/src/app/detectors/fccee-cld/cld.component.ts +++ b/src/app/detectors/fccee-cld/cld.component.ts @@ -83,7 +83,7 @@ export class CldComponent implements OnInit { // Load detector geometry (assuming the file exists in the `src/assets` directory of the app) this.eventDisplay.loadGLTFGeometry('https://fccsw.web.cern.ch/fccsw/detectors/fccee_cld.gltf', - 'CLD', + undefined, undefined, 1, true); diff --git a/src/app/detectors/fccee-idea/idea.component.ts b/src/app/detectors/fccee-idea/idea.component.ts index 9fdd551..75819cc 100644 --- a/src/app/detectors/fccee-idea/idea.component.ts +++ b/src/app/detectors/fccee-idea/idea.component.ts @@ -76,7 +76,11 @@ export class IdeaComponent implements OnInit { this.eventDisplay.init(configuration); // Load detector geometry (assuming the file exists in the `src/assets` directory of the app) - this.eventDisplay.loadGLTFGeometry('assets/detectors/fccee_idea_calo.gltf', 'IDEA'); + this.eventDisplay.loadGLTFGeometry('https://fccsw.web.cern.ch/fccsw/detectors/fccee_idea.gltf', + undefined, + undefined, + 1, + true); this.eventDisplay .getLoadingManager() .addProgressListener((progress) => (this.loadingProgress = progress)); diff --git a/src/app/detectors/fccee-nlq/nlq.component.ts b/src/app/detectors/fccee-nlq/nlq.component.ts index 7c53bac..da3db59 100644 --- a/src/app/detectors/fccee-nlq/nlq.component.ts +++ b/src/app/detectors/fccee-nlq/nlq.component.ts @@ -82,8 +82,8 @@ export class NlqComponent implements OnInit { this.eventDisplay.init(configuration); // Load detector geometry (assuming the file exists in the `src/assets` directory of the app) - this.eventDisplay.loadGLTFGeometry('assets/detectors/fccee_nlq.gltf', - 'NLQ', + this.eventDisplay.loadGLTFGeometry('https://fccsw.web.cern.ch/fccsw/detectors/fccee_nlq.gltf', + undefined, undefined, 1, true); diff --git a/src/app/detectors/fcchh-baseline/fcchh-baseline.component.ts b/src/app/detectors/fcchh-baseline/fcchh-baseline.component.ts index 3fd86a3..32ccf02 100644 --- a/src/app/detectors/fcchh-baseline/fcchh-baseline.component.ts +++ b/src/app/detectors/fcchh-baseline/fcchh-baseline.component.ts @@ -82,8 +82,8 @@ export class FcchhBaselineComponent implements OnInit { this.eventDisplay.init(configuration); // Load detector geometry (assuming the file exists in the `src/assets` directory of the app) - this.eventDisplay.loadGLTFGeometry('assets/detectors/fcchh_baseline.gltf', - 'FCChh baseline', + this.eventDisplay.loadGLTFGeometry('https://fccsw.web.cern.ch/fccsw/detectors/fcchh_baseline.gltf', + undefined, undefined, 1, true);