Skip to content

Commit

Permalink
[ng] New simulated files, improved geometry
Browse files Browse the repository at this point in the history
  • Loading branch information
@DraTeots
DraTeots committed Jun 6, 2024
1 parent 29b281d commit 682dd17
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 93 deletions.
55 changes: 13 additions & 42 deletions firebird-ng/src/app/input-config/input-config.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,48 +50,19 @@ <h5 class="card-title">Events Source</h5>
<select class="form-control" [formControl]="selectedEventSource">
<option value="no-events">No events (may upload later)</option>
<option value="https://firebird-eic.org/dirc_event.json.zip">DIRC optical (load DIRC only geometry)</option>

<option value="https://firebird-eic.org/py8_all_dis-cc_beam-18x275_minq2-1000_nevt-5.evt.zip"> py8 (50MeV+) dis-CC_beam-18x275_minq2-1000_nevt-5</option>
<option value="https://firebird-eic.org/py8_all_dis-cc_beam-18x275_minq2-100_nevt-5.evt.zip"> py8 (50MeV+) dis-CC_beam-18x275_minq2-100_nevt-5</option>
<option value="https://firebird-eic.org/py8_all_dis-cc_beam-10x100_minq2-1000_nevt-5.evt.zip"> py8 (50MeV+) dis-CC_beam-10x100_minq2-1000_nevt-5</option>
<option value="https://firebird-eic.org/py8_all_dis-cc_beam-10x100_minq2-100_nevt-5.evt.zip"> py8 (50MeV+) dis-CC_beam-10x100_minq2-100_nevt-5</option>
<option value="https://firebird-eic.org/py8_all_dis-cc_beam-5x41_minq2-100_nevt-5.evt.zip"> py8 (50MeV+) dis-CC_beam-5x41_minq2-100_nevt-5</option>

<option value="https://firebird-eic.org/py8_all_dis-nc_beam-18x275_minq2-1000_nevt-5.evt.zip"> py8 (50MeV+) dis-nc_beam-18x275_minq2-1000_nevt-5</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-18x275_minq2-100_nevt-5.evt.zip"> py8 (50MeV+) dis-nc_beam-18x275_minq2-100_nevt-5</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-18x275_minq2-1_nevt-5.evt.zip"> py8 (50MeV+) dis-nc_beam-18x275_minq2-1_nevt-5</option>

<option value="https://firebird-eic.org/py8_all_dis-nc_beam-10x100_minq2-1000_nevt-5.evt.zip"> py8 (50MeV+) dis-nc_beam-10x100_minq2-1000_nevt-5</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-10x100_minq2-100_nevt-5.evt.zip"> py8 (50MeV+) dis-nc_beam-10x100_minq2-100_nevt-5</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-10x100_minq2-1_nevt-5.evt.zip"> py8 (50MeV+) dis-nc_beam-10x100_minq2-1_nevt-5</option>

<option value="https://firebird-eic.org/py8_all_dis-nc_beam-5x41_minq2-100_nevt-5.evt.zip"> py8 (50MeV+) dis-nc_beam-5x41_minq2-100_nevt-5</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-5x41_minq2-1_nevt-5.evt.zip"> py8 (50MeV+) dis-nc_beam-5x41_minq2-1_nevt-5</option>

<option value="https://firebird-eic.org/py8_all_dis-nc_beam-10x100_minq2-1000_nevt-10.evt.zip"> py8 (300MeV+) dis-nc_beam-10x100_minq2-1000_nevt-10</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-10x100_minq2-100_nevt-10.evt.zip"> py8 (300MeV+) dis-nc_beam-10x100_minq2-100_nevt-10</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-10x100_minq2-1_nevt-10.evt.zip"> py8 (300MeV+) dis-nc_beam-10x100_minq2-1_nevt-10</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-18x275_minq2-1_nevt-10.evt.zip"> py8 (300MeV+) dis-nc_beam-18x275_minq2-1_nevt-10</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-5x41_minq2-100_nevt-10.evt.zip"> py8 (300MeV+) dis-nc_beam-5x41_minq2-100_nevt-10</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-5x41_minq2-1_nevt-10.evt.zip"> py8 (300MeV+) dis-nc_beam-5x41_minq2-1_nevt-10</option>

