Skip to content
Snippets Groups Projects
Commit cd3e3b53 authored by zhang's avatar zhang
Browse files

02/11/2010

1) Add routines to fit tunes for soleil lattice.
2) Add flag to set using 4D/6D in MomentumAcc
parent 64de6258
No related branches found
No related tags found
No related merge requests found
......@@ -26,6 +26,7 @@ extern double _EnergyTuneShift_deltamax;
extern bool MomentumAccFlag;
extern char DimTrack[3];
extern long _MomentumAccFlag_istart, _MomentumAccFlag_istop,
_MomentumAccFlag_nstepn, _MomentumAccFlag_nstepp;
extern double _MomentumAccFlag_deltaminn, _MomentumAccFlag_deltamaxn;
......@@ -39,7 +40,8 @@ extern char multipole_file[max_str];
extern bool ReadMultipoleFlag;
extern bool MultipoleFlag , ThinsextFlag ;
extern bool FitTuneFlag ; extern char qm1[max_str],qm2[max_str]; extern double targetnux , targetnuz ;
extern bool FitTuneFlag ; extern char qf[max_str],qd[max_str]; extern double targetnux, targetnuz;
extern bool FitTune4Flag ; extern char qf1[max_str],qf2[max_str],qd1[max_str],qd2[max_str];
extern bool FitChromFlag ; extern char sxm1[max_str],sxm2[max_str]; extern double targetksix, targetksiz ;
extern bool ChamberFlag , ChamberNoU20Flag , ReadChamberFlag;
extern bool GirderErrorFlag ;
......
......@@ -58,7 +58,6 @@ bool CouplingFlag = false;
bool MomentumAccFlag = false;
char DimTrack[3] = "4D";
long _MomentumAccFlag_istart=1L, _MomentumAccFlag_istop=108L,
//long Dim = 4L, _MomentumAccFlag_istart=1L, _MomentumAccFlag_istop=108L,
_MomentumAccFlag_nstepn=100L, _MomentumAccFlag_nstepp=100L;
double _MomentumAccFlag_deltaminn=0.01, _MomentumAccFlag_deltamaxn=0.05;
double _MomentumAccFlag_deltaminp=0.01, _MomentumAccFlag_deltamaxp=0.05;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment