Skip to content

Commit ec930ec

Browse files
committed
Some fixes in synchrotron and tests
1 parent 0eea511 commit ec930ec

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

PyHEADTAIL/machines/synchrotron.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -526,10 +526,9 @@ def _construct_longitudinal_map(
526526
return
527527

528528
# Provide an RF bucket if possible
529-
if (
530-
h_RF is not None
531-
and V_RF is not None
532-
and dphi_RF is not None
529+
if (h_RF[0] is not None
530+
and V_RF[0] is not None
531+
and dphi_RF[0] is not None
533532
and alpha_mom_compaction is not None
534533
and p_increment is not None
535534
):
@@ -560,7 +559,7 @@ def _construct_longitudinal_map(
560559
raise ValueError("RF_at=%s not recognized!")
561560

562561
if longitudinal_mode == "linear":
563-
if V_RF is not None and Q_s is not None:
562+
if V_RF[0] is not None and Q_s is not None:
564563
raise ValueError("Q_s and V_RF cannot be provided at the same time")
565564

566565
if Q_s is None:

PyHEADTAIL/testing/script-tests/CLIC_DR.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(self, machine_configuration=None, optics_mode='smooth', **kwargs):
3030
p_increment = 0.
3131
accQ_x = 48.35
3232
accQ_y = 10.4
33-
V_RF = 5.1e6
33+
V_RF = None
3434
dphi_RF = 0.
3535
else:
3636
raise ValueError('machine_configuration not recognized!')

0 commit comments

Comments
 (0)