Skip to content

Commit

Permalink
Sources input fields now uniformly styled
Browse files Browse the repository at this point in the history
  • Loading branch information
@DraTeots
DraTeots committed Jul 27, 2024
1 parent 2dabfe3 commit d98606e
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 24 deletions.
2 changes: 1 addition & 1 deletion firebird-ng/src/app/geometry.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const ALL_GROUPS = [
]

// constants.ts
export const DEFAULT_GEOMETRY = 'epic-central-optimized';
export const DEFAULT_GEOMETRY = 'builtin://epic-central-optimized';

@Injectable({
providedIn: 'root'
Expand Down
30 changes: 9 additions & 21 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 @@ -20,32 +20,18 @@ <h5>Geometry</h5>
</div>
</div>



<h5>Trajectories Source</h5>
<div class="form-group">
<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_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="https://firebird-eic.org/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="https://firebird-eic.org/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="https://firebird-eic.org/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="https://firebird-eic.org/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="https://firebird-eic.org/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="https://firebird-eic.org/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="https://firebird-eic.org/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="https://firebird-eic.org/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="https://firebird-eic.org/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="https://firebird-eic.org/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="https://firebird-eic.org/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="https://firebird-eic.org/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 class="mt-4">
<h5>Trajectories Event Source</h5>
<div class="mt-4">
<firebird-resource-select #trajectorySelect [options]="trajectoryOptions" label="Trajectories event source file" class="full-width-field"></firebird-resource-select>
</div>
</div>
</div>

<div class="form-group">
<div class="mt-4">
<h5>EDM4EIC events</h5>
<h5>Edm4Eic Event Source</h5>
Select file with EDM4EIC data
<div class="mt-4">
<firebird-resource-select #edm4eicSelect [options]="edm4eicOptions" label="EDM4EIC file" class="full-width-field"></firebird-resource-select>
Expand Down Expand Up @@ -136,6 +122,8 @@ <h6 class="mb-0">API Port:</h6>
<button type="button" class="btn btn-lg btn-primary" [routerLink]="['/display']">DISPLAY</button>
</div>

<br><br>

<mat-accordion class="mt-4">
<mat-expansion-panel>
<mat-expansion-panel-header>
Expand Down
25 changes: 24 additions & 1 deletion firebird-ng/src/app/input-config/input-config.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ export class InputConfigComponent implements OnInit, AfterViewInit {
@ViewChild('edm4eicSelect')
edm4eicSelect!: ResourceSelectComponent;

@ViewChild('trajectorySelect')
trajectorySelect!: ResourceSelectComponent;


public geometryOptions: string[] = [
"builtin://epic-central-optimized",
Expand Down Expand Up @@ -78,6 +81,25 @@ export class InputConfigComponent implements OnInit, AfterViewInit {
"https://eic.github.io/epic/artifacts/tgeo/epic_zdc_sipm_on_tile_only.root"
];

public trajectoryOptions: string[] = [
"https://firebird-eic.org/dirc_event.json.zip",
"https://firebird-eic.org/py8_dis-cc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-cc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-cc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-cc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-cc_all_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-nc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-nc_10x100_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-nc_10x100_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-nc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-nc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-nc_18x275_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-nc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
"https://firebird-eic.org/py8_dis-nc_all_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
]



public edm4eicOptions: string[] = [
"",

Expand Down Expand Up @@ -109,14 +131,15 @@ export class InputConfigComponent implements OnInit, AfterViewInit {
// Now the 'geometrySelect' is available
this.bindConfigToControl(this.geometrySelect.value, this.configService.selectedGeometry);
this.bindConfigToControl(this.edm4eicSelect.value, this.configService.edm4eicEventSource);
this.bindConfigToControl(this.trajectorySelect.value, this.configService.trajectoryEventSource);
}

ngOnInit(): void {
//this.selectedGeometry.setValue(this.configService.selectedGeometry.value, { emitEvent: false })
//this.bindConfigToControl(this.geometryUrl, this.configService.selectedGeometry);


this.bindConfigToControl(this.selectedEventSource, this.configService.trajectoryEventSource);
//this.bindConfigToControl(this.selectedEventSource, this.configService.trajectoryEventSource);
this.bindConfigToControl(this.onlyCentralDetector, this.configService.onlyCentralDetector);
this.bindConfigToControl(this.serverUseApi, this.configService.localServerUseApi);
this.bindConfigToControl(this.serverApiHost, this.configService.localServerHost);
Expand Down
2 changes: 1 addition & 1 deletion pyrobird/src/pyrobird/__about__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# This file is part of Firebird Event Display and is licensed under the LGPLv3.
# See the LICENSE file in the project root for full license information.

__version__ = "0.1.5"
__version__ = "0.1.7"

0 comments on commit d98606e

Please sign in to comment.