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.

Sign up for GitHub

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

Jump to bottom

fix #6144 added BELLA example and new plot options #6175

Merged
merged 1 commit into from
Jul 28, 2023
Merged

fix #6144 added BELLA example and new plot options #6175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sirepo/package_data/static/js/silas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ SIREPO.beamlineItemLogic('crystalView', function(panelState, silasService, $scop
['l_scale'], item.propagationType === 'n0n2_lct' || item.propagationType === 'abcd_lct',
['origin'], hasCrystals,
['reuseCrystal'], item.origin === 'reuse',
['title', 'length', 'nslice'], item.origin === 'new',
['title', 'length', 'nslice', 'inversion_mesh_extent', 'crystal_alpha'], item.origin === 'new',
['A', 'B', 'C', 'D'], false,
]);
panelState.enableField(item.type, 'pump_wavelength', false);
Expand Down Expand Up @@ -819,7 +819,7 @@ const intensityViewHandler = function(appState, beamlineService, panelState, $sc
const idx = SIREPO.SINGLE_FRAME_ANIMATION.indexOf(modelKey());
if (m.reportType == 'parameter'
|| (! isCrystal(e) && ['total_intensity', 'total_phase'].includes(m.watchpointPlot))
|| (isCrystal(e) && m.crystalPlot === 'excited_states_longitudinal')
|| (isCrystal(e) && (m.crystalPlot === 'excited_states_longitudinal' || m.crystalPlot === 'total_excited_states'))
) {
if (idx < 0) {
SIREPO.SINGLE_FRAME_ANIMATION.push(modelKey());
Expand Down
22 changes: 12 additions & 10 deletions sirepo/package_data/static/json/silas-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
["reuse", "Use Existing"]
],
"CrystalPlot": [
["total_excited_states", "Total Excited States"],
["excited_states", "Excited States by Slice"],
["excited_states_longitudinal", "Excited States Longitudinal Distribution"]
],
Expand Down Expand Up @@ -116,13 +117,13 @@
"initial_temp": ["Inital Temperature [°C]", "Float", 0.0],
"mesh_density": ["Mesh Density", "Integer", 80],
"title": ["Element Name", "String", "Crystal"],
"A": ["A", "Float", 0.99736924],
"B": ["B", "Float", 0.0141972275],
"C": ["C", "Float", -0.260693],
"D": ["D", "Float", 0.99892682],
"A": ["A", "Float", 0.99765495],
"B": ["B", "Float", 1.41975385],
"C": ["C", "Float", -0.0023775],
"D": ["D", "Float", 0.99896716],
"length": ["Length [cm]", "Float", 2],
"l_scale": ["Length Scale Factor for LCT Propagation", "Float", 0.001],
"calc_type": ["Propagation Calculation Type", "PropCalcType", "fenics"],
"calc_type": ["Propagation Calculation Type", "PropCalcType", "analytical"],
"inversion_n_cells": ["Mesh Cell Count", "Integer", 64],
"inversion_mesh_extent": ["Crystal Radius [m]", "Float", 0.01],
"crystal_alpha": ["Crystal Alpha [1/m]", "Float", 120.0],
Expand All @@ -135,9 +136,9 @@
"origin": ["Crystal", "CrystalOrigin", "new"],
"n0n2Plot": ["", "N0n2Plot", "n0n2Plot"],
"reuseCrystal": ["Select Crystal", "SelectCrystal", 0],
"pump_offset_x": ["Pump Offset X [m]", "Float", 0],
"pump_offset_y": ["Pump Offset X [m]", "Float", 0],
"pump_rep_rate": ["Pump Rep Rate [Hz]", "Float", 1000.0]
"pump_offset_x": ["Pump Offset X [m]", "Float", 0.0],
"pump_offset_y": ["Pump Offset X [m]", "Float", 0.0],
"pump_rep_rate": ["Pump Rep Rate [Hz]", "Float", 1.0]
},
"crystalAnimation": {},
"crystalSettings": {
Expand Down Expand Up @@ -176,7 +177,7 @@
"poltype": ["Polarization", "GaussianBeamPolarization", "1"],
"tau_fwhm": ["FWHM Length [ps]", "Float", 23.5865],
"tau_0": ["Fourier-limited pulse length of a given spectral bandwidth [ps]", "Float", 23.5865],
"chirp": ["Chirp", "Float", 1.0],
"chirp": ["Chirp", "Float", 0.0012459],
"pulseE": ["Total Laser Pulse Energy [J]", "Float", 0.001],
"distribution": ["Distribution Type", "DistributionType", "gaussian"],
"sigx_waist": ["Horizontal Beam Size [m]", "Float", 0.001, "Size is in terms of RMS"],
Expand Down Expand Up @@ -228,7 +229,7 @@
},
"watchpointReport": {
"_super": ["_", "model", "initialIntensityReport"],
"crystalPlot": ["Value to Plot", "CrystalPlot", "excited_states"]
"crystalPlot": ["Value to Plot", "CrystalPlot", "total_excited_states"]
}
},
"strings": {
Expand Down Expand Up @@ -267,6 +268,7 @@
"pump_waist",
"pump_rep_rate",
"pump_gaussian_order",
"calc_type",
"pump_pulse_profile",
"pump_wavelength",
"pump_offset_x",
Expand Down
Loading