Skip to content

Commit 266d87f

Browse files
committed
Merge branch 'feature/real-data' into 'main'
Handle case of real data with no MCParticles See merge request belle2/software/display!14
2 parents e0284ca + c4a139a commit 266d87f

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

src/app/event-display/event-loader.ts

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,12 @@ export class EventLoader extends PhoenixLoader {
394394

395395
const file = await openFile(this.fileURL);
396396
const tree = await file.readObject(treeName);
397-
// this.branches = tree.fBranches.arr.map((branch: any) => branch.fName);
397+
const existingBranches = tree.fBranches.arr.map(
398+
(branch: any) => branch.fName
399+
);
400+
this.branches = this.branches.filter((branch: string) =>
401+
existingBranches.includes(branch)
402+
);
398403
this.entries = tree.fEntries;
399404

400405
// Use Promise.all and map to wait for all promises to resolve.
@@ -420,7 +425,10 @@ export class EventLoader extends PhoenixLoader {
420425
for (let j = 0; j < eventData['Tracks'].length; j++) {
421426
const trackFitIndex = eventData['Tracks'][j]['trackFitIndex'];
422427
const PIDIndex = eventData['TracksToPIDLikelihoods'][j];
423-
const MCParticleIndex = eventData['TracksToMCParticles'][j];
428+
let MCParticleIndex = -1;
429+
if ('TracksToMCParticles' in eventData) {
430+
MCParticleIndex = eventData['TracksToMCParticles'][j];
431+
}
424432
eventData['Tracks'][j] = {
425433
...eventData['Tracks'][j],
426434
pos: this.getTrackPos(
@@ -430,10 +438,12 @@ export class EventLoader extends PhoenixLoader {
430438
...eventData['PIDLikelihoods'][PIDIndex],
431439
MCParticleIndex
432440
};
433-
eventData['MCParticles'][MCParticleIndex] = {
434-
...eventData['MCParticles'][MCParticleIndex],
435-
trackIndex: j
436-
};
441+
if (MCParticleIndex >= 0) {
442+
eventData['MCParticles'][MCParticleIndex] = {
443+
...eventData['MCParticles'][MCParticleIndex],
444+
trackIndex: j
445+
};
446+
}
437447
}
438448
}
439449
// Save fileData by input the appropriate onHandleData function

src/loaders/event-data-loader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ export class Belle2Loader extends PhoenixLoader {
247247
'-321': 'K-',
248248
'-2212': 'anti-p-'
249249
};
250-
this.data?.MCParticles.forEach((particle: any, index: number) => {
250+
this.data?.MCParticles?.forEach((particle: any, index: number) => {
251251
if (particle?.seen !== '0' && particle?.seen?.length) {
252252
const groupName = this.getParticleGroup(particle.PDG);
253253
if (!collection.includes(groupName)) {

0 commit comments

Comments
 (0)