Skip to content

McStas Monitor_nD “nexusbins” only in listmode #2387

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
Apr 8, 2026
Merged

McStas Monitor_nD “nexusbins” only in listmode #2387

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
dd83db6
Adjust Example values for instrs using Rubredoxin.lau
willend Apr 8, 2026
1cab719
Add Monitor_nD handle to enable/disable BIN info in NeXus mode
willend Apr 8, 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
2 changes: 1 addition & 1 deletion mcstas-comps/contrib/PSD_Detector.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ INITIALIZE
strcpy (Vars.option, "list all");
strcat (Vars.option, ", borders, x y z vx vy vz t sx sy sz");

Monitor_nD_Init (&DEFS, &Vars, 0.1, 0.1, 0, 0, 0, 0, 0, 0, 0, 0); /* dims for mcdisplay */
Monitor_nD_Init (&DEFS, &Vars, 0.1, 0.1, 0, 0, 0, 0, 0, 0, 0, 0, 0); /* dims for mcdisplay */
if (filename && strlen (filename) && strcmp (filename, "0") && strcmp (filename, "NULL"))
strncpy (Vars.Mon_File, filename, 128);

Expand Down
2 changes: 1 addition & 1 deletion mcstas-comps/contrib/StatisticalChopper_Monitor.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ INITIALIZE INHERIT Monitor_nD EXTEND
strcpy (Vars.option, op);

/* re-initialize Monitor_nD */
Monitor_nD_Init (&DEFS, &Vars, xwidth, yheight, zdepth, xmin, xmax, ymin, ymax, zmin, zmax, 0);
Monitor_nD_Init (&DEFS, &Vars, xwidth, yheight, zdepth, xmin, xmax, ymin, ymax, zmin, zmax, 0, 0);
%}

TRACE INHERIT Monitor_nD
Expand Down
2 changes: 1 addition & 1 deletion mcstas-comps/examples/Templates/templateNMX/templateNMX.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* A single crystal sample is illuminated with a white cold beam.
* Based on a Laue tutorial written by K. Nielsen, Feb 7, 2000.
*
* %Example: templateNMX reflections=Rubredoxin.lau Detector: det_I=5.6e3
* %Example: templateNMX reflections=Rubredoxin.lau Detector: det_I=5.6e4
* Example: templateNMX reflections=PPase_D_P1.lau Detector: det_I=29.6512
*
* %Parameters
Expand Down
2 changes: 1 addition & 1 deletion mcstas-comps/examples/Templates/templateNMX_TOF/templateNMX_TOF.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* Demonstrates use of PSD_monitor_TOF.
*
* Example: templateNMX_TOF.instr REPS=53 reflections=Rubredoxin.lau theta=-40.85 phi=15.188 xw=0.012 yh=0.012 tmin=13000 tmax=15000 Detector: det_I=264.326
* Example: templateNMX_TOF.instr REPS=53 reflections=Rubredoxin.lau theta=-40.85 phi=15.188 xw=0.012 yh=0.012 tmin=13000 tmax=15000 Detector: det_I=78816.1
* Example: templateNMX_TOF.instr REPS=5 reflections=YBaCuO.lau theta=-91.1 phi=0 xw=0.012 yh=0.012 tmax=7000 tmin=5000 Detector: det_I=6277.74
*
* %Description
Expand Down
7 changes: 4 additions & 3 deletions mcstas-comps/monitors/Monitor_nD.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@
* username3: [str] Name assigned to User3
* restore_neutron: [0|1] If set, the monitor does not influence the neutron state. Equivalent to setting the 'parallel' option.
* geometry: [str] Name of an OFF file to specify a complex geometry detector
* nowritefile: [1] If set, monitor will skip writing to disk
* nowritefile: [1] If set, monitor will skip writing to disk
* nexus_bins: [1] NeXus mode only: store component BIN information <br>(-1 disable, 0 enable for list mode monitor, 1 enable for any montor)
*
* CALCULATED PARAMETERS:
*
Expand All @@ -235,7 +236,7 @@ SETTING PARAMETERS (
xwidth=0, yheight=0, zdepth=0,
xmin=0, xmax=0, ymin=0, ymax=0, zmin=0, zmax=0,
int bins=0, min=-1e40, max=1e40, int restore_neutron=0, radius=0,
string options="NULL", string filename="NULL",string geometry="NULL", int nowritefile=0,
string options="NULL", string filename="NULL",string geometry="NULL", int nowritefile=0, int nexus_bins=0,
string username1="NULL", string username2="NULL", string username3="NULL"
)
/* these are protected C variables */
Expand Down Expand Up @@ -369,7 +370,7 @@ INITIALIZE
if (!radius && !xwidth && !yheight && !zdepth && !xmin && !xmax && !ymin && !ymax && !strstr (Vars.option, "previous") && (!geometry || !strlen (geometry)))
exit (printf ("Monitor_nD: %s has no dimension specified. Aborting (radius, xwidth, yheight, zdepth, previous, geometry).\n", NAME_CURRENT_COMP));

