rename qudarap/QEvent.hh to qudarap/QEvt.hh to avoid name clash when using Geant4 with Qt viz driver that Nicola reports caused some vtable related crash

Author: simoncblyth

CSGOptiX/CSGOptiX.cc

@@ -76,7 +76,7 @@ HMM: looking like getting qudarap/qsim.h to work with OptiX < 7 is more effort t
 #include "QU.hh"
 #include "QSim.hh"
 #include "qsim.h"
-#include "QEvent.hh"
+#include "QEvt.hh"
 
 // CSGOptiX
 #include "Frame.h"
@@ -250,7 +250,7 @@ CSGOptiX::InitSim
 -------------------
 
 Invoked from CSGOptiX::Create
-Instanciation of QSim/QEvent requires an SEvt instance
+Instanciation of QSim/QEvt requires an SEvt instance
 
 **/
 
@@ -422,7 +422,7 @@ CSGOptiX::CSGOptiX(const CSGFoundry* foundry_)
     kernel_dt(0.),
     sctx(nullptr),
     sim(QSim::Get()),
-    event(sim == nullptr  ? nullptr : sim->event)
+    qev(sim == nullptr  ? nullptr : sim->qev)
 {
     init();
 }
@@ -436,7 +436,7 @@ void CSGOptiX::init()
         << " raygenmode " << raygenmode
         << " SRG::Name(raygenmode) " << SRG::Name(raygenmode)
         << " sim " << sim
-        << " event " << event
+        << " qev " << qev
         ;
 
     assert( outdir && "expecting OUTDIR envvar " );
@@ -550,7 +550,7 @@ Check (QSim)sim instance for non-render modes
 void CSGOptiX::initCheckSim()
 {
     if(SEventConfig::IsRGModeRender()) return ;
-    LOG(LEVEL) << " sim " << sim << " event " << event ;
+    LOG(LEVEL) << " sim " << sim << " qev " << qev ;
     LOG_IF(fatal, sim == nullptr) << "simtrace/simulate modes require instanciation of QSim before CSGOptiX " ;
     assert(sim);
 }
@@ -609,7 +609,7 @@ Q: where are sim and evt uploaded ?
 A: QSim::QSim and QSim::init_sim are where sim and evt are populated and uploaded
 
 
-HMM: get d_sim (qsim.h) now holds d_evt (qevent.h) but this is getting evt again rom QEvent ?
+HMM: get d_sim (qsim.h) now holds d_evt (sevent.h) but this is getting evt again rom QEvt ?
 TODO: eliminate params->evt to make more use of the qsim.h encapsulation
 
 **/
