Code tweaks.

jbengtsson · Sep 27, 2017 · 3ce7019 · 3ce7019
1 parent 0658665
commit 3ce7019
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/projects/src/bare_da.cc b/projects/src/bare_da.cc
@@ -9,9 +9,10 @@ int no_tps = NO;
 // DIAMOND          3,
 // DIAMOND-II 4-BA  4,
 // DIAMOND-II 6-BA  5.
-const int lat_case = 5;
+// DIAMOND-II 8-BA  6.
+const int lat_case = 6;
 
-const double delta_max[] = {3.0e-2, 3.0e-2, 1.5e-2, 3e-2, 3e-2};
+const double delta_max[] = {3.0e-2, 3.0e-2, 1.5e-2, 3e-2, 3e-2, 3e-2};
 
 int main(int argc, char *argv[])
 {

diff --git a/projects/src/dnu.cc b/projects/src/dnu.cc
@@ -10,13 +10,14 @@ int  no_tps = NO;
 // DIAMOND          3,
 // DIAMOND-II 4-BA  4,
 // DIAMOND-II 6-BA  5.
-const int lat_case = 5;
+// DIAMOND-II 8-BA  6.
+const int lat_case = 6;
 
 const double
   A_max[][2] =
     {{1.5e-3, 1.5e-3}, {7.0e-3, 5.0e-3}, {15.0e-3, 8e-3}, {5.0e-3, 3.0e-3},
-     {7.0e-3, 4.0e-3}},
-  delta_max[] = {3.0e-2, 3.0e-2, 1.5e-2, 3e-2, 3e-2};
+     {7.0e-3, 4.0e-3}, {3.0e-3, 2.0e-3}},
+  delta_max[] = {3.0e-2, 3.0e-2, 1.5e-2, 3e-2, 3e-2, 3e-2};
 
 
 int main(int argc, char *argv[])

diff --git a/projects/src/optics.cc b/projects/src/optics.cc
@@ -281,20 +281,20 @@ void chk_dip(void)
   double L, phi, L_sum, phi_sum;
 
   const int
-    // Fnum[] =
-    //   {ElemIndex("bn00"), ElemIndex("bn01"), ElemIndex("bn02"),
-    //    ElemIndex("bn03"), ElemIndex("bn04"), ElemIndex("bn05"),
-    //    ElemIndex("bn06")},
+    Fnum[] =
+      {ElemIndex("bn00"), ElemIndex("bn01"), ElemIndex("bn02"),
+       ElemIndex("bn03"), ElemIndex("bn04"), ElemIndex("bn05"),
+       ElemIndex("bn06")},
     // Fnum[] =
     //   {ElemIndex("i_bn00"), ElemIndex("i_bn01"), ElemIndex("i_bn02"),
     //    ElemIndex("i_bn03"), ElemIndex("i_bn04"), ElemIndex("i_bn05"),
     //    ElemIndex("i_bn06")},
     // Fnum[] =
     //   {ElemIndex("bn00"), ElemIndex("bn03"),
     //    ElemIndex("bn06")},
-    Fnum[] =
-      {ElemIndex("i_bn00"), ElemIndex("i_bn03"),
-       ElemIndex("i_bn06")},
+    // Fnum[] =
+    //   {ElemIndex("i_bn00"), ElemIndex("i_bn03"),
+    //    ElemIndex("i_bn06")},
     n_dip = sizeof(Fnum)/sizeof(*Fnum);
 
   Ring_GetTwiss(true, 0e0);