Skip to content

Commit 979a581

Browse files
committed
Shift to using double type (used internally in -lib and better for use with USERVARS)
1 parent 00c1553 commit 979a581

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

mcstas-comps/monitors/Monitor_nD.comp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ TRACE
405405
double t1 = 0;
406406
int pp;
407407
int intersect = 0;
408-
int pixID = -1; // Used to carry pixel ID from trace function to comp scope
408+
double pixID = -1; // Used to carry pixel ID from trace function to comp scope
409409
char Flag_Restore = 0;
410410

411411
#ifdef OPENACC

mcstas-comps/monitors/Monitor_nD_noacc.comp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ TRACE
408408
double t1 = 0;
409409
int pp;
410410
int intersect = 0;
411-
int pixID = -1; // Used to carry pixel ID from trace function to comp scope
411+
double pixID = -1; // Used to carry pixel ID from trace function to comp scope
412412
char Flag_Restore = 0;
413413

414414
#define thread_offdata offdata

mcstas-comps/share/monitor_nd-lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ void Monitor_nD_Init(MonitornD_Defines_type *DEFS,
10651065
/* return values: 0=neutron was absorbed, -1=neutron was outside bounds, 1=neutron was measured*/
10661066
/* ========================================================================= */
10671067

1068-
int Monitor_nD_Trace(MonitornD_Defines_type *DEFS, MonitornD_Variables_type *Vars, int *pixID, _class_particle* _particle)
1068+
int Monitor_nD_Trace(MonitornD_Defines_type *DEFS, MonitornD_Variables_type *Vars, double *pixID, _class_particle* _particle)
10691069
{
10701070

10711071
double XY=0, pp=0;

mcstas-comps/share/monitor_nd-lib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191

192192
void Monitor_nD_Init(MonitornD_Defines_type *, MonitornD_Variables_type *, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, int);
193193
#pragma acc routine
194-
int Monitor_nD_Trace(MonitornD_Defines_type *, MonitornD_Variables_type *, int *pixID, _class_particle* _particle);
194+
int Monitor_nD_Trace(MonitornD_Defines_type *, MonitornD_Variables_type *, double *pixID, _class_particle* _particle);
195195
MCDETECTOR Monitor_nD_Save(MonitornD_Defines_type *, MonitornD_Variables_type *);
196196
void Monitor_nD_Finally(MonitornD_Defines_type *, MonitornD_Variables_type *);
197197
void Monitor_nD_McDisplay(MonitornD_Defines_type *, MonitornD_Variables_type *);

mcstas-comps/share/monitor_nd_noacc-lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ void Monitor_nd_noaccInit(Monitornd_noaccDefines_type *DEFS,
989989
/* return values: 0=neutron was absorbed, -1=neutron was outside bounds, 1=neutron was measured*/
990990
/* ========================================================================= */
991991

992-
int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type *DEFS, Monitornd_noaccVariables_type *Vars, int *pixID, _class_particle* _particle)
992+
int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type *DEFS, Monitornd_noaccVariables_type *Vars, double *pixID, _class_particle* _particle)
993993
{
994994

995995
double XY=0, pp=0;

mcstas-comps/share/monitor_nd_noacc-lib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
/* ========================================================================= */
198198

199199
void Monitor_nd_noaccInit(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, MCNUM, int);
200-
int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *, int *pixID, _class_particle* _particle);
200+
int Monitor_nd_noaccTrace(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *, double *pixID, _class_particle* _particle);
201201
MCDETECTOR Monitor_nd_noaccSave(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *);
202202
void Monitor_nd_noaccFinally(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *);
203203
void Monitor_nd_noaccMcDisplay(Monitornd_noaccDefines_type *, Monitornd_noaccVariables_type *);

0 commit comments

Comments
 (0)