Using detectors from FCCDetectors CI

HEP-FCC · Nov 24, 2022 · 63eef8a · 63eef8a
1 parent 5079748
commit 63eef8a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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);