@@ -618,7 +618,7 @@ void CSGOptiX::initSimulate()
 {
     LOG(LEVEL) ;
     params->sim = sim ? sim->getDevicePtr() : nullptr ;  // qsim<float>*
-    params->evt = event ? event->getDevicePtr() : nullptr ;  // qevent*
+    params->evt = qev ? qev->getDevicePtr() : nullptr ;  // sevent*
 
     params->tmin0 = SEventConfig::PropagateEpsilon0() ;  // epsilon used after step points with flags in below mask
     params->PropagateEpsilon0Mask = SEventConfig::PropagateEpsilon0Mask();  // eg from CK|SI|TO|SC|RE
@@ -1002,7 +1002,7 @@ CSGOptiX::prepareParamSimulate
 
 Per-event simulate setup invoked just prior to optix launch
 
-QSim::get_photon_slot_offset/QEvent::get_photon_slot_offset returns
+QSim::get_photon_slot_offset/QEvt::get_photon_slot_offset returns
 
 **/
 
@@ -1072,22 +1072,22 @@ double CSGOptiX::launch()
     bool DEBUG_SKIP_LAUNCH = ssys::getenvbool("CSGOptiX__launch_DEBUG_SKIP_LAUNCH") ;
 
     prepareParam();
-    if(raygenmode != SRG_RENDER) assert(event) ;
+    if(raygenmode != SRG_RENDER) assert(qev) ;
 
     unsigned width = 0 ;
     unsigned height = 0 ;
     unsigned depth  = 0 ;
     switch(raygenmode)
     {
         case SRG_RENDER:    { width = params->width           ; height = params->height ; depth = params->depth ; } ; break ;
-        case SRG_SIMTRACE:  { width = event->getNumSimtrace() ; height = 1              ; depth = 1             ; } ; break ;
-        case SRG_SIMULATE:  { width = event->getNumPhoton()   ; height = 1              ; depth = 1             ; } ; break ;
+        case SRG_SIMTRACE:  { width = qev->getNumSimtrace() ; height = 1              ; depth = 1             ; } ; break ;
+        case SRG_SIMULATE:  { width = qev->getNumPhoton()   ; height = 1              ; depth = 1             ; } ; break ;
     }
 
     bool expect = width > 0 ;
     LOG_IF(fatal, !expect)
-        << " event.getNumSimtrace " << ( event ? event->getNumSimtrace() : -1 )
-        << " event.getNumPhoton   " << ( event ? event->getNumPhoton() : -1 )
+        << " qev.getNumSimtrace " << ( qev ? qev->getNumSimtrace() : -1 )
+        << " qev.getNumPhoton   " << ( qev ? qev->getNumPhoton() : -1 )
         << " width " << width
         << " height " << height
         << " depth " << depth

CSGOptiX/CSGOptiX.h

@@ -35,7 +35,7 @@ struct CSGView ;
 
 template <typename T> struct Tran ;
 struct QSim ;
-struct QEvent ;
+struct QEvt ;
 
 struct Params ;
 class Opticks ;
@@ -105,7 +105,7 @@ struct CSGOPTIX_API CSGOptiX : public SCSGOptiX
 
     scontext*    sctx ;
     QSim*        sim ;
-    QEvent*      event ;
+    QEvt*        qev ;
 
     const char* desc() const ;
 

CSGOptiX/Frame.cc

@@ -36,7 +36,7 @@ Instanciated by:
 Accepting device buffer pointer arguments was done to allow this 
 class to be used with OptiX 6 workflow optix::Buffer
 
-HMM: could use QEvent to hold the pixel, isect, photon ?
+HMM: could use QEvt to hold the pixel, isect, photon ?
 **/
 
 

CSGOptiX/cxs_min.sh

@@ -621,7 +621,7 @@ fi
 logging(){
     export CSGFoundry=INFO
     export CSGOptiX=INFO
-    export QEvent=INFO
+    export QEvt=INFO
     export QSim=INFO
     #export SEvt__LIFECYCLE=1
     export SEvt__GATHER=1

CSGOptiX/cxs_raindrop.sh

@@ -76,7 +76,7 @@ loglevels()
 {
     export Dummy=INFO
     #export SEvt=INFO
-    #export QEvent=INFO
+    #export QEvt=INFO
     #export QSim=INFO
 }
 loglevels

CSGOptiX/cxt_min.sh

@@ -207,7 +207,7 @@ export CEHIGH_1=-16:16:0:0:4:8:2000:4
 logging(){
     type $FUNCNAME
     export CSGOptiX=INFO
-    export QEvent=INFO
+    export QEvt=INFO
     #export QSim=INFO
     #export SFrameGenstep=INFO
     #export CSGTarget=INFO

CSGOptiX/cxt_precision.sh

@@ -81,7 +81,7 @@ export OPTICKS_INTEGRATION_MODE=1
 logging(){
     type $FUNCNAME
     #export CSGOptiX=INFO
-    #export QEvent=INFO
+    #export QEvt=INFO
     #export QSim=INFO
     #export SFrameGenstep=INFO
     #export CSGTarget=INFO

CSGOptiX/tests/CSGOptiXSimtraceTest.cc

@@ -37,7 +37,6 @@ is to be able to see the exact same geometry that the simulation is using.
 #include "SEvt.hh"
 #include "SFrameGenstep.hh"
 #include "SEventConfig.hh"
-#include "QEvent.hh"
 
 #include "OPTICKS_LOG.hh"
 #include "CSGFoundry.h"

CSGOptiX/tests/CXRaindropTest.cc

@@ -42,7 +42,7 @@ int main(int argc, char** argv)
 
     float4 ce = make_float4( 0.f, 0.f, 0.f, 100.f );  // TODO: this should come from the geometry
 
-    SEventConfig::SetMaxExtentDomain( ce.w );  // must do this config before QEvent::init which happens with CSGOptiX instanciation
+    SEventConfig::SetMaxExtentDomain( ce.w );  // must do this config before QEvt::init which happens with CSGOptiX instanciation
     SEventConfig::SetMaxTimeDomain( 10.f );
 
     CSGOptiX* cx = CSGOptiX::Create(fdl); // encumbent SSim used for QSim setup in here

g4cx/gxr.sh

@@ -1,12 +1,12 @@
-#!/bin/bash -l 
+#!/bin/bash
 usage(){ cat << EOU
-gxr.sh : G4CXRenderTest 
+gxr.sh : G4CXRenderTest
 =============================================================================================================
 
 ::
 
     cd ~/opticks/g4cx   # gx
-    ./gxr.sh 
+    ./gxr.sh
     ./gxr.sh run
     ./gxr.sh dbg
     ./gxr.sh grab
@@ -17,14 +17,14 @@ gxr.sh : G4CXRenderTest
 analog delta times more than 2% of total
 --------------------------------------------------
 
-See bin/log.py for logfile analysis with time filtering 
+See bin/log.py for logfile analysis with time filtering
 
 EOU
 }
 
 msg="=== $BASH_SOURCE :"
 
-case $(uname) in 
+case $(uname) in
   Linux)  defarg="run"  ;;
   Darwin) defarg="ls"  ;;
 esac
@@ -43,19 +43,19 @@ bin=G4CXRenderTest
 log=$bin.log
 gxrdir=$(dirname $BASH_SOURCE)
 
-source $gxrdir/../bin/COMMON.sh 
+source $gxrdir/../bin/COMMON.sh
 
 ## bin/COMMON sources bin/GEOM_.sh and bin/OPTICKS_INPUT_PHOTON.sh
 ## BUT the content of those is very user specific so have moved
-## geometry to $HOME/.opticks/GEOM/GEOM.sh 
-## THIS KINDA THING IS IN USERLAND BUT COULD SUGGEST 
+## geometry to $HOME/.opticks/GEOM/GEOM.sh
+## THIS KINDA THING IS IN USERLAND BUT COULD SUGGEST
 ## INPUT PHOTONS ALSO CONFIGURED IN THE SAME GEOM.sh FILE
-## OR FILES THAT THAT FILE SOURCES 
+## OR FILES THAT THAT FILE SOURCES
 
 
 eye=-0.4,0,0
 moi=-1
-export EYE=${EYE:-$eye} 
+export EYE=${EYE:-$eye}
 export MOI=${MOI:-$moi}
 
 
@@ -75,9 +75,9 @@ loglevels()
     export SSim=INFO
     export SBT=INFO
     export IAS_Builder=INFO
-    #export QEvent=INFO 
+    #export QEvt=INFO
     export CSGOptiX=INFO
-    export G4CXOpticks=INFO 
+    export G4CXOpticks=INFO
     export CSGFoundry=INFO
     #export GInstancer=INFO
     #export X4PhysicalVolume=INFO
@@ -88,64 +88,64 @@ loglevels
 
 
 
-if [ "run" == "$arg" ]; then 
-    echo $msg run $bin log $log 
-    if [ -f "$log" ]; then 
-       rm $log 
-    fi 
+if [ "run" == "$arg" ]; then
+    echo $msg run $bin log $log
+    if [ -f "$log" ]; then
+       rm $log
+    fi
 
     $bin
-    [ $? -ne 0 ] && echo $BASH_SOURCE run error && exit 1 
-fi 
+    [ $? -ne 0 ] && echo $BASH_SOURCE run error && exit 1
+fi
 
-if [ "dbg" == "$arg" ]; then 
+if [ "dbg" == "$arg" ]; then
     case $(uname) in
         Linux) gdb $bin -ex r  ;;
-        Darwin) lldb__ $bin ;; 
+        Darwin) lldb__ $bin ;;
     esac
