Skip to content

Commit 6438ed5

Browse files
committed
Check valid orbit before correcting
1 parent f86ffc8 commit 6438ed5

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

docs/p/notebooks/response_matrices.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@
550550
"name": "stderr",
551551
"output_type": "stream",
552552
"text": [
553-
"/Users/laurent/dev/libraries/at/pyat/at/latticetools/response_matrix.py:579: AtWarning: No new excluded value\n",
553+
"/Users/laurent/dev/libraries/at/pyat/at/latticetools/response_matrix.py:584: AtWarning: No new excluded value\n",
554554
" warnings.warn(AtWarning(\"No new excluded value\"), stacklevel=1)\n"
555555
]
556556
}
@@ -591,7 +591,7 @@
591591
"name": "stderr",
592592
"output_type": "stream",
593593
"text": [
594-
"/Users/laurent/dev/libraries/at/pyat/at/latticetools/response_matrix.py:579: AtWarning: No new excluded value\n",
594+
"/Users/laurent/dev/libraries/at/pyat/at/latticetools/response_matrix.py:584: AtWarning: No new excluded value\n",
595595
" warnings.warn(AtWarning(\"No new excluded value\"), stacklevel=1)\n"
596596
]
597597
}

pyat/at/latticetools/response_matrix.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,13 @@ def correct(
466466
if apply:
467467
self.variables.get(ring=ring, initial=True)
468468
sumcorr = np.array([0.0])
469-
for _ in range(niter):
469+
for it in range(niter):
470470
obs.evaluate(ring, **self.eval_args)
471+
err = obs.flat_deviations
472+
if np.any(np.isnan(err)):
473+
raise AtError(
474+
f"Step {it + 1}: Invalid observables, cannot compute correction"
475+
)
471476
corr = self.get_correction(obs.flat_deviations, nvals=nvals)
472477
sumcorr = sumcorr + corr # non-broadcastable sumcorr
473478
if apply:
@@ -787,7 +792,7 @@ def set_norm():
787792
cavrefs,
788793
"Frequency",
789794
name="RF frequency",
790-
delta=cavdelta if cavdelta else 4.0 * cavd,
795+
delta=cavdelta if cavdelta else 2.0 * cavd,
791796
)
792797
variables.append(cavvar)
793798

0 commit comments

Comments
 (0)