#6022 - retry beamline animation reads

radiasoft · Aug 1, 2023 · 648eba6 · 648eba6
1 parent 01ad5a3
commit 648eba6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/sirepo/package_data/template/srw/parameters.py.jinja b/sirepo/package_data/template/srw/parameters.py.jinja
@@ -463,7 +463,6 @@ def _process_watch(filename, report):
     d, x_range, y_range = _resize_report(report, d, x_range, y_range)
     if report.get("rotateAngle", 0):
         d, x_range, y_range = _rotate_report(report, d, x_range, y_range, info)
-    print(f"Size before: {len(data)}  after: {d.size} Dimensions: {d.shape}, Resize: [{y_range}, {x_range}]")
     new_mesh = srwlib.SRWLRadMesh(
         _eStart=mesh.eStart,
         _eFin=mesh.eFin,

diff --git a/sirepo/template/srw.py b/sirepo/template/srw.py
@@ -512,16 +512,15 @@ def sim_frame(frame_args):
         else:
             frame_args.sim_in.report = "initialIntensityReport"
             frame_args.sim_in.models.initialIntensityReport = m
-    if "beamlineAnimation" not in r:
-        # some reports may be written at the same time as the reader
-        # if the file is invalid, wait a bit and try again
-        for i in (1, 2, 3):
-            try:
-                return extract_report_data(frame_args.sim_in)
-            except Exception:
-                # sleep and retry to work-around concurrent file read/write
-                pkdlog("sleep and retry simulation frame read: {} {}", i, r)
-                time.sleep(2)
+    # some reports may be written at the same time as the reader
+    # if the file is invalid, wait a bit and try again
+    for i in (1, 2, 3):
+        try:
+            return extract_report_data(frame_args.sim_in)
+        except Exception:
+            # sleep and retry to work-around concurrent file read/write
+            pkdlog("sleep and retry simulation frame read: {} {}", i, r)
+            time.sleep(2)
     return extract_report_data(frame_args.sim_in)