From 9217cdff7815de60f1f911fa7294aa13721e1f29 Mon Sep 17 00:00:00 2001 From: Sven Date: Tue, 13 Jan 2026 09:04:52 +0100 Subject: [PATCH] Layout 11.0.5 --- Python_Code/onlinemodel/layout/layout.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Python_Code/onlinemodel/layout/layout.py b/Python_Code/onlinemodel/layout/layout.py index a8b975e..49d87fd 100644 --- a/Python_Code/onlinemodel/layout/layout.py +++ b/Python_Code/onlinemodel/layout/layout.py @@ -322,10 +322,13 @@ import math # Layout 11.0.4 # 1) Adding 5th and 6th RF structure to SINCB01 to gain more energy. +# Layout 11.0.5 +# 1) Implement moved skew quad in phase current to match installation in winter shutdown 2025/2026 + class SwissFEL: def __init__(self,alt=0): self.alt=alt - self.Version='11.0.4' + self.Version='11.0.5' def Types(self,TM): # type definitions for the SwissFEL lattice @@ -1739,7 +1742,6 @@ class SwissFEL: SY03.append(TM.generate('QFM-veryshort', 310), 3.-0.4-0.965-0.785, 'relative') SY03.append(TM.generate('TW Cav C-Band', 400), 0.1, 'relative') SY03.append(TM.generate('QFM-veryshort', 410), 3.-0.4-0.965-0.785, 'relative') - BC01 = LineContainer('BC01',-0.2) angAT=0.5 @@ -1776,8 +1778,7 @@ class SwissFEL: SY01.append(TM.generate('DBPM-C16',240),1.8,'relative') SY01.append(TM.generate('HFB',250),0.4,'relative') SY01.append(TM.generate('QFD',260),0.1,'relative') - SY01.append(TM.generate('QFS',270),0.05,'relative') - SY01.append(TM.generate('QFM',280),1.912,'relative') + SY01.append(TM.generate('QFM',280),1.912+0.05+0.25,'relative') # skew quad removed in 20256 SY01.append(TM.generate('SFQFM',282),0.,'relative') SY01.append(TM.generate('DBPM-C16',290),3.0-0.45-0.012,'relative') SY01.append(TM.generate('QFD',300),0.1,'relative') @@ -1818,11 +1819,8 @@ class SwissFEL: CL01.append(TM.generate('AFBC3',100,{'angle':-2.5,'design_angle':-2.5,'e1':0,'e2':1.,'BC':'Switch Yard 2'}),0.0,'relative') CL01.append(TM.generate('HFB',110),0.15+0.7,'relative') CL01.append(TM.generate('QFD',120),0.05+0.0263,'relative') - if self.alt == 0: - CL01.append(TM.generate('QFD',130),2.5-0.0263,'relative') - else: - CL01.append(TM.generate('QFS', 125), 2.5 - 0.0263-0.4+0.15, 'relative') - CL01.append(TM.generate('QFD', 130), 0, 'relative') + CL01.append(TM.generate('QFS', 125), 2.5 - 0.0263-0.4+0.15, 'relative') + CL01.append(TM.generate('QFD', 130), 0, 'relative') CL01.append(TM.generate('DBPM-C16',140),0.718,'relative') CL01.append(TM.generate('DSCR-HR16',150),0.12,'relative') CL01.append(TM.generate('HFB',160),0.45,'relative')