Extend Monitor_nD_Trace with "pixID" return value.

willend · willend · commit 1b656c56fba9 · 2025-08-07T14:34:16.000+02:00
diff --git a/mcstas-comps/contrib/PSD_Detector.comp b/mcstas-comps/contrib/PSD_Detector.comp
@@ -1118,7 +1118,7 @@ TRACE
 	      
 	      P2=P*P;
 
-              pp = Monitor_nD_Trace(&DEFS, &Vars, _particle);
+              pp = Monitor_nD_Trace(&DEFS, &Vars, NULL, _particle);
 	      #pragma acc atomic
               Vars.Nsum = Vars.Nsum + 1;
 	      #pragma acc atomic
diff --git a/mcstas-comps/monitors/Monitor_nD.comp b/mcstas-comps/monitors/Monitor_nD.comp
@@ -405,6 +405,7 @@ TRACE
   double  t1 = 0;
   int     pp;
   int     intersect   = 0;
+  int     pixID = -1; // Used to carry pixel ID from trace function to comp scope
   char    Flag_Restore = 0;
 
   #ifdef OPENACC
@@ -573,7 +574,7 @@ TRACE
       p = p * multiplier_capture/1.7985;
     }
 
-    pp = Monitor_nD_Trace(&DEFS, &Vars, _particle);
+    pp = Monitor_nD_Trace(&DEFS, &Vars, &pixID, _particle);
     if (pp==0.0)
     {
       ABSORB;
diff --git a/mcstas-comps/monitors/Monitor_nD_noacc.comp b/mcstas-comps/monitors/Monitor_nD_noacc.comp
@@ -408,6 +408,7 @@ TRACE
   double  t1 = 0;
   int     pp;
   int     intersect   = 0;
+  int     pixID = -1; // Used to carry pixel ID from trace function to comp scope
   char    Flag_Restore = 0;
 
   #define thread_offdata offdata
@@ -568,7 +569,7 @@ TRACE
       p = p * multiplier_capture/1.7985;
     }
 
