Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #6002: old data plots dont show #6020

Merged
merged 13 commits into from
Jul 14, 2023
Merged

Conversation

gurhar1133
Copy link
Contributor

laser pulse plots are not shown when data has been changed but sim hasn't been run to reflect the change in the plot

@gurhar1133 gurhar1133 marked this pull request as ready for review June 27, 2023 15:33
Copy link
Contributor

@mkeilman mkeilman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments

sirepo/package_data/static/js/silas.js Outdated Show resolved Hide resolved
sirepo/package_data/static/js/silas.js Outdated Show resolved Hide resolved
@gurhar1133 gurhar1133 requested a review from mkeilman June 27, 2023 19:23
Copy link
Contributor

@mkeilman mkeilman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One issue to clear up

sirepo/package_data/static/js/silas.js Outdated Show resolved Hide resolved
Comment on lines 113 to 116
const updateHasOldData = (dataIsOld) => {
appState.models.hasOldData = dataIsOld;
appState.saveChanges('hasOldData');
};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should also clear the simulation results here - the status message "Simulation Completed" combined with the hidden reports could be confusing.

Related to this, the first simulation run does not emit 'framesCleared' (I don't know if that's a bug or by design). Discard changes to example, change a crystal parameter, then run simulation: the plots don't show because hasOldData is still true. Subsequent runs work.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

after discussing with @moellep it seemed to make sense to just rerun the laserpulse sim when $on('laserpulse.changed')
re: "Discard changes to example, change a crystal parameter, then run simulation: the plots don't show because hasOldData is still true. Subsequent runs work." I am not sure what you mean here. This is only for the laser pulse tab and not for the beamline tab

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean a laser pulse parameter, sorry about that...

@gurhar1133 gurhar1133 requested a review from mkeilman June 29, 2023 16:18
Copy link
Contributor

@mkeilman mkeilman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link
Contributor

@mkeilman mkeilman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still lgtm

@moellep moellep merged commit 831c65e into master Jul 14, 2023
@moellep moellep deleted the 6002-only-show-up-to-date-plots branch July 14, 2023 23:25
Benbenbenin0 added a commit that referenced this pull request Aug 3, 2023
* Fix #6002: old data plots dont show (#6020)

* Bump tough-cookie from 4.1.0 to 4.1.3 in /react (#6089)

* Fix #6011: thermal transport equations and other thermal transport tab improvements (#6108)

* Fix #6008: n0n2 plot (#6118)

* Fix #6125 - added stl files to _lib_file_basenames (#6126)

Co-authored-by: mkeilman <[email protected]>

* Fix #6003 #5976 wavelength, frequency and amplifier tab refactor (#6076)

* Fix #6121 - use lower() on file types to validate (#6131)

Co-authored-by: mkeilman <[email protected]>

* fix #6073: purge_non_premium needs to ignore UserDirNotFound (#6130)

* fix #6066: raydata better status icons (#6145)

* Fix #4826 check_origin: default to Tornado behavior (#6128)

* Bump semver from 6.3.0 to 6.3.1 in /react (#6097)

* Fix #6155 stateful compute test (#6156)

- pass sampleSource
- Add validation

* Fix #6147 incorrectly setting max-age (#6150)

* Bump word-wrap from 1.2.3 to 1.2.4 in /react (#6139)

* fix #6153 add genesis time dependence simulations (#6154)

* fix #5878 srw mirror plot (#6158)

* fix #6065: move save changes button (#6151)

* Fix #6113 exports to links (#6138)

* fix #6161 new openmc_data_downloader API (#6163)

* Fix #6143: silas UI collection of updates (#6152)

* fix #6144 and fix #6165 add telescope and splitter optical elements (#6168)

* fix #6144 fix #6165 silas beamsplitter, telescope element and new mirror icon

* hide crystal summary on reused crystals

* guard against null equation text

* fix #6144 added BELLA example and new plot options (#6175)

- added crystal plot "Total Number of Excited States"
 - default crystal calc_type to "analytical"
 - changed default pump_rep_rate back to 1
 - use rslaser library to compute crystal longitudinal plots

* fix #6142 implement new thermal transport simulation (#6177)

* Fix #6142: bug note

* Fix #6142: WIP

* Fix #6142: WIP

* Fix #6142: WIP

* Fix #6142: radial, longitudinal, heatmap

* for #6142 thermal crystal changes

* Fix #6142: WIP

* Fix #6142: comment out more crystal cruft

* Fix #6142: cleanup

* for #6142 fix plots units and ranges

* Fix #6142: temp profile h5

---------

Co-authored-by: git-user <git-email>
Co-authored-by: gurhar1133 <[email protected]>

* Fix #6184 radia stl position (#6185)

* #6184 - use bounding box to center

---------

Co-authored-by: mkeilman <[email protected]>

* fix #6133: rename job_supervisor.cfg.purge_non_premium_* (#6149)

* Fix #6023 srw watchpoint panels (#6120)

* #6023 - show watchpoint reports without data

---------
Will go ahead and merge this one

Co-authored-by: mkeilman <[email protected]>

* Fix #6180: rep rate error (#6183)

* Fix #6180: colormap

* Fix #6180: fix regex and error in ui for bad pump pulse

* Fix #6180: remove unused import

---------

Co-authored-by: Michael Keilman <[email protected]>

---------

Co-authored-by: Gurhar Khalsa <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Michael Keilman <[email protected]>
Co-authored-by: mkeilman <[email protected]>
Co-authored-by: Raven <[email protected]>
Co-authored-by: Rob Nagler <[email protected]>
Co-authored-by: Paul Moeller <[email protected]>
Co-authored-by: gurhar1133 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants