From a4ea4c7a625ee6decc5cd1d442b5e99024ec86cf Mon Sep 17 00:00:00 2001 From: tpersson Date: Tue, 22 Mar 2022 16:31:58 +0100 Subject: [PATCH 1/2] Fixes the issue with asymetrical aperture. --- src/mad_aper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mad_aper.c b/src/mad_aper.c index faf9bcf60..e5943b6ea 100644 --- a/src/mad_aper.c +++ b/src/mad_aper.c @@ -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 uncemetrical around zero. + if (bbymin > 0) bbymin*=0.98; /* not simply connex beampipes... adding apexes to the halo */ c = 0; From df70328b6fb610cc676c17b1167764f4c566f399 Mon Sep 17 00:00:00 2001 From: Laurent Deniau Date: Thu, 19 May 2022 15:20:58 +0200 Subject: [PATCH 2/2] Update mad_aper.c fix typo in comment. --- src/mad_aper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mad_aper.c b/src/mad_aper.c index e5943b6ea..4ee27fdf2 100644 --- a/src/mad_aper.c +++ b/src/mad_aper.c @@ -1117,7 +1117,7 @@ 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 uncemetrical around zero. + 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 */