diff --git a/tracy/tracy/src/soleilcommon.cc b/tracy/tracy/src/soleilcommon.cc index 1701f0fdacbe40b1755b5324ab5800d948494266..1a619de05eef0187a7b5873d2f8fc42205edb8bf 100644 --- a/tracy/tracy/src/soleilcommon.cc +++ b/tracy/tracy/src/soleilcommon.cc @@ -158,12 +158,7 @@ void Read_Lattice(char *fic) globval.CODimax = 40L; /* maximum number of iterations for COD algo */ globval.dPcommon = 1e-10; /* Common energy step for energy differentiation */ globval.delta_RF = RFacceptance;/* energy acceptance for SOLEIL */ - globval.qt = ElemIndex("qt"); /* get family index of skew quadrupole */ - globval.hcorr = ElemIndex("ch"); /* get family index of horizontal corrector */ - globval.vcorr = ElemIndex("cv"); /* get family index of vertical corrector */ - globval.bpm = ElemIndex("bpm"); /* get family index of bpm*/ - //globval.g = ElemIndex("g"); /* get family index of girder*/ - + /* define x/y physical aperture, use the default values: +- 1 meter */ globval.Aperture_on = false; @@ -202,13 +197,7 @@ void Read_Lattice(char *fic) globval.dPcommon = 1e-10; /* Common energy step for energy differentiation */ globval.delta_RF = RFacceptance; /* 6% + epsilon energy acceptance for SOLEIL */ globval.dPparticle = dP; - globval.qt = ElemIndex("qt"); /* get family index of skew quadrupole */ - globval.hcorr = ElemIndex("ch"); /* get family index of horizontal corrector */ - globval.vcorr = ElemIndex("vh"); /* get family index of vertical corrector */ - globval.bpm = ElemIndex("bpm"); /* get family index of bpm*/ - // globval.g = ElemIndex("g"); /* get family index of girder*/ - /* define x/y physical aperture, use the default values: +- 1 meter */ globval.Aperture_on = false; @@ -218,7 +207,6 @@ void Read_Lattice(char *fic) } /* SOLEIL print out lattice functions, with all the optical information for the lattice with design values */ printlatt("linlat.out"); - printglob(); }