Skip to content

Commit 3ce7019

Browse files
author
Bengtsson
committed
Code tweaks.
1 parent 0658665 commit 3ce7019

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

projects/src/bare_da.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ int no_tps = NO;
99
// DIAMOND 3,
1010
// DIAMOND-II 4-BA 4,
1111
// DIAMOND-II 6-BA 5.
12-
const int lat_case = 5;
12+
// DIAMOND-II 8-BA 6.
13+
const int lat_case = 6;
1314

14-
const double delta_max[] = {3.0e-2, 3.0e-2, 1.5e-2, 3e-2, 3e-2};
15+
const double delta_max[] = {3.0e-2, 3.0e-2, 1.5e-2, 3e-2, 3e-2, 3e-2};
1516

1617
int main(int argc, char *argv[])
1718
{

projects/src/dnu.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ int no_tps = NO;
1010
// DIAMOND 3,
1111
// DIAMOND-II 4-BA 4,
1212
// DIAMOND-II 6-BA 5.
13-
const int lat_case = 5;
13+
// DIAMOND-II 8-BA 6.
14+
const int lat_case = 6;
1415

1516
const double
1617
A_max[][2] =
1718
{{1.5e-3, 1.5e-3}, {7.0e-3, 5.0e-3}, {15.0e-3, 8e-3}, {5.0e-3, 3.0e-3},
18-
{7.0e-3, 4.0e-3}},
19-
delta_max[] = {3.0e-2, 3.0e-2, 1.5e-2, 3e-2, 3e-2};
19+
{7.0e-3, 4.0e-3}, {3.0e-3, 2.0e-3}},
20+
delta_max[] = {3.0e-2, 3.0e-2, 1.5e-2, 3e-2, 3e-2, 3e-2};
2021

2122

2223
int main(int argc, char *argv[])

projects/src/optics.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -281,20 +281,20 @@ void chk_dip(void)
281281
double L, phi, L_sum, phi_sum;
282282

283283
const int
284-
// Fnum[] =
285-
// {ElemIndex("bn00"), ElemIndex("bn01"), ElemIndex("bn02"),
286-
// ElemIndex("bn03"), ElemIndex("bn04"), ElemIndex("bn05"),
287-
// ElemIndex("bn06")},
284+
Fnum[] =
285+
{ElemIndex("bn00"), ElemIndex("bn01"), ElemIndex("bn02"),
286+
ElemIndex("bn03"), ElemIndex("bn04"), ElemIndex("bn05"),
287+
ElemIndex("bn06")},
288288
// Fnum[] =
289289
// {ElemIndex("i_bn00"), ElemIndex("i_bn01"), ElemIndex("i_bn02"),
290290
// ElemIndex("i_bn03"), ElemIndex("i_bn04"), ElemIndex("i_bn05"),
291291
// ElemIndex("i_bn06")},
292292
// Fnum[] =
293293
// {ElemIndex("bn00"), ElemIndex("bn03"),
294294
// ElemIndex("bn06")},
295-
Fnum[] =
296-
{ElemIndex("i_bn00"), ElemIndex("i_bn03"),
297-
ElemIndex("i_bn06")},
295+
// Fnum[] =
296+
// {ElemIndex("i_bn00"), ElemIndex("i_bn03"),
297+
// ElemIndex("i_bn06")},
298298
n_dip = sizeof(Fnum)/sizeof(*Fnum);
299299

300300
Ring_GetTwiss(true, 0e0);

0 commit comments

Comments
 (0)