From 1aac5c5c734fc684cac5f7c4cbcfceca73abb927 Mon Sep 17 00:00:00 2001
From: zhang <zhang@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Tue, 2 Nov 2010 15:40:29 +0000
Subject: [PATCH] 02/11/2010

1) Modify FittuneFlag to fit tunes for soleil lattice.
2)  Add parameter in MomAccFlag to set 4D/6D tracking to get MomAcc.
---
 tracy/tools/Input_test.prm | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/tracy/tools/Input_test.prm b/tracy/tools/Input_test.prm
index f392a6e..6500690 100644
--- a/tracy/tools/Input_test.prm
+++ b/tracy/tools/Input_test.prm
@@ -54,7 +54,7 @@
 
 # read vacuum chamber from chamber_file, ChamberFlag must be true, if 
 # ReadChamberFlag is true
-  ReadChamberFlag  false
+  ReadChamberFlag  true
 
 # include vacuum chamber but no U20, ChamberFlag must be true, if 
 # ChamberNoU20Flag  is true
@@ -116,14 +116,15 @@
 # error coupling
 #    flag, random seed number, RMS value of the rotation angle 
 #    of the quadrupole
-  ErrorCouplingFlag false  0  0.0007
+  ErrorCouplingFlag true  0  0.0007
 # coupling flag
 #    calcualte the coupling factor in the lattice 
   CouplingFlag  false
 
 # calculate momentum acceptance for Touscheck lifetime
-#     istart istop eminp emaxp nstepp eminn emaxn nstepn
-  MomentumAccFlag false 1 108 0.01 0.05 100 -0.01 -0.05 100
+#   Dim  istart istop eminp emaxp nstepp eminn emaxn nstepn
+#   Dim: 4D/6D tracking, default value is 6D
+  MomentumAccFlag true 6D 1 108 0.01 0.05 100 -0.01 -0.05 100
 
 
 #### MULTIPOLE FACTORY
@@ -145,11 +146,24 @@
 ###
 # fit tune
 # name, flag, tuned quadrople,tuned quadrople,targetnudx    targetnudz
-  FitTuneFlag   false  qp7 qp9 18.202 10.317
+#  FitTuneFlag   true  qp7 qp7   18.202 10.317
+  FitTune4Flag   true  qp7a qp7b  qp9a qp9b  18.202 10.317
 
 # fit chromaticity
 # name,flag, tuned sextupole, tuned sextupole, targetksix    targetksiz
-  FitChromFlag  false sx9 sx10  2.0    2.6
+  FitChromFlag  true sx9 sx10  2.0    2.6
+
+
+###
+### Touschek lifetime
+###
+# calculate Touschek lifetime
+# name, flag
+  TouschekFlag false
+# Intra Beam Scattering, TouschekFlag must be true 
+  IBSFlag  false
+# Track momentum acceptance and then get Touschek lifetime, TouschekFlag must be true 
+  TousTrackFlag false
 
 ### OTHER
 # include girder error
-- 
GitLab