Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects
Commit e237ec11 authored by Philippe Ganz's avatar Philippe Ganz
Browse files

implemented if statment for Dipole angles

parent 458a3704
No related branches found
No related tags found
1 merge request!42Opal maps
This commit is part of merge request !42. Comments created here will be created in the context of that merge request.
...@@ -764,11 +764,15 @@ WARN_LOGFILE = ...@@ -764,11 +764,15 @@ WARN_LOGFILE =
# spaces. # spaces.
# Note: If this tag is empty the current directory is searched. # Note: If this tag is empty the current directory is searched.
INPUT = ./src \ #INPUT = ./src \
./src/Classic \ # ./src/Classic \
./ippl/src \ # ./ippl/src \
./optimizer # ./optimizer
INPUT = ./src/Algorithms/ThickTracker.h \
./src/Algorithms/Hamiltonian.h \
./src/Algorithms/MapAnalyser.h \
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
# libiconv (or the iconv built into libc) for the transcoding. See the libiconv # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
...@@ -1417,7 +1421,7 @@ EXT_LINKS_IN_WINDOW = NO ...@@ -1417,7 +1421,7 @@ EXT_LINKS_IN_WINDOW = NO
# Minimum value: 8, maximum value: 50, default value: 10. # Minimum value: 8, maximum value: 50, default value: 10.
# This tag requires that the tag GENERATE_HTML is set to YES. # This tag requires that the tag GENERATE_HTML is set to YES.
FORMULA_FONTSIZE = 10 FORMULA_FONTSIZE = 15
# Use the FORMULA_TRANPARENT tag to determine whether or not the images # Use the FORMULA_TRANPARENT tag to determine whether or not the images
# generated for formulas are transparent PNGs. Transparent PNGs are not # generated for formulas are transparent PNGs. Transparent PNGs are not
...@@ -1439,7 +1443,7 @@ FORMULA_TRANSPARENT = YES ...@@ -1439,7 +1443,7 @@ FORMULA_TRANSPARENT = YES
# The default value is: NO. # The default value is: NO.
# This tag requires that the tag GENERATE_HTML is set to YES. # This tag requires that the tag GENERATE_HTML is set to YES.
USE_MATHJAX = NO USE_MATHJAX = YES
# When MathJax is enabled you can set the default output format to be used for # When MathJax is enabled you can set the default output format to be used for
# the MathJax output. See the MathJax site (see: # the MathJax output. See the MathJax site (see:
...@@ -1469,7 +1473,7 @@ MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest ...@@ -1469,7 +1473,7 @@ MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
# This tag requires that the tag USE_MATHJAX is set to YES. # This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_EXTENSIONS = MATHJAX_EXTENSIONS = AMSmath AMSsymbols
# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
# of code that will be used on startup of the MathJax code. See the MathJax site # of code that will be used on startup of the MathJax code. See the MathJax site
...@@ -1625,7 +1629,8 @@ PAPER_TYPE = a4wide ...@@ -1625,7 +1629,8 @@ PAPER_TYPE = a4wide
# This tag requires that the tag GENERATE_LATEX is set to YES. # This tag requires that the tag GENERATE_LATEX is set to YES.
EXTRA_PACKAGES = amsfonts, \ EXTRA_PACKAGES = amsfonts, \
amssymb amssymb, \
amsmath
# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the # The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
# generated LaTeX document. The header should contain everything until the first # generated LaTeX document. The header should contain everything until the first
......
...@@ -532,18 +532,26 @@ inline void ThickTracker::visitSBend(const SBend &bend) { ...@@ -532,18 +532,26 @@ inline void ThickTracker::visitSBend(const SBend &bend) {
// Fringe fields currently not working // Fringe fields currently not working
//FIXME e1 not initialised //FIXME e1 not initialised
//double e1 = bend.getEntranceAngle(); //insert Entrance Fringefield
//elements_m.push_back(std::make_tuple(hamiltonian_m.fringeField(e1, h), double e1 = bend.getEntranceAngle();
// 1, 0.0)); if (e1 > 1e-6){
elements_m.push_back(std::make_tuple(hamiltonian_m.fringeField(e1, h),
1, 0.0));
}
//instert Dipole "body"
elements_m.push_back(std::make_tuple(hamiltonian_m.sbend(gamma, h, k0), elements_m.push_back(std::make_tuple(hamiltonian_m.sbend(gamma, h, k0),
nSlices, nSlices,
arclength)); arclength));
//FIXME e2 not initialised //FIXME e2 not initialised
//double e2 = bend.getExitAngle(); //insert Exit Fringe field
//elements_m.push_back(std::make_tuple(hamiltonian_m.fringeField(e2, h), double e2 = bend.getExitAngle();
// 1, 0.0)); if (e1 > 1e-6){
elements_m.push_back(std::make_tuple(hamiltonian_m.fringeField(e2, h),
1, 0.0));
}
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment