Update mad_mkthin.cpp #1173
Closed
Update mad_mkthin.cpp #1173
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k0 in dipedge
rdemaria
reviewed
May 3, 2023
src/mad_mkthin.cpp
Outdated
| @@ -156,8 +157,8 @@ class SeqElList // sequence with elements considered for slicing | |||
| double hybrid_at_shift(const int slices, const int slice_no) const; | |||
| double at_shift(const int slices, const int slice_no,const std::string local_slice_style) const; // return at relative shifts from centre of unsliced magnet | |||
| void kn_ks_from_thick_elem(const element* thick_elem,command_parameter* kn_pars[4],command_parameter* ks_pars[4]) const; // read k0-k3, k0s-k3s in thick_elem and put them in kn_pars, ks_pars | |||
| // void add_ktap(command_parameter* k_param,const element* thick_elem); | |||
| // void add_ktap_i(const int i,command_parameter* k_param,const std::string k_name,const std::string ktap_name,const element* thick_elem); | |||
| void add_ktap(command_parameter* k_param,const element* thick_elem); | |||
There was a problem hiding this comment.
k1tap, k2tap are obsolete. All elements store tapering information on ktap, therefore add_ktap should be changed
There was a problem hiding this comment.
True, add_ktap and add_ktap_i are not needed any more and should be removed from the code. Done on my fork.
Checks done to make sure that ktap is automatically transmitted when defined, which is the case for rbend, sbend, quadrupole, sextupole, octupole and multipole. Also ok for thick slicing.
|
I picked the change for dipedge and put into master. |
|
imported into master |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
k0 in dipedge