'
f'
{label}'
@@ -1461,6 +1492,30 @@ def _render_html(phone_numbers: list) -> str:
for label, num in phone_numbers
)
+ # Tomo queue card + its slot in the default card order are only emitted
+ # for setups that actually have the feature (see HAS_TOMO_QUEUE).
+ if has_tomo_queue:
+ tomo_queue_card_html = """
+
+
+"""
+ else:
+ tomo_queue_card_html = ""
+
+ default_order = ['audio', 'recon-queue', 'ptycho', 'instrument', 'blstates', 'contacts']
+ if has_tomo_queue:
+ default_order.insert(default_order.index('contacts'), 'tomo-queue')
+ default_order_json = json.dumps(default_order)
+
+ # Declarative tomo-type -> projection-count formula, consumed by the
+ # generic calcProjections() in JS instead of a hardcoded per-instrument
+ # branch. See WebpageGeneratorBase.TOMO_TYPES for the schema.
+ tomo_types_json = json.dumps(tomo_types or {})
+
return f"""
@@ -2139,13 +2194,7 @@ def _render_html(phone_numbers: list) -> str:
⋮⋮
@@ -2184,7 +2233,7 @@ function setTheme(t) {{
// ── Drag-and-drop card ordering ──────────────────────────────────────────
const CARD_ORDER_KEY = 'cardOrder';
-const DEFAULT_ORDER = ['audio','recon-queue','ptycho','instrument','blstates','tomo-queue','contacts'];
+const DEFAULT_ORDER = {default_order_json};
let _dragSrc = null;
function savedOrder() {{
@@ -2642,8 +2691,32 @@ function fmtTqParam(key, val){{
return String(val);
}}
+// Declarative per-instrument tomo-type definitions (see
+// WebpageGeneratorBase.TOMO_TYPES on the Python side for the schema).
+// Adding or changing a tomo type on any setup is a config change here,
+// not a new branch of formula code.
+const TOMO_TYPES = {tomo_types_json};
+
+function calcProjections(params){{
+ const def=TOMO_TYPES[params.tomo_type];
+ if(!def) return null;
+ if(def.kind==='golden_capped'){{
+ const gmax=params.golden_max_number_of_projections;
+ return (gmax!=null&&gmax>0)?gmax:null;
+ }}
+ if(def.kind==='equally_spaced_grid'){{
+ const range=params.tomo_angle_range, step=params.tomo_angle_stepsize;
+ if(range>0&&step>0){{
+ const N=Math.floor(range/step);
+ return N*(def.n_subtomos||1);
+ }}
+ }}
+ return null;
+}}
+
function renderTomoQueue(jobs){{
const el=document.getElementById('tomo-queue-content');
+ if(!el) return; // setup has no tomo-queue card (HAS_TOMO_QUEUE=False)
// Snapshot which job indices are currently open before replacing innerHTML
const openIndices=new Set();
el.querySelectorAll('details.tq-job').forEach((det,i)=>{{
@@ -2665,27 +2738,12 @@ function renderTomoQueue(jobs){{
if(key in params){{
paramRows+='
| '+dispLabel+' | '+esc(fmtTqParam(key,params[key]))+' |
';
}}
- // After angle step, inject a computed projection count row.
- // Formula must match _tomo_type1_actual_grid() / tomo_parameters() exactly:
- // type 1: N = int(range / stepsize), corrected_step = range / N, total = N * 8
- // type 2/3: golden_max_number_of_projections directly
+ // After angle step, inject a computed projection count row, driven by
+ // this instrument's TOMO_TYPES config (must match the corresponding
+ // Python-side formula, e.g. _tomo_type1_actual_grid() for flomni's
+ // "equally_spaced_grid" type).
if(key==='tomo_angle_stepsize'){{
- const ttype=params.tomo_type;
- let nproj=null;
- if(ttype===2||ttype===3){{
- // golden ratio / equally-spaced golden: capped at golden_max_number_of_projections
- const gmax=params.golden_max_number_of_projections;
- nproj=(gmax!=null&&gmax>0)?gmax:null;
- }}else{{
- // type 1: 8 equally-spaced sub-tomograms.
- // int(range/stepsize) = N per sub-tomo; total = N * 8
- // (mirrors _tomo_type1_actual_grid: N=int(range/step), total=N*8)
- const range=params.tomo_angle_range, step=params.tomo_angle_stepsize;
- if(range>0&&step>0){{
- const N=Math.floor(range/step);
- nproj=N*8;
- }}
- }}
+ const nproj=calcProjections(params);
if(nproj!=null) paramRows+='
| Projections | '+nproj+' |
';
}}
}});