Skip to content

Commit 1d5abba

Browse files
yhidakayhidaka
committed
Update NSLS2CB error cutoff values from 2.0 to 1.0
- Reduce cutoff for BPM offset, gain, rotation and noise errors - Reduce cutoff for CSBEND offset and roll errors - Reduce cutoff for QUAD, HIQUAD, SEXT, HISEXT offset and roll errors - Reduce cutoff for Girder offset and roll errors - Update secondary_cutoff for multipole errors
1 parent 3091dd4 commit 1d5abba

2 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎src/pyelegant/error_specs.py‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -584,23 +584,23 @@ class NSLS2CBErrorSpecModel(BaseModel):
584584
default_factory=lambda: BPMErrorSpecModel(
585585
# Some (not all) based on NSLS-II PDR Table 3.1.4
586586
offset=OffsetSpecModel(
587-
x=TGESModel(rms=100e-6, rms_unit="m", cutoff=2.0),
588-
y=TGESModel(rms=100e-6, rms_unit="m", cutoff=2.0),
587+
x=TGESModel(rms=100e-6, rms_unit="m", cutoff=1.0),
588+
y=TGESModel(rms=100e-6, rms_unit="m", cutoff=1.0),
589589
),
590590
gain=GainSpecModel(
591-
x=TGESModel(rms=5e-2, rms_unit="", cutoff=2.0),
592-
y=TGESModel(rms=5e-2, rms_unit="", cutoff=2.0),
591+
x=TGESModel(rms=5e-2, rms_unit="", cutoff=1.0),
592+
y=TGESModel(rms=5e-2, rms_unit="", cutoff=1.0),
593593
),
594594
rot=RotationSpecModel(
595-
roll=TGESModel(rms=0.2e-3, rms_unit="rad", cutoff=2.0)
595+
roll=TGESModel(rms=0.2e-3, rms_unit="rad", cutoff=1.0)
596596
),
597597
tbt_noise=NoiseSpecModel(
598-
x=TGESModel(rms=3e-6, rms_unit="m", cutoff=2.0),
599-
y=TGESModel(rms=3e-6, rms_unit="m", cutoff=2.0),
598+
x=TGESModel(rms=3e-6, rms_unit="m", cutoff=1.0),
599+
y=TGESModel(rms=3e-6, rms_unit="m", cutoff=1.0),
600600
),
601601
co_noise=NoiseSpecModel(
602-
x=TGESModel(rms=0.1e-6, rms_unit="m", cutoff=2.0),
603-
y=TGESModel(rms=0.1e-6, rms_unit="m", cutoff=2.0),
602+
x=TGESModel(rms=0.1e-6, rms_unit="m", cutoff=1.0),
603+
y=TGESModel(rms=0.1e-6, rms_unit="m", cutoff=1.0),
604604
),
605605
),
606606
description="BPM error specifications",
@@ -610,10 +610,10 @@ class NSLS2CBErrorSpecModel(BaseModel):
610610
default_factory=lambda: CsBendErrorSpecModel(
611611
# Based on NSLS-II PDR Table 3.1.8 (and 3.1.4)
612612
offset=OffsetSpecModel(
613-
x=TGESModel(rms=100e-6, rms_unit="m", cutoff=2.0),
614-
y=TGESModel(rms=100e-6, rms_unit="m", cutoff=2.0),
613+
x=TGESModel(rms=100e-6, rms_unit="m", cutoff=1.0),
614+
y=TGESModel(rms=100e-6, rms_unit="m", cutoff=1.0),
615615
),
616-
roll=TGESModel(rms=0.5e-3, rms_unit="rad", cutoff=2.0),
616+
roll=TGESModel(rms=0.5e-3, rms_unit="rad", cutoff=1.0),
617617
),
618618
description="CSBEND magnet error specifications",
619619
)
@@ -710,34 +710,34 @@ class NSLS2CBErrorSpecModel(BaseModel):
710710
# Based on NSLS-II PDR Table 3.1.8 (and 3.1.4) (offset and roll)
711711
"QUAD": QuadErrorSpecModel(
712712
offset=OffsetSpecModel(
713-
x=TGESModel(rms=30e-6, rms_unit="m", cutoff=2.0),
714-
y=TGESModel(rms=30e-6, rms_unit="m", cutoff=2.0),
713+
x=TGESModel(rms=30e-6, rms_unit="m", cutoff=1.0),
714+
y=TGESModel(rms=30e-6, rms_unit="m", cutoff=1.0),
715715
),
716-
roll=TGESModel(rms=0.2e-3, rms_unit="rad", cutoff=2.0),
716+
roll=TGESModel(rms=0.2e-3, rms_unit="rad", cutoff=1.0),
717717
# fse defaults to 2.5e-4 from QuadErrorSpecModel
718718
),
719719
"HIQUAD": QuadErrorSpecModel(
720720
offset=OffsetSpecModel(
721-
x=TGESModel(rms=30e-6, rms_unit="m", cutoff=2.0),
722-
y=TGESModel(rms=30e-6, rms_unit="m", cutoff=2.0),
721+
x=TGESModel(rms=30e-6, rms_unit="m", cutoff=1.0),
722+
y=TGESModel(rms=30e-6, rms_unit="m", cutoff=1.0),
723723
),
724-
roll=TGESModel(rms=0.2e-3, rms_unit="rad", cutoff=2.0),
724+
roll=TGESModel(rms=0.2e-3, rms_unit="rad", cutoff=1.0),
725725
# fse defaults to 2.5e-4 from QuadErrorSpecModel
726726
),
727727
"SEXT": SextErrorSpecModel(
728728
offset=OffsetSpecModel(
729-
x=TGESModel(rms=30e-6, rms_unit="m", cutoff=2.0),
730-
y=TGESModel(rms=30e-6, rms_unit="m", cutoff=2.0),
729+
x=TGESModel(rms=30e-6, rms_unit="m", cutoff=1.0),
730+
y=TGESModel(rms=30e-6, rms_unit="m", cutoff=1.0),
731731
),
732-
roll=TGESModel(rms=0.2e-3, rms_unit="rad", cutoff=2.0),
732+
roll=TGESModel(rms=0.2e-3, rms_unit="rad", cutoff=1.0),
733733
# fse defaults to 5e-4 from SextErrorSpecModel
734734
),
735735
"HISEXT": SextErrorSpecModel(
736736
offset=OffsetSpecModel(
737-
x=TGESModel(rms=30e-6, rms_unit="m", cutoff=2.0),
738-
y=TGESModel(rms=30e-6, rms_unit="m", cutoff=2.0),
737+
x=TGESModel(rms=30e-6, rms_unit="m", cutoff=1.0),
738+
y=TGESModel(rms=30e-6, rms_unit="m", cutoff=1.0),
739739
),
740-
roll=TGESModel(rms=0.2e-3, rms_unit="rad", cutoff=2.0),
740+
roll=TGESModel(rms=0.2e-3, rms_unit="rad", cutoff=1.0),
741741
# fse defaults to 5e-4 from SextErrorSpecModel
742742
),
743743
},
@@ -748,14 +748,14 @@ class NSLS2CBErrorSpecModel(BaseModel):
748748
default_factory=lambda: GirderErrorSpecModel(
749749
# Based on NSLS-II PDR Table 3.1.8
750750
us_offset=OffsetSpec3DModel(
751-
x=TGESModel(rms=100e-6, rms_unit="m", cutoff=2.0),
752-
y=TGESModel(rms=100e-6, rms_unit="m", cutoff=2.0),
751+
x=TGESModel(rms=100e-6, rms_unit="m", cutoff=1.0),
752+
y=TGESModel(rms=100e-6, rms_unit="m", cutoff=1.0),
753753
),
754754
ds_offset=OffsetSpec3DModel(
755-
x=TGESModel(rms=100e-6, rms_unit="m", cutoff=2.0),
756-
y=TGESModel(rms=100e-6, rms_unit="m", cutoff=2.0),
755+
x=TGESModel(rms=100e-6, rms_unit="m", cutoff=1.0),
756+
y=TGESModel(rms=100e-6, rms_unit="m", cutoff=1.0),
757757
),
758-
roll=TGESModel(rms=0.5e-3, rms_unit="rad", cutoff=2.0),
758+
roll=TGESModel(rms=0.5e-3, rms_unit="rad", cutoff=1.0),
759759
chain_constraints=None,
760760
),
761761
description="Girder support error specifications",

‎src/pyelegant/errors.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3180,7 +3180,7 @@ def get_multipole_err_specs():
31803180

31813181
mp_err_specs = {}
31823182

3183-
common = dict(secondary_ref_radius=25e-3, secondary_cutoff=2.0) # [m]
3183+
common = dict(secondary_ref_radius=25e-3, secondary_cutoff=1.0) # [m]
31843184

31853185
# QUAD
31863186
n_main_poles = 4

0 commit comments

Comments
 (0)