Merge pull request #2387 from willend/Monitor_nD_nexusbins_only_listmode

McStas Monitor_nD “nexusbins” only in listmode

Author: willend

mcstas-comps/contrib/PSD_Detector.comp

@@ -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);
 

mcstas-comps/contrib/StatisticalChopper_Monitor.comp

@@ -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

mcstas-comps/monitors/Monitor_nD.comp

@@ -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:
 *
@@ -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 */
@@ -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;

mcstas-comps/monitors/Monitor_nD_noacc.comp

@@ -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:
 *
@@ -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 */
@@ -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;

mcstas-comps/monitors/Res_monitor.comp

@@ -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)

mcstas-comps/monitors/TOFRes_monitor.comp

@@ -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)

mcstas-comps/obsolete/Virtual_output.comp

@@ -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"))