-    [ $? -ne 0 ] && echo $BASH_SOURCE dbg error && exit 2 
+    [ $? -ne 0 ] && echo $BASH_SOURCE dbg error && exit 2
 fi
 
 
 if [ "grablog" == "$arg" ]; then
     scp P:opticks/g4cx/$log .
-fi 
+fi
 
-if [ "analog" == "$arg" ]; then 
-    echo $msg analog log $log 
-    if [ -f "$log" ]; then 
-        LOG=$log $gxrdir/../bin/log.sh 
-    fi 
-fi 
+if [ "analog" == "$arg" ]; then
+    echo $msg analog log $log
+    if [ -f "$log" ]; then
+        LOG=$log $gxrdir/../bin/log.sh
+    fi
+fi
 
 
-# FOLD is not an input to C++ running, but it is used by the below : ls ana grab jpg  
+# FOLD is not an input to C++ running, but it is used by the below : ls ana grab jpg
 export FOLD=/tmp/$USER/opticks/$GEOM/$bin
 name=cx$MOI.jpg
 path=$FOLD/$name
 
-if [ "ls" == "$arg" ]; then 
-   echo $msg FOLD $FOLD 
+if [ "ls" == "$arg" ]; then
+   echo $msg FOLD $FOLD
    echo $msg date $(date)
    ls -alst $FOLD
-fi 
+fi
 
-if [ "ana" == "$arg" ]; then 
+if [ "ana" == "$arg" ]; then
     export CFBASE=$FOLD
-    ${IPYTHON:-ipython} --pdb -i tests/$bin.py     
-    [ $? -ne 0 ] && echo $BASH_SOURCE ana error && exit 3 
-fi 
+    ${IPYTHON:-ipython} --pdb -i tests/$bin.py
+    [ $? -ne 0 ] && echo $BASH_SOURCE ana error && exit 3
+fi
 
-if [ "grab" == "$arg" ]; then 
+if [ "grab" == "$arg" ]; then
     source ../bin/rsync.sh $FOLD
-    open $path 
-fi 
+    open $path
+fi
 
-if [ "jpg" == "$arg" ]; then 
+if [ "jpg" == "$arg" ]; then
     mkdir -p $(dirname $path)
-    scp P:$path $path 
-    open $path 
-fi 
+    scp P:$path $path
+    open $path
+fi
 
-exit 0 
+exit 0