Skip to content

Commit

Permalink
feat(app): add atlas default config (#188)
Browse files Browse the repository at this point in the history 
Add atlas default config
  • Loading branch information
@9inpachi
9inpachi authored Dec 5, 2020
2 parents e5f4772 + 9c2f3e3 commit 64af067
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 10 deletions.
14 changes: 6 additions & 8 deletions packages/phoenix-ng/projects/phoenix-app/src/app/sections/atlas/atlas.component.ts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { Component, OnInit } from '@angular/core';
import { EventDisplayService } from 'phoenix-ui-components';
import { Configuration, PresetView, PhoenixMenuNode, PhoenixLoader } from 'phoenix-event-display';
import { Configuration, PresetView, PhoenixMenuNode, PhoenixLoader, StateManager } from 'phoenix-event-display';
import { environment } from '../../../environments/environment';
import eventConfig from '../../../../event-config.json';

// import the downloaded configuration from assets
import phoenixMenuConfig from '../../../assets/files/config/atlas-config.json';

@Component({
selector: 'app-atlas',
templateUrl: './atlas.component.html',
Expand Down Expand Up @@ -46,13 +49,6 @@ export class AtlasComponent implements OnInit {
// Initialize the event display
this.eventDisplay.init(configuration);

// // Load the JSON file containing event data
// this.http.get('assets/files/event_data/atlaseventdump2.json')
// .subscribe((res: any) => {
// // Parse the JSON to extract events and their data
// this.eventDisplay.parsePhoenixEvents(res);
// });

// Load detector geometries
this.eventDisplay
.loadOBJGeometry('assets/geometry/ATLAS/toroids.obj', 'Toroids', 0x8c8c8c, undefined, false, false);
Expand All @@ -73,6 +69,8 @@ export class AtlasComponent implements OnInit {

this.eventDisplay.getLoadingManager().addLoadListenerWithCheck(() => {
this.loaded = true;
const stateManager = new StateManager();
stateManager.loadStateFromJSON(phoenixMenuConfig);
});
}
}
1 change: 1 addition & 0 deletions packages/phoenix-ng/projects/phoenix-app/src/assets/files/config/atlas-config.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"phoenixMenu":{"name":"Phoenix Menu","nodeLevel":0,"toggleState":true,"childrenActive":true,"configs":[{"type":"button","label":"Save state"},{"type":"button","label":"Load state"}],"children":[{"name":"Detector","nodeLevel":1,"toggleState":true,"childrenActive":false,"configs":[{"type":"checkbox","label":"Wireframe","isChecked":false},{"type":"slider","label":"Opacity","min":0,"max":1,"step":0.01,"allowCustomValue":true},{"type":"slider","label":"Scale","min":0,"max":20,"step":0.01,"allowCustomValue":true}],"children":[{"name":"Toroids","nodeLevel":2,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#8c8c8c"},{"type":"slider","label":"Opacity","min":0,"max":1,"step":0.05,"allowCustomValue":true}],"children":[]},{"name":"TRT","nodeLevel":2,"toggleState":false,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#356aa5"},{"type":"slider","label":"Opacity","min":0,"max":1,"step":0.05,"allowCustomValue":true}],"children":[]},{"name":"SCT","nodeLevel":2,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#fff400"},{"type":"slider","label":"Opacity","min":0,"max":1,"step":0.05,"allowCustomValue":true}],"children":[]},{"name":"Pixel","nodeLevel":2,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#356aa5"},{"type":"slider","label":"Opacity","min":0,"max":1,"step":0.05,"allowCustomValue":true}],"children":[]},{"name":"LAr Barrel","nodeLevel":2,"toggleState":false,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#19ccd2"},{"type":"slider","label":"Opacity","min":0,"max":1,"step":0.05,"allowCustomValue":true}],"children":[]},{"name":"LAr EC1","nodeLevel":2,"toggleState":false,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#19ccd2"},{"type":"slider","label":"Opacity","min":0,"max":1,"step":0.05,"allowCustomValue":true}],"children":[]},{"name":"LAr EC2","nodeLevel":2,"toggleState":false,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#19ccd2"},{"type":"slider","label":"Opacity","min":0,"max":1,"step":0.05,"allowCustomValue":true}],"children":[]},{"name":"Tile Cal","nodeLevel":2,"toggleState":false,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#c14343"},{"type":"slider","label":"Opacity","min":0,"max":1,"step":0.05,"allowCustomValue":true}],"children":[]}]},{"name":"Event Data","nodeLevel":1,"toggleState":true,"childrenActive":false,"configs":[{"type":"checkbox","label":"Depth Test","isChecked":true}],"children":[{"name":"Tracks","nodeLevel":2,"toggleState":true,"childrenActive":true,"configs":[],"children":[{"name":"CombinedMuonTracks","nodeLevel":3,"toggleState":false,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#04ff00"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"𝛘2","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"DOF","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"pT","step":1,"min":0,"max":50}],"children":[]},{"name":"MuonSpectrometerTracks","nodeLevel":3,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#4000ff"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"𝛘2","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"DOF","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"pT","step":1,"min":0,"max":50}],"children":[]},{"name":"CombinedInDetTracks","nodeLevel":3,"toggleState":false,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#ff0000"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"𝛘2","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"DOF","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"pT","step":1,"min":0,"max":50}],"children":[]},{"name":"InDetTrackParticles_xAOD","nodeLevel":3,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#ff0000"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"𝛘2","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"DOF","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"pT","step":1,"min":0,"max":50}],"children":[]},{"name":"CombinedMuonTrackParticles_xAOD","nodeLevel":3,"toggleState":false,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#ff0000"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"𝛘2","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"DOF","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"pT","step":1,"min":0,"max":50}],"children":[]},{"name":"GSFTrackParticles_xAOD","nodeLevel":3,"toggleState":false,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#ff0000"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"𝛘2","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"DOF","step":1,"min":0,"max":100},{"type":"rangeSlider","label":"pT","step":1,"min":0,"max":50}],"children":[]}]},{"name":"Jets","nodeLevel":2,"toggleState":true,"childrenActive":true,"configs":[{"type":"slider","label":"Jets Size (%)","min":1,"max":200,"allowCustomValue":true}],"children":[{"name":"AntiKt4EMTopoJets_xAOD","nodeLevel":3,"toggleState":false,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#2194ce"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"ϕ","step":0.01,"min":-3.14,"max":3.14},{"type":"rangeSlider","label":"η","step":1,"min":-100,"max":100},{"type":"rangeSlider","label":"Energy","step":1,"min":0,"max":10000}],"children":[]},{"name":"AntiKt4LCTopoJets_xAOD","nodeLevel":3,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#2194ce"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"ϕ","step":0.01,"min":-3.14,"max":3.14},{"type":"rangeSlider","label":"η","step":1,"min":-100,"max":100},{"type":"rangeSlider","label":"Energy","step":1,"min":0,"max":10000}],"children":[]},{"name":"AntiKt10LCTopoJets_xAOD","nodeLevel":3,"toggleState":false,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#2194ce"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"ϕ","step":0.01,"min":-3.14,"max":3.14},{"type":"rangeSlider","label":"η","step":1,"min":-100,"max":100},{"type":"rangeSlider","label":"Energy","step":1,"min":0,"max":10000}],"children":[]}]},{"name":"Hits","nodeLevel":2,"toggleState":true,"childrenActive":false,"configs":[],"children":[{"name":"Pixel","nodeLevel":3,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#00ff33"}],"children":[]},{"name":"SCT","nodeLevel":3,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#ff00d4"}],"children":[]}]},{"name":"CaloClusters","nodeLevel":2,"toggleState":true,"childrenActive":false,"configs":[],"children":[{"name":"egammaClusters_xAOD","nodeLevel":3,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#ffd166"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"ϕ","step":0.01,"min":-3.14,"max":3.14},{"type":"rangeSlider","label":"η","step":1,"min":-100,"max":100},{"type":"rangeSlider","label":"Energy","step":1,"min":0,"max":10000}],"children":[]},{"name":"CaloCalTopoClusters","nodeLevel":3,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#ffd166"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"ϕ","step":0.01,"min":-3.14,"max":3.14},{"type":"rangeSlider","label":"η","step":1,"min":-100,"max":100},{"type":"rangeSlider","label":"Energy","step":1,"min":0,"max":10000}],"children":[]}]},{"name":"Muons","nodeLevel":2,"toggleState":true,"childrenActive":false,"configs":[],"children":[{"name":"Muons_xAOD","nodeLevel":3,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"ϕ","step":0.01,"min":-3.14,"max":3.14},{"type":"rangeSlider","label":"η","step":1,"min":-100,"max":100},{"type":"rangeSlider","label":"Energy","step":1,"min":0,"max":10000}],"children":[]},{"name":"Muons","nodeLevel":3,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"ϕ","step":0.01,"min":-3.14,"max":3.14},{"type":"rangeSlider","label":"η","step":1,"min":-100,"max":100},{"type":"rangeSlider","label":"Energy","step":1,"min":0,"max":10000}],"children":[]}]},{"name":"Vertices","nodeLevel":2,"toggleState":true,"childrenActive":false,"configs":[],"children":[{"name":"Vertices_xAOD","nodeLevel":3,"toggleState":true,"childrenActive":false,"configs":[{"type":"color","label":"Color","color":"#ffd166"},{"type":"label","label":"Cuts"},{"type":"button","label":"Reset cuts"},{"type":"rangeSlider","label":"vertexType","step":1,"min":0,"max":5}],"children":[]}]}]}]},"eventDisplay":{"cameraPosition":[4042.334238385789,4409.566719519168,2783.384234215022],"clippingAngle":90}}
14 changes: 12 additions & 2 deletions packages/phoenix-ng/projects/phoenix-ui-components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"dist"
],
"scripts": {
"prepublishOnly": "ng build phoenix-ui-components --prod"
"prepublishOnly": "node --eval \"console.error('ERROR: Trying to publish a package that has been compiled by NGCC. This is not allowed.\\nPlease delete and rebuild the package, without compiling with NGCC, before attempting to publish.\\nNote that NGCC may have been run by importing this package into another project that is being built with Ivy enabled.\\n')\" && exit 1",
"prepublishOnly__ivy_ngcc_bak": "ng build phoenix-ui-components --prod"
},
"peerDependencies": {
"@angular/cdk": "^10.1.3",
Expand All @@ -29,11 +30,20 @@
"tslib": "^2.0.0"
},
"main": "dist/bundles/phoenix-ui-components.umd.js",
"module_ivy_ngcc": "__ivy_ngcc__/dist/fesm2015/phoenix-ui-components.js",
"module": "dist/fesm2015/phoenix-ui-components.js",
"es2015_ivy_ngcc": "__ivy_ngcc__/dist/fesm2015/phoenix-ui-components.js",
"es2015": "dist/fesm2015/phoenix-ui-components.js",
"esm2015": "dist/esm2015/phoenix-ui-components.js",
"fesm2015_ivy_ngcc": "__ivy_ngcc__/dist/fesm2015/phoenix-ui-components.js",
"fesm2015": "dist/fesm2015/phoenix-ui-components.js",
"typings": "dist/phoenix-ui-components.d.ts",
"metadata": "dist/phoenix-ui-components.metadata.json",
"sideEffects": false
"sideEffects": false,
"__processed_by_ivy_ngcc__": {
"es2015": "10.0.14",
"fesm2015": "10.0.14",
"module": "10.0.14",
"typings": "10.0.14"
}
}

0 comments on commit 64af067

Please sign in to comment.