Skip to content

Commit

Permalink
chore(release): v1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@EdwardMoyse
EdwardMoyse committed Apr 21, 2021
1 parent ad7d5aa commit 02440e9
Show file tree
Hide file tree
Showing 28 changed files with 582,294 additions and 582,154 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.7.0](https://github.com/EdwardMoyse/phoenix/compare/v1.6.1...v1.7.0) (2021-04-21)


### Bug Fixes

* **event-display:** attempt to improve the output of the track extension by removing close hits ([5bdc562](https://github.com/EdwardMoyse/phoenix/commit/5bdc5623a2c4ef01a97143d12d9c396dbc57cfa3))
* **event-display:** fix drawing of hits ([db3ca8b](https://github.com/EdwardMoyse/phoenix/commit/db3ca8b671bf2fa6bdf2831b8b5641cff74cf5a8))
* **event-display:** handle older json hit format again ([edcd567](https://github.com/EdwardMoyse/phoenix/commit/edcd56770fcb865d39592cb3f4d130cd26b3919a))


### Features

* **app:** option for custom import handlers ([99b161e](https://github.com/EdwardMoyse/phoenix/commit/99b161e76109fb2b99031a35ac72fbe31596f44b))
* **app:** support for importing with LHCb loader ([8c6bd89](https://github.com/EdwardMoyse/phoenix/commit/8c6bd89bafcd3f4123365f36f36f49d83f4352d8))





## [1.6.1](https://github.com/HSF/phoenix/compare/v1.6.0...v1.6.1) (2021-04-19)


Expand Down
4 changes: 2 additions & 2 deletions docs/404.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

<style type="text/css">@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialicons/v85/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff) format('woff');}.material-icons{font-family:'Material Icons';font-weight:normal;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr;font-feature-settings:'liga';}@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialicons/v85/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.woff2) format('woff2');}.material-icons{font-family:'Material Icons';font-weight:normal;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr;-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased;}</style>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="styles.3d69844cadba7fd266f7.css"></head>
<link rel="stylesheet" href="styles.3d196e581cea5d380e4f.css"></head>

<body>
<app-root></app-root>
<script src="runtime-es2015.b73667a77b6a42c08f57.js" type="module"></script><script src="runtime-es5.b73667a77b6a42c08f57.js" nomodule="" defer=""></script><script src="polyfills-es5.d39fb216a403d8ed7222.js" nomodule="" defer=""></script><script src="polyfills-es2015.549c53ab715c2582fc0b.js" type="module"></script><script src="main-es2015.9786eda552b0b489ee87.js" type="module"></script><script src="main-es5.9786eda552b0b489ee87.js" nomodule="" defer=""></script></body>
<script src="runtime-es2015.b73667a77b6a42c08f57.js" type="module"></script><script src="runtime-es5.b73667a77b6a42c08f57.js" nomodule="" defer=""></script><script src="polyfills-es5.d39fb216a403d8ed7222.js" nomodule="" defer=""></script><script src="polyfills-es2015.549c53ab715c2582fc0b.js" type="module"></script><script src="main-es2015.7f8fefc9c54d23b9967f.js" type="module"></script><script src="main-es5.7f8fefc9c54d23b9967f.js" nomodule="" defer=""></script></body>
</html>
19 changes: 13 additions & 6 deletions docs/api-docs/changelog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,16 @@
<h1 id="change-log">Change Log</h1>
<p>All notable changes to this project will be documented in this file.
See <a href="https://conventionalcommits.org">Conventional Commits</a> for commit guidelines.</p>
<h1 id="160-2021-04-18"><a href="https://github.com/HSF/phoenix/compare/v1.5.0...v1.6.0">1.6.0</a> (2021-04-18)</h1>
<h1 id="170-2021-04-21"><a href="https://github.com/HSF/phoenix/compare/v1.6.1...v1.7.0">1.7.0</a> (2021-04-21)</h1>
<h3 id="bug-fixes">Bug Fixes</h3>
<ul>
<li><strong>event-display:</strong> attempt to improve the output of the track extension by removing close hits (<a href="https://github.com/HSF/phoenix/commit/5bdc5623a2c4ef01a97143d12d9c396dbc57cfa3">5bdc562</a>)</li>
<li><strong>event-display:</strong> fix drawing of hits (<a href="https://github.com/HSF/phoenix/commit/db3ca8b671bf2fa6bdf2831b8b5641cff74cf5a8">db3ca8b</a>)</li>
<li><strong>event-display:</strong> handle older json hit format again (<a href="https://github.com/HSF/phoenix/commit/edcd56770fcb865d39592cb3f4d130cd26b3919a">edcd567</a>)</li>
</ul>
<h1 id="160-2021-04-18"><a href="https://github.com/HSF/phoenix/compare/v1.5.0...v1.6.0">1.6.0</a> (2021-04-18)</h1>
<h3 id="bug-fixes-1">Bug Fixes</h3>
<ul>
<li><strong>app:</strong> add sphericalToCartesian method (<a href="https://github.com/HSF/phoenix/commit/bbea6b03023cc56b5572684ec3cfaeb8cf3f0e7f">bbea6b0</a>)</li>
<li><strong>event-display:</strong> add back in geometrical limits for clusters (<a href="https://github.com/HSF/phoenix/commit/0b95e5b9263442df35f0af6f88694e7e5ee90e90">0b95e5b</a>)</li>
<li><strong>event-display:</strong> add eta and phi cuts for tracks (<a href="https://github.com/HSF/phoenix/commit/f8a0080b3ddd8ca79ff49ae1aa1faab66b6b4e56">f8a0080</a>)</li>
Expand Down Expand Up @@ -81,7 +88,7 @@ <h3 id="features">Features</h3>
<li>upgrade three.js except for CMSObjects (<a href="https://github.com/HSF/phoenix/commit/0b2dd8a8860ed49feb16a247b52aa0b21452a251">0b2dd8a</a>)</li>
</ul>
<h1 id="150-2021-03-24"><a href="https://github.com/HSF/phoenix/compare/v1.4.1...v1.5.0">1.5.0</a> (2021-03-24)</h1>
<h3 id="bug-fixes-1">Bug Fixes</h3>
<h3 id="bug-fixes-2">Bug Fixes</h3>
<ul>
<li><strong>event-display:</strong> catch VR request session error (<a href="https://github.com/HSF/phoenix/commit/d2874b8aed6f0647f5ccb11bfade1f9c1bc1f29c">d2874b8</a>)</li>
<li><strong>event-display:</strong> fix jsroot loading root file (<a href="https://github.com/HSF/phoenix/commit/8cbcaa5d2e4ba89940d65d217e302e7500305641">8cbcaa5</a>)</li>
Expand All @@ -102,7 +109,7 @@ <h3 id="features-1">Features</h3>
<li><strong>event-display:</strong> use latest version of JSROOT (<a href="https://github.com/HSF/phoenix/commit/fbd584edb3dbfd436cdbe18a876c59ec05e43aa4">fbd584e</a>)</li>
</ul>
<h1 id="140-2021-02-16"><a href="https://github.com/HSF/phoenix/compare/v1.3.0...v1.4.0">1.4.0</a> (2021-02-16)</h1>
<h3 id="bug-fixes-2">Bug Fixes</h3>
<h3 id="bug-fixes-3">Bug Fixes</h3>
<ul>
<li><strong>event-display:</strong> disable keyboard controls when typing (<a href="https://github.com/HSF/phoenix/commit/4f80bd6c972f2e1291bc62015870ac9b08c077ef">4f80bd6</a>)</li>
<li><strong>event-display:</strong> improve object selection from uuid and label input (<a href="https://github.com/HSF/phoenix/commit/3475836eacca1485f6dddab8dc049bbb605a5e27">3475836</a>)</li>
Expand Down Expand Up @@ -131,7 +138,7 @@ <h3 id="features-2">Features</h3>
<li>Update Angular and all packages to latest (<a href="https://github.com/HSF/phoenix/commit/f4c2e31207e890436a6387e2e34ef31e3d0c48a6">f4c2e31</a>)</li>
</ul>
<h1 id="130-2021-01-16"><a href="https://github.com/HSF/phoenix/compare/v1.2.0...v1.3.0">1.3.0</a> (2021-01-16)</h1>
<h3 id="bug-fixes-3">Bug Fixes</h3>
<h3 id="bug-fixes-4">Bug Fixes</h3>
<ul>
<li><strong>event-display:</strong> assign the right name to geometry (<a href="https://github.com/HSF/phoenix/commit/b7e8da002548255b0c996ebc91a06918b5819281">b7e8da0</a>)</li>
<li><strong>event-display:</strong> code improvements (<a href="https://github.com/HSF/phoenix/commit/f94c0e40384ee95f22ba1a92938cf124a6d89a31">f94c0e4</a>)</li>
Expand All @@ -148,7 +155,7 @@ <h3 id="features-3">Features</h3>
<li><strong>event-display:</strong> hide tube tracks on zoom (<a href="https://github.com/HSF/phoenix/commit/7d606b29214e9f080266ad13502fa1092605a00f">7d606b2</a>)</li>
</ul>
<h1 id="120-2020-12-06"><a href="https://github.com/HSF/phoenix/compare/v1.1.0...v1.2.0">1.2.0</a> (2020-12-06)</h1>
<h3 id="bug-fixes-4">Bug Fixes</h3>
<h3 id="bug-fixes-5">Bug Fixes</h3>
<ul>
<li><strong>event-display:</strong> add Edward&#39;s controller set up (<a href="https://github.com/HSF/phoenix/commit/a6a1c19d696aff6e6c239fef76dcd3c24f4897a1">a6a1c19</a>)</li>
<li><strong>event-display:</strong> changes to animation loop for VR (<a href="https://github.com/HSF/phoenix/commit/37df19f17b0f6d37229e95dacf295e388dcefbd1">37df19f</a>)</li>
Expand Down Expand Up @@ -181,7 +188,7 @@ <h3 id="features-4">Features</h3>
<li><strong>event-display:</strong> use object to simplify configuration (<a href="https://github.com/HSF/phoenix/commit/4b10452a80aed8e67ddac5d550cc9fd15383bad3">4b10452</a>)</li>
</ul>
<h1 id="110-2020-11-07"><a href="https://github.com/HSF/phoenix/compare/v1.0.2...v1.1.0">1.1.0</a> (2020-11-07)</h1>
<h3 id="bug-fixes-5">Bug Fixes</h3>
<h3 id="bug-fixes-6">Bug Fixes</h3>
<ul>
<li><strong>app:</strong> cut filter failed if value return was zero (<a href="https://github.com/HSF/phoenix/commit/0a26fea050358e0444f6f257b74e9616ce2d0a91">0a26fea</a>)</li>
<li><strong>app:</strong> cut should be pT, not mom (<a href="https://github.com/HSF/phoenix/commit/73b7c2709bf829516d94e4cf7e90c96b0016fdaf">73b7c27</a>)</li>
Expand Down
114 changes: 76 additions & 38 deletions docs/api-docs/classes/JiveXMLLoader.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,8 +605,8 @@ <h3 id="methods">

<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="523"
class="link-to-prism">src/loaders/jivexml-loader.ts:523</a></div>
<div class="io-line">Defined in <a href="" data-line="561"
class="link-to-prism">src/loaders/jivexml-loader.ts:561</a></div>
</td>
</tr>

Expand Down Expand Up @@ -700,8 +700,8 @@ <h3 id="methods">

<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="675"
class="link-to-prism">src/loaders/jivexml-loader.ts:675</a></div>
<div class="io-line">Defined in <a href="" data-line="713"
class="link-to-prism">src/loaders/jivexml-loader.ts:713</a></div>
</td>
</tr>

Expand Down Expand Up @@ -844,8 +844,8 @@ <h3 id="methods">

<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="489"
class="link-to-prism">src/loaders/jivexml-loader.ts:489</a></div>
<div class="io-line">Defined in <a href="" data-line="527"
class="link-to-prism">src/loaders/jivexml-loader.ts:527</a></div>
</td>
</tr>

Expand Down Expand Up @@ -939,8 +939,8 @@ <h3 id="methods">

<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="733"
class="link-to-prism">src/loaders/jivexml-loader.ts:733</a></div>
<div class="io-line">Defined in <a href="" data-line="771"
class="link-to-prism">src/loaders/jivexml-loader.ts:771</a></div>
</td>
</tr>

Expand Down Expand Up @@ -1034,8 +1034,8 @@ <h3 id="methods">

<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="434"
class="link-to-prism">src/loaders/jivexml-loader.ts:434</a></div>
<div class="io-line">Defined in <a href="" data-line="472"
class="link-to-prism">src/loaders/jivexml-loader.ts:472</a></div>
</td>
</tr>

Expand Down Expand Up @@ -1145,8 +1145,8 @@ <h3 id="methods">

<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="646"
class="link-to-prism">src/loaders/jivexml-loader.ts:646</a></div>
<div class="io-line">Defined in <a href="" data-line="684"
class="link-to-prism">src/loaders/jivexml-loader.ts:684</a></div>
</td>
</tr>

Expand Down Expand Up @@ -1336,8 +1336,8 @@ <h3 id="methods">

<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="704"
class="link-to-prism">src/loaders/jivexml-loader.ts:704</a></div>
<div class="io-line">Defined in <a href="" data-line="742"
class="link-to-prism">src/loaders/jivexml-loader.ts:742</a></div>
</td>
</tr>

Expand Down Expand Up @@ -1431,8 +1431,8 @@ <h3 id="methods">

<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="296"
class="link-to-prism">src/loaders/jivexml-loader.ts:296</a></div>
<div class="io-line">Defined in <a href="" data-line="334"
class="link-to-prism">src/loaders/jivexml-loader.ts:334</a></div>
</td>
</tr>

Expand Down Expand Up @@ -1621,8 +1621,8 @@ <h3 id="methods">

<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="325"
class="link-to-prism">src/loaders/jivexml-loader.ts:325</a></div>
<div class="io-line">Defined in <a href="" data-line="363"
class="link-to-prism">src/loaders/jivexml-loader.ts:363</a></div>
</td>
</tr>

Expand Down Expand Up @@ -1907,8 +1907,8 @@ <h3 id="methods">

<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="360"
class="link-to-prism">src/loaders/jivexml-loader.ts:360</a></div>
<div class="io-line">Defined in <a href="" data-line="398"
class="link-to-prism">src/loaders/jivexml-loader.ts:398</a></div>
</td>
</tr>

Expand Down Expand Up @@ -2002,8 +2002,8 @@ <h3 id="methods">

<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="551"
class="link-to-prism">src/loaders/jivexml-loader.ts:551</a></div>
<div class="io-line">Defined in <a href="" data-line="589"
class="link-to-prism">src/loaders/jivexml-loader.ts:589</a></div>
</td>
</tr>

Expand Down Expand Up @@ -3596,25 +3596,63 @@ <h3 id="methods">
polylineCounter +&#x3D; numPolyline[i];
track.pos &#x3D; pos;
}
// Now loop over hits, and if possible, see if we can extend the track
if (numHits.length &gt; 0) {
let hitIdentifier &#x3D; 0;
let distance &#x3D; 0.0;
let found &#x3D; false;
for (let p &#x3D; 0; p &lt; numHits[i]; p++) {
hitIdentifier &#x3D; hits[hitsCounter + p];
listOfHits.push(hitIdentifier);
// Now try to find matching hit
[found, x, y, z] &#x3D; this.getPositionOfHit(hitIdentifier, eventData);
if (found) {
distance &#x3D; Math.sqrt(x * x + y * y + z * z);
if (distance &gt; maxR) {
track.pos.push([x, y, z]);
if (trackCollectionName.includes(&#x27;Muon&#x27;)) {
// Only try this for Muons at the moment.

// Now loop over hits, and if possible, see if we can extend the track
let measurementPositions &#x3D; [];
if (numHits.length &gt; 0) {
let hitIdentifier &#x3D; 0;
let distance &#x3D; 0.0;
let found &#x3D; false;
for (let p &#x3D; 0; p &lt; numHits[i]; p++) {
hitIdentifier &#x3D; hits[hitsCounter + p];
listOfHits.push(hitIdentifier);
// Now try to find matching hit
[found, x, y, z] &#x3D; this.getPositionOfHit(
hitIdentifier,
eventData
);
if (found) {
distance &#x3D; Math.sqrt(x * x + y * y + z * z);
if (distance &gt; maxR) {
measurementPositions.push([x, y, z, distance]);
}
}
}
hitsCounter +&#x3D; numHits[i];
track.hits &#x3D; listOfHits;
}
hitsCounter +&#x3D; numHits[i];
track.hits &#x3D; listOfHits;

// This seems to give pretty poor results, so try to filter.
// Sort radially (sorry cosmics!)
let sortedMeasurements &#x3D; measurementPositions.sort(
(a, b) &#x3D;&gt; a[3] - b[3]
);
const minDelta &#x3D; 250; // tweaked by trial and error
let newHitCount &#x3D; 0;
let rejectedHitCount &#x3D; 0;
let lastDistance &#x3D; maxR + minDelta;
if (sortedMeasurements.length) {
for (let meas of sortedMeasurements) {
if (meas[3] &gt; lastDistance + minDelta) {
track.pos.push([meas[0], meas[1], meas[2]]);
lastDistance &#x3D; meas[3] + minDelta;
newHitCount++;
} else {
rejectedHitCount++;
}
}
}
console.log(
&#x27;Added &#x27; +
newHitCount +
&#x27; hits to &#x27; +
trackCollectionName +
&#x27; (and rejected &#x27; +
rejectedHitCount +
&#x27;)&#x27;
);
}

jsontracks.push(track);
Expand Down
Loading

0 comments on commit 02440e9

Please sign in to comment.