<option value="https://firebird-eic.org/py8_all_dis-cc_beam-5x41_minq2-100_nevt-5.evt.json.zip">Pyth8 All(300MeV+) DIC-CC 5x41 minQ2-100 5 events</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-18x275_minq2-1000_nevt-5.evt.zip">Pyth8 All(200MeV+) DIC-NC 18x275 minQ2-1000 5 events</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-18x275_minq2-100_nevt-5.evt.zip">Pyth8 All(200MeV+) DIC-NC 18x275 minQ2-100 5 events</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-18x275_minq2-1_nevt-5.evt.zip">Pyth8 All(200MeV+) DIC-NC 18x275 minQ2-1 5 events</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-10x100_minq2-1000_nevt-5.evt.zip">Pyth8 All(200MeV+) DIC-NC 10x100 minQ2-1000 5 events</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-10x100_minq2-100_nevt-5.evt.zip">Pyth8 All(200MeV+) DIC-NC 10x100 minQ2-100 5 events</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-10x100_minq2-1_nevt-5.evt.zip">Pyth8 All(200MeV+) DIC-NC 10x100 minQ2-1 5 events</option>
<option value="https://firebird-eic.org/py8_all_dis-nc_beam-5x41_minq2-100_nevt-5.evt.zip">Pyth8 All(200MeV+) DIC-NC 5x41 minQ2-100 5 events</option>
<option value="assets/events/py8_dis-cc_beam-10x100_minq2-100_p-50mev_vtxcut-5m_nevt-10.evt.json"> (local) assets/events/py8_dis-cc_beam-10x100_minq2-100_p-50mev_vtxcut-5m_nevt-10.evt.json</option>

<option value="assets/events/py8_dis-cc_18x275_minq2-1000_minp-200mev_vtxcut-5m_nevt-10.evt.json">assets/events/py8_dis-cc_18x275_minq2-1000_minp-200mev_vtxcut-5m_nevt-10.evt.json</option>
<option value="assets/events/py8_dis-cc_all_minq2-100_minp-200mev_vtxcut-5m_nevt-40.evt.json">assets/events/py8_dis-cc_all_minq2-100_minp-200mev_vtxcut-5m_nevt-40.evt.json</option>
<option value="assets/events/py8_dis-cc_5x41_minq2-100_minp-200mev_vtxcut-5m_nevt-10.evt.json">assets/events/py8_dis-cc_5x41_minq2-100_minp-200mev_vtxcut-5m_nevt-10.evt.json</option>
<option value="assets/events/py8_dis-cc_10x100_minq2-100_minp-200mev_vtxcut-5m_nevt-10.evt.json">assets/events/py8_dis-cc_10x100_minq2-100_minp-200mev_vtxcut-5m_nevt-10.evt.json</option>
<option value="assets/events/py8_dis-cc_10x100_minq2-1000_minp-200mev_vtxcut-5m_nevt-10.evt.json">assets/events/py8_dis-cc_10x100_minq2-1000_minp-200mev_vtxcut-5m_nevt-10.evt.json</option>
<option value="assets/events/py8_dis-cc_18x275_minq2-100_minp-200mev_vtxcut-5m_nevt-10.evt.json">assets/events/py8_dis-cc_18x275_minq2-100_minp-200mev_vtxcut-5m_nevt-10.evt.json</option>