-    pp = Monitor_nd_noaccTrace(&DEFS, &Vars, _particle);
+    pp = Monitor_nd_noaccTrace(&DEFS, &Vars, &pixID, _particle);
     if (pp==0.0)
     {
       ABSORB;
diff --git a/mcstas-comps/monitors/Res_monitor.comp b/mcstas-comps/monitors/Res_monitor.comp
@@ -299,7 +299,7 @@ TRACE %{
         Vars.UserDoubles[9] = event_pi;
         Vars.UserDoubles[10] = event_pf;
 
-        Monitor_nD_Trace(&DEFS, &Vars, _particle);
+        Monitor_nD_Trace(&DEFS, &Vars, NULL, _particle);
 
         /* live calculation */
         if(live_calc) {
diff --git a/mcstas-comps/monitors/TOFRes_monitor.comp b/mcstas-comps/monitors/TOFRes_monitor.comp
@@ -299,7 +299,7 @@ TRACE %{
         Vars.UserDoubles[9] = event_pi;
         Vars.UserDoubles[10] = event_pf;
 
-        Monitor_nD_Trace(&DEFS, &Vars, _particle);
+        Monitor_nD_Trace(&DEFS, &Vars, NULL, _particle);
 
         /* live calculation */
         if(live_calc) {
diff --git a/mcstas-comps/obsolete/Virtual_output.comp b/mcstas-comps/obsolete/Virtual_output.comp
@@ -117,7 +117,7 @@ TRACE
   Vars.csz = sz;
   Vars.ct  = t; */
 
-  pp = Monitor_nD_Trace(&DEFS, &Vars, _particle);
+  pp = Monitor_nD_Trace(&DEFS, &Vars, NULL, _particle);
 
   SCATTER;
 %}
diff --git a/mcstas-comps/parked/Test_Monitor_Sqw/Monitor_Sqw.comp b/mcstas-comps/parked/Test_Monitor_Sqw/Monitor_Sqw.comp
@@ -273,7 +273,7 @@ TRACE
     Vars.csz = sz;
     Vars.ct  = t; */
 
-    pp = Monitor_nD_Trace(&DEFS, &Vars, _particle);
+    pp = Monitor_nD_Trace(&DEFS, &Vars, NULL, _particle);
     SCATTER;
 
   } /* end if intersection */
diff --git a/mcstas-comps/share/monitor_nd-lib.c b/mcstas-comps/share/monitor_nd-lib.c
@@ -1065,7 +1065,7 @@ void Monitor_nD_Init(MonitornD_Defines_type *DEFS,
 /* return values: 0=neutron was absorbed, -1=neutron was outside bounds, 1=neutron was measured*/
 /* ========================================================================= */
 
-int Monitor_nD_Trace(MonitornD_Defines_type *DEFS, MonitornD_Variables_type *Vars, _class_particle* _particle)
+int Monitor_nD_Trace(MonitornD_Defines_type *DEFS, MonitornD_Variables_type *Vars, int *pixID _class_particle* _particle)
 {
 
   double  XY=0, pp=0;
@@ -1178,6 +1178,7 @@ int Monitor_nD_Trace(MonitornD_Defines_type *DEFS, MonitornD_Variables_type *Var
             }
             if (!flag_outside) {
               Vars->Mon2D_Buffer[i+While_Buffer*(Vars->Coord_Number+1)] = Coord[i];
+	      pixID=Coord[i];
             }
           } /* end if PixelID */
         }
diff --git a/mcstas-comps/share/monitor_nd-lib.h b/mcstas-comps/share/monitor_nd-lib.h
@@ -191,7 +191,7 @@
 
 void Monitor_nD_Init(MonitornD_Defines_type *, MonitornD_Variables_type *, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, int);
 #pragma acc routine
-int Monitor_nD_Trace(MonitornD_Defines_type *, MonitornD_Variables_type *, _class_particle* _particle);
+int Monitor_nD_Trace(MonitornD_Defines_type *, MonitornD_Variables_type *, int *pixID, _class_particle* _particle);
 MCDETECTOR Monitor_nD_Save(MonitornD_Defines_type *, MonitornD_Variables_type *);
 void Monitor_nD_Finally(MonitornD_Defines_type *, MonitornD_Variables_type *);
 void Monitor_nD_McDisplay(MonitornD_Defines_type *, MonitornD_Variables_type *);
diff --git a/mcstas-comps/share/monitor_nd_noacc-lib.c b/mcstas-comps/share/monitor_nd_noacc-lib.c
@@ -895,7 +895,6 @@ void Monitor_nd_noaccInit(Monitornd_noaccDefines_type *DEFS,
     	}
 	  
     	long k,l,m;
-	  
     	if (N_spatial_dims==1) { // 1D case or ND
     	  detector.m=numbins;
     	  detector.n=1;
@@ -990,7 +989,7 @@ void Monitor_nd_noaccInit(Monitornd_noaccDefines_type *DEFS,
 /* return values: 0=neutron was absorbed, -1=neutron was outside bounds, 1=neutron was measured*/
 /* ========================================================================= */
 
-int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type *DEFS, Monitornd_noaccVariables_type *Vars, _class_particle* _particle)
+int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type *DEFS, Monitornd_noaccVariables_type *Vars, int *pixID, _class_particle* _particle)
 {
 
   double  XY=0, pp=0;
@@ -1103,6 +1102,7 @@ int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type *DEFS, Monitornd_noaccVari
             }
             if (!flag_outside) {
               Vars->Mon2D_Buffer[i+While_Buffer*(Vars->Coord_Number+1)] = Coord[i];
+	      pixID=Coord[i];
             }
           } /* end if PixelID */
         }
diff --git a/mcstas-comps/share/monitor_nd_noacc-lib.h b/mcstas-comps/share/monitor_nd_noacc-lib.h
@@ -197,7 +197,7 @@
 /* ========================================================================= */
 
 void Monitor_nd_noaccInit(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, int);
-int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *, _class_particle* _particle);
+int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *, int *pixID, _class_particle* _particle);
 MCDETECTOR Monitor_nd_noaccSave(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *);
 void Monitor_nd_noaccFinally(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *);
 void Monitor_nd_noaccMcDisplay(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *);
diff --git a/mcstas-comps/union/Union_abs_logger_1D_space_event.comp b/mcstas-comps/union/Union_abs_logger_1D_space_event.comp
@@ -316,7 +316,7 @@ void record_to_perm_abs_1D_event(Coords *position, double *k, double p, double t
     _localparticle.t  = time;
 
     int pp;
-    pp = Monitor_nD_Trace(&(storage->DEFS), &(storage->Vars), &_localparticle);
+    pp = Monitor_nD_Trace(&(storage->DEFS), &(storage->Vars), NULL, &_localparticle);
 
   }
 
diff --git a/mcstas-comps/union/Union_abs_logger_event.comp b/mcstas-comps/union/Union_abs_logger_event.comp
@@ -401,7 +401,7 @@ void record_to_perm_abs_event(Coords *position, double *k, double p, double time
     _localparticle.t  = time;
     
     int pp;
-    pp = Monitor_nD_Trace(&(storage->DEFS), &(storage->Vars), &_localparticle);
+    pp = Monitor_nD_Trace(&(storage->DEFS), &(storage->Vars), NULL, &_localparticle);
     
   }
 
diff --git a/mcstas-comps/union/Union_abs_logger_nD.comp b/mcstas-comps/union/Union_abs_logger_nD.comp
@@ -308,7 +308,7 @@ void record_to_perm_abs_nD(Coords *position, double *k, double p, double time, i
     _localparticle.t  = time;
     
     int pp;
-    pp = Monitor_nD_Trace(storage->p_DEFS, storage->p_Vars, &_localparticle);
+    pp = Monitor_nD_Trace(storage->p_DEFS, storage->p_Vars, NULL, &_localparticle);
     
   }
 

