Skip to content

Added mcdisplay section to FlatEllipse_finite_mirror component #2521

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

Merged
willend merged 2 commits into from
Jun 26, 2026
+52 −25
Merged

Added mcdisplay section to FlatEllipse_finite_mirror component #2521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4ba8b2
Added mcdisplay section to FlatEllipse_finite_mirror component
mads-bertelsen Jun 26, 2026
2a9f756
Avoided special case where variable was uninitialized.
mads-bertelsen Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 40 additions & 25 deletions mcstas-comps/contrib/FlatEllipse_finite_mirror.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,37 +243,52 @@ FINALLY %{
finishSimulation(&s);
%}

MCDISPLAY//TODO this does not work as of now does not show the orientation of the flat conics
MCDISPLAY
%{
// PW 20260112 Suppressed. Cals to rConic make no sense since the flat mirrors are NOT conical...

/* //Enlarge xy-plane when mcdisplay is ran with --zoom */
/* magnify("xy"); */
magnify ("xy");

double half_mirror_sidelength = 0.5 * mirror_sidelength;

// Draw xy-axis contour for Conic Surfaces */
int i;
for (i = 0; i < s.num_f; i++) {
double step = (s.f[i].ze - s.f[i].zs) / 100;
double cz, rp, rc;
double last_cz = 0;

cz = s.f[i].zs;

/* //Draw xy-axis contour for Conic Surfaces */
/* int i; */
/* for (i = 0; i < s.num_f; i++) { */
/* double step = (s.f[i].ze-s.f[i].zs)/100; */
/* double cz; */
/* for (cz = s.f[i].zs+step; cz <= s.f[i].ze; cz+= step) { */
/* double rp = rConic(cz-step,s.f[i]); */
/* double rc = rConic(cz, s.f[i]); */
// front line
rp = wFlat (cz, s.f[i]);
line (rp, -half_mirror_sidelength, cz, rp, half_mirror_sidelength, cz);
line (-rp, -half_mirror_sidelength, cz, -rp, half_mirror_sidelength, cz);

/* line(0,rp,cz-step,0,rc,cz); */
/* line(0,-rp,cz-step,0,-rc,cz); */
for (cz = s.f[i].zs + step; cz < s.f[i].ze; cz += step) {
rp = wFlat (cz - step, s.f[i]);
rc = wFlat (cz, s.f[i]);

/* line(rp,0,cz-step,rc,0,cz); */
/* line(-rp,0,cz-step,-rc,0,cz); */
/* } */
/* } */
line (rp, -half_mirror_sidelength, cz - step, rc, -half_mirror_sidelength, cz);
line (rp, half_mirror_sidelength, cz - step, rc, half_mirror_sidelength, cz);
line (-rp, -half_mirror_sidelength, cz - step, -rc, -half_mirror_sidelength, cz);
line (-rp, half_mirror_sidelength, cz - step, -rc, half_mirror_sidelength, cz);

/* //Draw xy-axis cross hairs for Disks */
/* for (i = 0; i < s.num_di; i++) { */
/* line(s.di[i].r0, 0, s.di[i].z0, s.di[i].r1, 0, s.di[i].z0); */
/* line(-s.di[i].r0, 0, s.di[i].z0, -s.di[i].r1, 0, s.di[i].z0); */
/* line(0, s.di[i].r0, s.di[i].z0, 0, s.di[i].r1,s.di[i].z0); */
/* line(0, -s.di[i].r0, s.di[i].z0, 0, -s.di[i].r1,s.di[i].z0); */
/* } */
last_cz = cz;
}

// The for loop above may end before the actual end of the ellipse, this adds the last piece
// cz to s.f[i].ze
rp = wFlat (last_cz, s.f[i]);
rc = wFlat (s.f[i].ze, s.f[i]);
line (rp, -half_mirror_sidelength, last_cz, rc, -half_mirror_sidelength, s.f[i].ze);
line (rp, half_mirror_sidelength, last_cz, rc, half_mirror_sidelength, s.f[i].ze);
line (-rp, -half_mirror_sidelength, last_cz, -rc, -half_mirror_sidelength, s.f[i].ze);
line (-rp, half_mirror_sidelength, last_cz, -rc, half_mirror_sidelength, s.f[i].ze);

// end line
line (rc, -half_mirror_sidelength, s.f[i].ze, rc, half_mirror_sidelength, s.f[i].ze);
line (-rc, -half_mirror_sidelength, s.f[i].ze, -rc, half_mirror_sidelength, s.f[i].ze);
}
%}

END
12 changes: 12 additions & 0 deletions mcstas-comps/share/conic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,18 @@ double rConic(double z, ConicSurf s) {
return sqrt(s.k1+s.k2*z+s.k3*z*z);
}

/*! \brief Function to return width of FlatSurf at a z-axis position.

Will return width even if z is outside the bounds of zs and ze
for the particular FlatSurf.

@param z z-axis position to compute radius
@param s FlatSurf to compute width of
*/
double wFlat(double z, FlatSurf s) {
return sqrt(s.k1+s.k2*z+s.k3*z*z);
}

/*! \brief Function for generating Hyperboloid ConicSurf.

@param f1 z position of focus closest to actual mirror surface
Expand Down
Loading