Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
TRACY3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PA
Optics
TRACY3
Commits
a76df6f9
Commit
a76df6f9
authored
14 years ago
by
nadolski
Browse files
Options
Downloads
Patches
Plain Diff
ÂÍÅÄ?ÊÊÑÅþÑ>êÑ>ŬåÁÈÄÇÊ?_ø?ÍÊÌÑ
parent
2571e8ad
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
tracy/tracy/src/t2ring.cc
+7
-0
7 additions, 0 deletions
tracy/tracy/src/t2ring.cc
with
7 additions
and
0 deletions
tracy/tracy/src/t2ring.cc
+
7
−
0
View file @
a76df6f9
...
...
@@ -477,10 +477,12 @@ void Cell_Twiss(long i0, long i1, ss_vect<tps> &Ascr, bool chroma, bool ring,
16/10/03 Modified convergence test: now done for both planes
01/09/10 Modify the convergence criteria on relative diff of the chroma value
The previous test does not work well for non zero chromaticities
Test convergence changed if chroma closed to zero
****************************************************************************/
#define n 4
#define chromeps 1e-6
/* convergence condition for chromaticity computation */
#define LOG10 log(10.0)
#define ZEROCHRO 0.1
void
Ring_Getchrom
(
double
dP
)
{
long
int
lastpos
=
0
;
...
...
@@ -546,6 +548,10 @@ void Ring_Getchrom(double dP) {
Norm_TEMP
=
sqrt
(
TEMP
[
0
]
*
TEMP
[
0
]
+
TEMP
[
1
]
*
TEMP
[
1
]);
NORMchro
=
sqrt
(
globval
.
Chrom
[
0
]
*
globval
.
Chrom
[
0
]
+
globval
.
Chrom
[
1
]
*
globval
.
Chrom
[
1
]);
// if chroma closed to zero, norm is one for avoiding divergence of convergence test
if
(
NORMchro
<
ZEROCHRO
){
NORMchro
=
1.0
;
}
// TEST CHROMA convergence
if
(
trace
)
{
...
...
@@ -572,6 +578,7 @@ void Ring_Getchrom(double dP) {
#undef n
#undef chromeps
#undef LOG10
#undef ZEROCHRO
/****************************************************************************/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment