From bd2051693b4130c7fcaa56301426f68c643be80c Mon Sep 17 00:00:00 2001
From: zhang <zhang@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Fri, 8 Apr 2011 16:56:23 +0000
Subject: [PATCH] 08/04/2011
Move the setting of the family number of correctors, skew quadrupoles, bpms, gs, ge to globval, at soltracy.cc
---
tracy/tracy/src/soleilcommon.cc | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/tracy/tracy/src/soleilcommon.cc b/tracy/tracy/src/soleilcommon.cc
index 1701f0f..1a619de 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();
}
--
GitLab