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 bounding box issue #1093

Merged
merged 3 commits into from Aug 15, 2022
Merged

Fix bounding box issue #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5206210
Small typo in the manual.
tpersson Mar 8, 2022
a4ea4c7
Fixes the issue with asymetrical aperture.
tpersson Mar 22, 2022
df70328
Update mad_aper.c
ldeniau May 19, 2022
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
4 changes: 2 additions & 2 deletions doc/latexuguide/tables.tex
View file
Open in desktop
Expand Up @@ -168,7 +168,7 @@ \section{SETVARS\_KNOB}
The \texttt{SETVARS\_KNOB} command creates or manipulates the expression for the variables by adding a term \texttt{"+ val * knob"} where val is extracted from the row of a table and knob from the command.

\madbox{
SETVARS, TABLE=tabname, ROW=integer, KNOB=knobname;
SETVARS\_KNOB, TABLE=tabname, ROW=integer, KNOB=knobname;
}

The attributes of \texttt{SETVARS} are:
Expand All @@ -192,7 +192,7 @@ \section{SETVARS\_CONST}
The \texttt{SETVARS\_CONST} sets the value for the variables to constant.

\madbox{
SETVARS, TABLE=tabname, CONST=value;
SETVARS\_CONST, TABLE=tabname, CONST=value;
}

The attributes of \texttt{SETVARS} are:
Expand Down
3 changes: 2 additions & 1 deletion src/mad_aper.c
View file
Open in desktop
Expand Up @@ -1117,7 +1117,8 @@ aper_calc(double p, double q, double* minhl,
bbymin = fmin(bbymin,pipey[j]); bbymax = fmax(bbymax,pipey[j]);
}
bbxmax *= 1.01; bbymax *= 1.01; bbxmin *= 1.01; bbymin *= 1.01; // 1% clearance

if (bbxmin > 0) bbxmin*=0.98; // Trick if the defined aperture is asymmetric around zero.
if (bbymin > 0) bbymin*=0.98;

/* not simply connex beampipes... adding apexes to the halo */
c = 0;
Expand Down