From 40d53ab977c44f2962a7d93c43af31188f09630f Mon Sep 17 00:00:00 2001
From: zhang <zhang@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Tue, 8 Feb 2011 17:13:44 +0000
Subject: [PATCH] 08/02/2011
delete chamberoff( )
---
tracy/tracy/src/soleilcommon.cc | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/tracy/tracy/src/soleilcommon.cc b/tracy/tracy/src/soleilcommon.cc
index 9694cfb..781f240 100644
--- a/tracy/tracy/src/soleilcommon.cc
+++ b/tracy/tracy/src/soleilcommon.cc
@@ -164,8 +164,9 @@ void Read_Lattice(char *fic)
globval.bpm = ElemIndex("bpm"); /* get family index of bpm*/
//globval.g = ElemIndex("g"); /* get family index of girder*/
- /* define x/y physical aperture */
- ChamberOff();
+ /* define x/y physical aperture, use the default values: +- 1 meter */
+ globval.Aperture_on = false;
+
/* Compute and get Twiss parameters */
Ring_GetTwiss(chroma = true, dP = 0.0);
@@ -207,7 +208,11 @@ void Read_Lattice(char *fic)
globval.bpm = ElemIndex("bpm"); /* get family index of bpm*/
// globval.g = ElemIndex("g"); /* get family index of girder*/
- ChamberOff();
+
+ /* define x/y physical aperture, use the default values: +- 1 meter */
+ globval.Aperture_on = false;
+
+
TransTwiss(alpha, beta, eta, etap, codvect);
}
}
--
GitLab