Original file line number	Diff line number	Diff line change
`@@ -405,6 +405,7 @@ TRACE`
`405`	`405`	`double t1 = 0;`
`406`	`406`	`int pp;`
`407`	`407`	`int intersect = 0;`
	`408`	`+ int pixID = -1; // Used to carry pixel ID from trace function to comp scope`
`408`	`409`	`char Flag_Restore = 0;`
`409`	`410`
`410`	`411`	`#ifdef OPENACC`
`@@ -573,7 +574,7 @@ TRACE`
`573`	`574`	`p = p * multiplier_capture/1.7985;`
`574`	`575`	`}`
`575`	`576`
`576`		`- pp = Monitor_nD_Trace(&DEFS, &Vars, _particle);`
	`577`	`+ pp = Monitor_nD_Trace(&DEFS, &Vars, &pixID, _particle);`
`577`	`578`	`if (pp==0.0)`
`578`	`579`	`{`
`579`	`580`	`ABSORB;`
Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,7 @@ TRACE`
`408`	`408`	`double t1 = 0;`
`409`	`409`	`int pp;`
`410`	`410`	`int intersect = 0;`
	`411`	`+ int pixID = -1; // Used to carry pixel ID from trace function to comp scope`
`411`	`412`	`char Flag_Restore = 0;`
`412`	`413`
`413`	`414`	`#define thread_offdata offdata`
`@@ -568,7 +569,7 @@ TRACE`
`568`	`569`	`p = p * multiplier_capture/1.7985;`
`569`	`570`	`}`
`570`	`571`
`571`		`- pp = Monitor_nd_noaccTrace(&DEFS, &Vars, _particle);`
	`572`	`+ pp = Monitor_nd_noaccTrace(&DEFS, &Vars, &pixID, _particle);`
`572`	`573`	`if (pp==0.0)`
`573`	`574`	`{`
`574`	`575`	`ABSORB;`
Original file line number	Diff line number	Diff line change
`@@ -1065,7 +1065,7 @@ void Monitor_nD_Init(MonitornD_Defines_type *DEFS,`
`1065`	`1065`	`/* return values: 0=neutron was absorbed, -1=neutron was outside bounds, 1=neutron was measured*/`
`1066`	`1066`	`/* ========================================================================= */`
`1067`	`1067`
`1068`		`-int Monitor_nD_Trace(MonitornD_Defines_type DEFS, MonitornD_Variables_type Vars, _class_particle* _particle)`
	`1068`	`+int Monitor_nD_Trace(MonitornD_Defines_type DEFS, MonitornD_Variables_type Vars, int pixID _class_particle _particle)`
`1069`	`1069`	`{`
`1070`	`1070`
`1071`	`1071`	`double XY=0, pp=0;`
`@@ -1178,6 +1178,7 @@ int Monitor_nD_Trace(MonitornD_Defines_type DEFS, MonitornD_Variables_type Var`
`1178`	`1178`	`}`
`1179`	`1179`	`if (!flag_outside) {`
`1180`	`1180`	`Vars->Mon2D_Buffer[i+While_Buffer*(Vars->Coord_Number+1)] = Coord[i];`
	`1181`	`+ pixID=Coord[i];`
`1181`	`1182`	`}`
`1182`	`1183`	`} /* end if PixelID */`
`1183`	`1184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,6 @@ void Monitor_nd_noaccInit(Monitornd_noaccDefines_type *DEFS,`
`895`	`895`	`}`
`896`	`896`
`897`	`897`	`long k,l,m;`
`898`		`-`
`899`	`898`	`if (N_spatial_dims==1) { // 1D case or ND`
`900`	`899`	`detector.m=numbins;`
`901`	`900`	`detector.n=1;`
`@@ -990,7 +989,7 @@ void Monitor_nd_noaccInit(Monitornd_noaccDefines_type *DEFS,`
`990`	`989`	`/* return values: 0=neutron was absorbed, -1=neutron was outside bounds, 1=neutron was measured*/`
`991`	`990`	`/* ========================================================================= */`
`992`	`991`
`993`		`-int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type DEFS, Monitornd_noaccVariables_type Vars, _class_particle* _particle)`
	`992`	`+int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type DEFS, Monitornd_noaccVariables_type Vars, int pixID, _class_particle _particle)`
`994`	`993`	`{`
`995`	`994`
`996`	`995`	`double XY=0, pp=0;`
`@@ -1103,6 +1102,7 @@ int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type *DEFS, Monitornd_noaccVari`
`1103`	`1102`	`}`
`1104`	`1103`	`if (!flag_outside) {`
`1105`	`1104`	`Vars->Mon2D_Buffer[i+While_Buffer*(Vars->Coord_Number+1)] = Coord[i];`
	`1105`	`+ pixID=Coord[i];`
`1106`	`1106`	`}`
`1107`	`1107`	`} /* end if PixelID */`
`1108`	`1108`	`}`