Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix make thin for k0=0 when angle is defined #666

Merged
merged 2 commits into from Aug 31, 2018
Merged

Fix make thin for k0=0 when angle is defined #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f23da10
This fixes the problem with k0=0.
Aug 29, 2018
8e3fb6b
This fixes the makethin when k0=0.
Aug 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/mad_mkthin.cpp
View file
Open in desktop
Expand Up @@ -2182,13 +2182,18 @@ element* SeqElList::create_sliced_magnet(const element* thick_elem, int slice_no
if(kn_pars[0]->expr) k0val=my_get_expression_value(kn_pars[0]->expr);
else k0val=kn_pars[0]->double_value;
if(verbose>1) std::cout << __FILE__<< " " << __FUNCTION__ << " line " << std::setw(4) << __LINE__ << " angleval=" << angleval << " k0val=" << k0val << " lenval=" << lenval << " k0val*lenval=" << k0val*lenval << std::endl;
if( fabs(k0val)>0 && fabs(k0val*lenval-angleval)>eps )
if(fabs(k0val*lenval-angleval)>eps && fabs(k0val) > eps)
{ // both angle and k0 with different information
if(verbose>1) std::cout << __FILE__<< " " << __FUNCTION__ << " line " << std::setw(4) << __LINE__ << " angle and k0 both given and not equal, write also angle to multipole" << std::endl;
multipole_angle_param=new_command_parameter("angle", k_double);
if (angle_param->expr) multipole_angle_param->expr = clone_expression(angle_param->expr);
multipole_angle_param->double_value = angle_param->double_value;
}
if(fabs(k0val) < eps)
{ //This is in case k0 is defined but 0
kn_pars[0]=k0_from_angle(angle_param); // k0 generated from angle
mult_with_length = false; // angle is already k0 * length
}
}
else // k0 not defined, angle given, generate k0
{
Expand Down
92 changes: 46 additions & 46 deletions tests/test-dynap/dynap.ref
View file
Open in desktop

Large diffs are not rendered by default.

92 changes: 46 additions & 46 deletions tests/test-dynap/dynaptune.ref
View file
Open in desktop
@@ -1,51 +1,51 @@
@ NAME %09s "DYNAPTUNE"
@ TYPE %09s "DYNAPTUNE"
@ TITLE %08s "no-title"
@ ORIGIN %16s "5.04.00 Linux 64"
@ DATE %08s "15/05/18"
@ TIME %08s "18.30.27"
@ ORIGIN %16s "5.04.01 Linux 64"
@ DATE %08s "31/08/18"
@ TIME %08s "16.43.08"
* X Y TUNX TUNY DTUNE
$ %le %le %le %le %le
8.306546607e-07 8.221273111e-07 0.3099627393 0.3200187463 3.207781351e-11
1.658361219e-05 8.186256681e-07 0.3100000481 0.319964642 1.461039283e-08
1.604053041e-05 4.253034323e-06 0.309994157 0.3199704942 2.918723491e-09
1.438400368e-05 8.219922185e-06 0.3099774076 0.3199871211 1.186143248e-09
1.174723087e-05 1.162663593e-05 0.3099544732 0.3200098662 1.025455525e-09
8.309903689e-06 1.424101366e-05 0.3099314606 0.3200326584 8.983922501e-10
4.306270306e-06 1.588488984e-05 0.3099145283 0.3200493951 1.448143486e-10
8.393563212e-07 1.642548182e-05 0.309908492 0.3200553313 5.582283685e-09
3.316722438e-05 1.637251336e-06 0.3101115183 0.3198025367 7.805919251e-09
3.208106081e-05 8.506068646e-06 0.3100881626 0.3198258493 4.571060659e-10
2.876800735e-05 1.643984437e-05 0.3100216407 0.3198921024 8.580884313e-10
2.349446174e-05 2.325327187e-05 0.3099303824 0.3199826909 3.743814344e-09
1.661980738e-05 2.848202732e-05 0.3098383042 0.3200737052 8.183674793e-09
8.612540612e-06 3.176977967e-05 0.3097699158 0.3201409504 1.205347406e-08
1.678712642e-06 3.285096364e-05 0.3097451811 0.3201650241 3.939635431e-08
4.975083657e-05 2.455877004e-06 0.3102983018 0.3195300928 2.103500877e-07
4.812159122e-05 1.275910297e-05 0.3102455873 0.3195833086 3.937254273e-08
4.315201103e-05 2.465976656e-05 0.3100962226 0.3197332868 1.086795652e-08
3.52416926e-05 3.48799078e-05 0.3098923204 0.3199361639 5.341848046e-09
2.492971107e-05 4.272304097e-05 0.3096847944 0.3201404284 3.143842057e-08
1.291881092e-05 4.765466951e-05 0.3095272957 0.3202937387 1.583062697e-08
2.518068964e-06 4.927644546e-05 0.3094688853 0.3203496966 2.732516826e-08
6.633444877e-05 3.274502672e-06 0.3105678189 0.3191336162 5.232060437e-08
6.416212162e-05 1.701213729e-05 0.3104706133 0.3192343439 1.373709752e-08
5.753601471e-05 3.287968874e-05 0.3102017642 0.3195093227 4.399069319e-08
4.698892347e-05 4.650654374e-05 0.3098427631 0.3198684421 1.823930164e-08
3.323961476e-05 5.696405463e-05 0.3094725014 0.3202299199 4.17966796e-08
1.722508122e-05 6.353955934e-05 0.3091782954 0.3205111505 2.156656127e-08
3.357425285e-06 6.570192728e-05 0.3090638737 0.3206181501 9.962786888e-08
8.291806096e-05 4.093128341e-06 0.310942832 0.3185704742 4.17479092e-07
8.020265203e-05 2.126517162e-05 0.3107748665 0.3187539671 2.864379987e-08
7.192001838e-05 4.109961093e-05 0.3103380956 0.3192175303 2.745880066e-08
5.873615434e-05 5.813317967e-05 0.3097849385 0.3197765999 4.617185378e-07
4.154951844e-05 7.120506829e-05 0.309202739 0.3203366408 1.142903468e-08
2.153135153e-05 7.942444918e-05 0.308698926 0.3208040458 2.05204389e-07
4.196781606e-06 8.212740911e-05 0.3084854896 0.3209973028 6.8050307e-07
9.950167315e-05 4.911754009e-06 0.3114399668 0.3177344013 5.341551844e-06
9.624318243e-05 2.551820594e-05 0.3111685889 0.3180864554 2.046669116e-06
8.630402206e-05 4.931953311e-05 0.3105032354 0.3188544249 1.432129e-07
7.048338521e-05 6.97598156e-05 0.3097230219 0.3196567495 5.867961611e-07
4.985942213e-05 8.544608195e-05 0.308876947 0.3204492678 6.022974404e-08
2.583762184e-05 9.530933901e-05 0.3080343937 0.3211824306 1.709447206e-06
5.036137927e-06 9.855289093e-05 0.3076324508 0.3214982567 7.531054962e-08
8.306578336e-07 8.221272278e-07 0.3099651518 0.3200187462 3.231732197e-11
1.658367429e-05 8.186239802e-07 0.3100024608 0.3199646421 1.424140379e-08
1.604059074e-05 4.253032696e-06 0.3099965697 0.3199704943 2.85965104e-09
1.438405814e-05 8.219920732e-06 0.3099798203 0.3199871211 1.165056771e-09
1.174727574e-05 1.162663476e-05 0.3099568859 0.3200098662 1.007613142e-09
8.309935913e-06 1.424101283e-05 0.3099338734 0.3200326584 8.820515834e-10
4.306287687e-06 1.588488942e-05 0.3099169411 0.320049395 1.67617702e-10
8.393607787e-07 1.642548176e-05 0.3099109047 0.3200553312 5.653882496e-09
3.316734857e-05 1.63724796e-06 0.3101139316 0.3198025373 8.246988921e-09
3.208118149e-05 8.506065392e-06 0.3100905759 0.3198258498 4.094908196e-10
2.876811627e-05 1.643984146e-05 0.310024054 0.3198921028 8.634953657e-10
2.349455148e-05 2.325326951e-05 0.3099327957 0.3199826911 3.68409296e-09
1.661987183e-05 2.848202567e-05 0.3098407176 0.3200737054 8.099333077e-09
8.612575375e-06 3.176977884e-05 0.3097723292 0.3201409505 1.197890669e-08
1.678721557e-06 3.285096352e-05 0.3097475945 0.3201650241 3.900083918e-08
4.975102286e-05 2.455871941e-06 0.3103007165 0.3195300936 2.085938504e-07
4.812177223e-05 1.275909809e-05 0.3102480019 0.3195833092 3.906095855e-08
4.315217441e-05 2.46597622e-05 0.3100986372 0.3197332874 1.114129275e-08
3.524182722e-05 3.487990427e-05 0.3098947349 0.3199361644 5.276009304e-09
2.492980774e-05 4.27230385e-05 0.309687209 0.3201404287 3.136335836e-08
1.291886306e-05 4.765466826e-05 0.3095297105 0.3202937388 1.588776739e-08
2.518082336e-06 4.927644528e-05 0.3094713001 0.3203496967 2.757716449e-08
6.633469714e-05 3.274495921e-06 0.3105702367 0.3191336158 5.743199941e-08
6.416236298e-05 1.701213078e-05 0.310473031 0.3192343435 1.358772196e-08
5.753623255e-05 3.287968293e-05 0.3102041811 0.3195093229 4.343651744e-08
4.698910296e-05 4.650653902e-05 0.3098451802 0.3198684417 1.9809951e-08
3.323974365e-05 5.696405133e-05 0.3094749182 0.3202299201 4.203623871e-08
1.722515075e-05 6.353955769e-05 0.3091807129 0.3205111506 2.144818619e-08
3.357443115e-06 6.570192704e-05 0.3090662916 0.3206181502 1.011083871e-07
8.291837143e-05 4.093119901e-06 0.3109452565 0.3185704675 4.263391321e-07
8.020295372e-05 2.126516348e-05 0.3107772895 0.3187539626 2.850843413e-08
7.192029069e-05 4.109960366e-05 0.3103405162 0.3192175292 2.749406675e-08
5.87363787e-05 5.813317378e-05 0.30978736 0.3197765955 4.579716535e-07
4.154967957e-05 7.120506417e-05 0.3092051596 0.3203366402 1.15013687e-08
2.153143844e-05 7.942444711e-05 0.3087013477 0.3208040458 1.93724907e-07
4.196803893e-06 8.21274088e-05 0.3084879125 0.3209973029 6.832416771e-07
9.950204571e-05 4.911743881e-06 0.3114423979 0.3177343665 5.41346579e-06
9.624354446e-05 2.551819617e-05 0.3111710209 0.3180864355 2.053408194e-06
8.630434882e-05 4.931952439e-05 0.3105056616 0.3188544226 1.401769277e-07
7.048365444e-05 6.975980853e-05 0.3097254349 0.3196567617 6.133930601e-07
4.985961548e-05 8.5446077e-05 0.3088793737 0.3204492652 7.148050708e-08
2.583772612e-05 9.530933653e-05 0.3080368267 0.3211824291 1.731614481e-06
5.036164672e-06 9.855289056e-05 0.3076348855 0.3214982566 7.89518921e-08