Monitor_nD_Init (&DEFS, &Vars, xwidth, yheight, zdepth, xmin, xmax, ymin, ymax, zmin, zmax, offflag);
Monitor_nD_Init (&DEFS, &Vars, xwidth, yheight, zdepth, xmin, xmax, ymin, ymax, zmin, zmax, offflag, nexus_bins);

if (Vars.Flag_OFF) {
offdata.mantidflag = Vars.Flag_mantid;
Expand Down
5 changes: 3 additions & 2 deletions mcstas-comps/monitors/Monitor_nD_noacc.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@
* restore_neutron: [0|1] If set, the monitor does not influence the neutron state. Equivalent to setting the 'parallel' option.
* geometry: [str] Name of an OFF file to specify a complex geometry detector
* nowritefile: [1] If set, monitor will skip writing to disk
* nexus_bins: [1] NeXus mode only: store component BIN information <br>(-1 disable, 0 enable for list mode monitor, 1 enable for any montor)
*
* CALCULATED PARAMETERS:
*
Expand All @@ -235,7 +236,7 @@ SETTING PARAMETERS (
xwidth=0, yheight=0, zdepth=0,
xmin=0, xmax=0, ymin=0, ymax=0, zmin=0, zmax=0,
int bins=0, min=-1e40, max=1e40, int restore_neutron=0, radius=0,
string options="NULL", string filename="NULL",string geometry="NULL", int nowritefile=0,
string options="NULL", string filename="NULL",string geometry="NULL", int nowritefile=0, int nexus_bins=0,
string username1="NULL", string username2="NULL", string username3="NULL"
)
/* these are protected C variables */
Expand Down Expand Up @@ -370,7 +371,7 @@ INITIALIZE
if (!radius && !xwidth && !yheight && !zdepth && !xmin && !xmax && !ymin && !ymax && !strstr (Vars.option, "previous") && (!geometry || !strlen (geometry)))
exit (printf ("Monitor_nD: %s has no dimension specified. Aborting (radius, xwidth, yheight, zdepth, previous, geometry).\n", NAME_CURRENT_COMP));

Monitor_nd_noaccInit (&DEFS, &Vars, xwidth, yheight, zdepth, xmin, xmax, ymin, ymax, zmin, zmax, offflag);
Monitor_nD_Init (&DEFS, &Vars, xwidth, yheight, zdepth, xmin, xmax, ymin, ymax, zmin, zmax, offflag, nexus_bins);

if (Vars.Flag_OFF) {
offdata.mantidflag = Vars.Flag_mantid;
Expand Down
2 changes: 1 addition & 1 deletion mcstas-comps/monitors/Res_monitor.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ INITIALIZE %{
if (radius)
xwidth = 2*radius;

Monitor_nD_Init(&DEFS, &Vars, xwidth, yheight, zdepth, xmin, xmax, ymin, ymax, zmin, zmax, 0);
Monitor_nD_Init(&DEFS, &Vars, xwidth, yheight, zdepth, xmin, xmax, ymin, ymax, zmin, zmax, 0, 0);
Vars.Coord_Type[0] = DEFS.COORD_USERDOUBLE0; /* otherwise p is always the first variable */

if (Vars.Coord_Number != 11)
Expand Down
2 changes: 1 addition & 1 deletion mcstas-comps/monitors/TOFRes_monitor.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ INITIALIZE %{
if (radius)
xwidth = 2*radius;

Monitor_nD_Init(&DEFS, &Vars, xwidth, yheight, zdepth, xmin, xmax, ymin, ymax, zmin, zmax, 0);
Monitor_nD_Init(&DEFS, &Vars, xwidth, yheight, zdepth, xmin, xmax, ymin, ymax, zmin, zmax, 0, 0);
Vars.Coord_Type[0] = DEFS.COORD_USERDOUBLE0; /* otherwise p is always the first variable */

if (Vars.Coord_Number != 11)
Expand Down
2 changes: 1 addition & 1 deletion mcstas-comps/obsolete/Virtual_output.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ INITIALIZE
else strcpy(Vars.option, "list all borders");

strcat(Vars.option,", x y z vx vy vz t sx sy sz");
Monitor_nD_Init(&DEFS, &Vars, 0.1, 0.1, 0, 0,0,0,0,0,0,0); /* dims for mcdisplay */
Monitor_nD_Init(&DEFS, &Vars, 0.1, 0.1, 0, 0,0,0,0,0,0,0,0); /* dims for mcdisplay */
Vars.compcurpos = POS_A_CURRENT_COMP;

if (filename && strlen(filename) && strcmp(filename,"NULL") && strcmp(filename,"0"))
Expand Down
Loading
Loading