<option value="py8_dis-cc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-cc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-cc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-cc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-cc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-cc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-cc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-cc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-cc_all_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-cc_all_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-nc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-nc_10x100_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_10x100_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-nc_10x100_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_10x100_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-nc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-nc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-nc_18x275_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_18x275_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-nc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
<option value="py8_dis-nc_all_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_all_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
</select>
</div>
</div>
Expand Down
46 changes: 25 additions & 21 deletions firebird-ng/src/app/main-display/main-display.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,27 +513,7 @@ export class MainDisplayComponent implements OnInit {
// do something..
}
if ((e as KeyboardEvent).key === 'q') {
const name = `event_18x275_minq2_100_${Math.floor(Math.random() * 10)}`
console.log(name); // This will log a random index from 0 to 3

this.stopAnimation();
if(this.trackInfos) {
for (let trackInfo of this.trackInfos) {
trackInfo.trackNode.visible = false;
}
}

this._snackBar.open(" Charing!!! " + name, 'Dismiss', {
duration: 1000, // Duration in milliseconds after which the snack-bar will auto dismiss
horizontalPosition: 'right', // 'start' | 'center' | 'end' | 'left' | 'right'
verticalPosition: 'top', // 'top' | 'bottom'
});

this.animateEventAfterLoad = true;

let promise = new Promise<string>((resolve, reject) => {
this.eventDisplay.loadEvent(name);
});
this.nextRandomEvent();
}
console.log((e as KeyboardEvent).key);

Expand Down Expand Up @@ -698,4 +678,28 @@ export class MainDisplayComponent implements OnInit {
this.showGeometryGroup(this.currentGeometry);
}
}

private nextRandomEvent() {
const name = `event_18x275_minq2_100_${Math.floor(Math.random() * 10)}`
console.log(name); // This will log a random index from 0 to 3

this.stopAnimation();
if(this.trackInfos) {
for (let trackInfo of this.trackInfos) {
trackInfo.trackNode.visible = false;
}
}

this._snackBar.open(" Charing!!! " + name, 'Dismiss', {
duration: 1000, // Duration in milliseconds after which the snack-bar will auto dismiss
horizontalPosition: 'right', // 'start' | 'center' | 'end' | 'left' | 'right'
verticalPosition: 'top', // 'top' | 'bottom'
});

this.animateEventAfterLoad = true;

let promise = new Promise<string>((resolve, reject) => {
this.eventDisplay.loadEvent(name);
});
}
}
60 changes: 30 additions & 30 deletions firebird-ng/src/app/three-geometry.processor.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,40 +70,40 @@ export class ThreeGeometryProcessor {
names: ["FluxBarrel_env_25", "FluxEndcapP_26", "FluxEndcapN_28"],
rules: [
{
color: 0x999999,
color: 0x373766,

}
]
},
// {
// name: "EcalEndcapN*",
// rules: [
// {
// patterns: ["**/crystal_vol_0"],
// color: 0xffef8b,
// material: new THREE.MeshStandardMaterial({
// color: 0xffef8b,
// roughness: 0.7,
// metalness: 0.869,
// transparent: true,
// opacity: 0.8,
// side: THREE.DoubleSide
// })
// },
// {
// patterns: ["**/inner_support*", "**/ring*"],
// material: new THREE.MeshStandardMaterial({
// color: 0x19a5f5,
// roughness: 0.7,
// metalness: 0.869,
// transparent: true,
// opacity: 0.8,
// side: THREE.DoubleSide
// })
// }
//
// ]
// },
{
name: "EcalEndcapN*",
rules: [
{
patterns: ["**/crystal_vol_0"],
color: 0xffef8b,
material: new THREE.MeshStandardMaterial({
color: 0xffef8b,
roughness: 0.7,
metalness: 0.869,
transparent: true,
opacity: 0.8,
side: THREE.DoubleSide
})
},
{
patterns: ["**/inner_support*", "**/ring*"],
material: new THREE.MeshStandardMaterial({
color: 0x19a5f5,
roughness: 0.7,
metalness: 0.869,
transparent: true,
opacity: 0.8,
side: THREE.DoubleSide
})
}

]
},
{
name: "InnerTrackerSupport_assembly_13",
rules: [
Expand Down

0 comments on commit 682dd17

Please sign in to comment.