Feat/analysis tools#273
Open
ggalgoczi wants to merge 17 commits into
Open
Conversation
Plots GPU photon paths from record.npy colored by wavelength. Supports custom photon selection, sphere overlays, and wavelength colorbar. Useful for visualizing WLS conversion and Rayleigh scattering in optical simulations.
Runs GPURaytrace, collects GPU and G4 hits, and generates 6 comparison plots: hit count, shifted wavelength, full wavelength, bulk arrival time, full arrival time, and 3D hit positions. All with sqrt(N) error bars. Can also run on pre-existing .npy files without re-simulating.
Shows number of optical boundary/surface steps each detected photon takes before reaching the SiPM. GPU steps from record.npy, G4 steps from extended hit array (when available). Uses sqrt(N) error bars.
Print a note when running simulations that DebugLite mode is needed in the config JSON for step count plots, while HitPhoton is sufficient for hit-only analysis.
Side-by-side comparison of opticks GPU and standalone G4 simulation hits. Prints stats table (wavelength, time, position), statistical significance test, and optional wavelength/time distribution histograms (--histograms).
LAr scintillator tile with two-stage WLS readout (pTP + blue WLS acrylic), 30 SiPMs along edge, Vikuiti reflective foil wrapping. Includes EFFICIENCY and SensDet tags for SiPM hit collection.
When savephotonhistory=true in config JSON, saves full SEvt arrays (photon, record, seq, hit) plus gpu_hits.npy and g4_hits.npy for distribution comparison. G4 hits collected via thread-safe accumulator in EndOfEventAction. GPURaytrace now accepts -c config flag.
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Cpp-linter Review
Used clang-format v20.1.2
Click here for the full clang-format patch
diff --git a/src/GPURaytrace.cpp b/src/GPURaytrace.cpp
index ddc3f49..9126d17 100644
--- a/src/GPURaytrace.cpp
+++ b/src/GPURaytrace.cpp
@@ -72,4 +72,4 @@ int main(int argc, char **argv)
- program.add_argument("-c", "--config")
- .help("config file name (without .json extension)")
- .default_value(string(""))
- .nargs(1);
+ program.add_argument( "-c", "--config" )
+ .help( "config file name (without .json extension)" )
+ .default_value( string( "" ) )
+ .nargs( 1 );
@@ -118,2 +118,2 @@ int main(int argc, char **argv)
- string config_name = program.get<string>("--config");
- if (!config_name.empty())
+ string config_name = program.get<string>( "--config" );
+ if( !config_name.empty() )
@@ -121 +121 @@ int main(int argc, char **argv)
- gphox::Config cfg(config_name);
+ gphox::Config cfg( config_name );
diff --git a/src/GPURaytrace.h b/src/GPURaytrace.h
index 958777d..906740f 100644
--- a/src/GPURaytrace.h
+++ b/src/GPURaytrace.h
@@ -51 +51 @@ G4Mutex genstep_mutex = G4MUTEX_INITIALIZER;
-G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER;
+G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER;
@@ -309 +309 @@ struct PrimaryGenerator : G4VUserPrimaryGeneratorAction
- particle->SetKineticEnergy(10 * MeV);
+ particle->SetKineticEnergy( 10 * MeV );
@@ -337 +337,2 @@ struct EventAction : G4UserEventAction
- if (!hc) continue;
+ if( !hc )
+ continue;
@@ -339,2 +340,2 @@ struct EventAction : G4UserEventAction
- PhotonHitsCollection *phc = dynamic_cast<PhotonHitsCollection*>(hc);
- if (phc)
+ PhotonHitsCollection *phc = dynamic_cast<PhotonHitsCollection *>( hc );
+ if( phc )
@@ -342,2 +343,2 @@ struct EventAction : G4UserEventAction
- G4AutoLock lock(&g4hits_mutex);
- for (size_t j = 0; j < phc->entries(); j++)
+ G4AutoLock lock( &g4hits_mutex );
+ for( size_t j = 0; j < phc->entries(); j++ )
@@ -345,8 +346,6 @@ struct EventAction : G4UserEventAction
- PhotonHit* hit = (*phc)[j];
- float wl = 1239.84198f / static_cast<float>(hit->fenergy);
- g4_accumulated_hits.push_back({
- float(hit->fposition.x()), float(hit->fposition.y()), float(hit->fposition.z()), float(hit->ftime),
- float(hit->fdirection.x()), float(hit->fdirection.y()), float(hit->fdirection.z()), 0.f,
- float(hit->fpolarization.x()), float(hit->fpolarization.y()), float(hit->fpolarization.z()), wl,
- 0.f, 0.f, 0.f, 0.f
- });
+ PhotonHit *hit = ( *phc )[j];
+ float wl = 1239.84198f / static_cast<float>( hit->fenergy );
+ g4_accumulated_hits.push_back( { float( hit->fposition.x() ), float( hit->fposition.y() ), float( hit->fposition.z() ), float( hit->ftime ),
+ float( hit->fdirection.x() ), float( hit->fdirection.y() ), float( hit->fdirection.z() ), 0.f,
+ float( hit->fpolarization.x() ), float( hit->fpolarization.y() ), float( hit->fpolarization.z() ), wl,
+ 0.f, 0.f, 0.f, 0.f } );
@@ -373 +372 @@ struct RunAction : G4UserRunAction
- bool fSavePhotonHistory{false};
+ bool fSavePhotonHistory{ false };
@@ -406 +405 @@ struct RunAction : G4UserRunAction
- if (fSavePhotonHistory)
+ if( fSavePhotonHistory )
@@ -414,2 +413,2 @@ struct RunAction : G4UserRunAction
- NP* gpu_h = NP::Make<float>(num_hits, 4, 4);
- for (unsigned idx = 0; idx < num_hits; idx++)
+ NP *gpu_h = NP::Make<float>( num_hits, 4, 4 );
+ for( unsigned idx = 0; idx < num_hits; idx++ )
@@ -418,2 +417,2 @@ struct RunAction : G4UserRunAction
- sev->getHit(hit, idx);
- memcpy(gpu_h->bytes() + idx * sizeof(sphoton), &hit, sizeof(sphoton));
+ sev->getHit( hit, idx );
+ memcpy( gpu_h->bytes() + idx * sizeof( sphoton ), &hit, sizeof( sphoton ) );
@@ -421 +420 @@ struct RunAction : G4UserRunAction
- gpu_h->save("gpu_hits.npy");
+ gpu_h->save( "gpu_hits.npy" );
@@ -427,3 +426,3 @@ struct RunAction : G4UserRunAction
- G4AutoLock lock(&g4hits_mutex);
- size_t ng4 = g4_accumulated_hits.size();
- if (ng4 > 0)
+ G4AutoLock lock( &g4hits_mutex );
+ size_t ng4 = g4_accumulated_hits.size();
+ if( ng4 > 0 )
@@ -431,3 +430,3 @@ struct RunAction : G4UserRunAction
- NP* g4h = NP::Make<float>(ng4, 4, 4);
- memcpy(g4h->bytes(), g4_accumulated_hits.data(), ng4 * 16 * sizeof(float));
- g4h->save("g4_hits.npy");
+ NP *g4h = NP::Make<float>( ng4, 4, 4 );
+ memcpy( g4h->bytes(), g4_accumulated_hits.data(), ng4 * 16 * sizeof( float ) );
+ g4h->save( "g4_hits.npy" );
diff --git a/src/config.cpp b/src/config.cpp
index 26cb221..312268d 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -140,2 +140,2 @@ void Config::ReadConfig(std::string filepath)
- if (event_.contains("savephotonhistory"))
- savephotonhistory = event_["savephotonhistory"].get<bool>();
+ if( event_.contains( "savephotonhistory" ) )
+ savephotonhistory = event_["savephotonhistory"].get<bool>();
diff --git a/src/config.h b/src/config.h
index 3dc2c1e..cbebea7 100644
--- a/src/config.h
+++ b/src/config.h
@@ -29 +29 @@ class Config
- bool savephotonhistory{false};
+ bool savephotonhistory{ false };
@@ -31 +31 @@ class Config
- private:
+private:
Have any feedback or feature suggestions? Share it here.
Comment on lines
+72
to
+75
| program.add_argument("-c", "--config") | ||
| .help("config file name (without .json extension)") | ||
| .default_value(string("")) | ||
| .nargs(1); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| program.add_argument("-c", "--config") | |
| .help("config file name (without .json extension)") | |
| .default_value(string("")) | |
| .nargs(1); | |
| program.add_argument( "-c", "--config" ) | |
| .help( "config file name (without .json extension)" ) | |
| .default_value( string( "" ) ) | |
| .nargs( 1 ); |
Comment on lines
+118
to
+119
| string config_name = program.get<string>("--config"); | ||
| if (!config_name.empty()) |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| string config_name = program.get<string>("--config"); | |
| if (!config_name.empty()) | |
| string config_name = program.get<string>( "--config" ); | |
| if( !config_name.empty() ) |
| string config_name = program.get<string>("--config"); | ||
| if (!config_name.empty()) | ||
| { | ||
| gphox::Config cfg(config_name); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| gphox::Config cfg(config_name); | |
| gphox::Config cfg( config_name ); |
| namespace | ||
| { | ||
| G4Mutex genstep_mutex = G4MUTEX_INITIALIZER; | ||
| G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER; |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER; | |
| G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER; |
Comment on lines
+427
to
+429
| G4AutoLock lock(&g4hits_mutex); | ||
| size_t ng4 = g4_accumulated_hits.size(); | ||
| if (ng4 > 0) |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| G4AutoLock lock(&g4hits_mutex); | |
| size_t ng4 = g4_accumulated_hits.size(); | |
| if (ng4 > 0) | |
| G4AutoLock lock( &g4hits_mutex ); | |
| size_t ng4 = g4_accumulated_hits.size(); | |
| if( ng4 > 0 ) |
Comment on lines
+140
to
+141
| if (event_.contains("savephotonhistory")) | ||
| savephotonhistory = event_["savephotonhistory"].get<bool>(); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| if (event_.contains("savephotonhistory")) | |
| savephotonhistory = event_["savephotonhistory"].get<bool>(); | |
| if( event_.contains( "savephotonhistory" ) ) | |
| savephotonhistory = event_["savephotonhistory"].get<bool>(); |
Closed
Plot both datasets at true bin centers instead of shifting ±17.5% of bin width for readability.
Contributor
There was a problem hiding this comment.
Cpp-linter Review
Used clang-format v20.1.2
Click here for the full clang-format patch
diff --git a/src/GPURaytrace.cpp b/src/GPURaytrace.cpp
index ddc3f49..9126d17 100644
--- a/src/GPURaytrace.cpp
+++ b/src/GPURaytrace.cpp
@@ -72,4 +72,4 @@ int main(int argc, char **argv)
- program.add_argument("-c", "--config")
- .help("config file name (without .json extension)")
- .default_value(string(""))
- .nargs(1);
+ program.add_argument( "-c", "--config" )
+ .help( "config file name (without .json extension)" )
+ .default_value( string( "" ) )
+ .nargs( 1 );
@@ -118,2 +118,2 @@ int main(int argc, char **argv)
- string config_name = program.get<string>("--config");
- if (!config_name.empty())
+ string config_name = program.get<string>( "--config" );
+ if( !config_name.empty() )
@@ -121 +121 @@ int main(int argc, char **argv)
- gphox::Config cfg(config_name);
+ gphox::Config cfg( config_name );
diff --git a/src/GPURaytrace.h b/src/GPURaytrace.h
index 958777d..906740f 100644
--- a/src/GPURaytrace.h
+++ b/src/GPURaytrace.h
@@ -51 +51 @@ G4Mutex genstep_mutex = G4MUTEX_INITIALIZER;
-G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER;
+G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER;
@@ -309 +309 @@ struct PrimaryGenerator : G4VUserPrimaryGeneratorAction
- particle->SetKineticEnergy(10 * MeV);
+ particle->SetKineticEnergy( 10 * MeV );
@@ -337 +337,2 @@ struct EventAction : G4UserEventAction
- if (!hc) continue;
+ if( !hc )
+ continue;
@@ -339,2 +340,2 @@ struct EventAction : G4UserEventAction
- PhotonHitsCollection *phc = dynamic_cast<PhotonHitsCollection*>(hc);
- if (phc)
+ PhotonHitsCollection *phc = dynamic_cast<PhotonHitsCollection *>( hc );
+ if( phc )
@@ -342,2 +343,2 @@ struct EventAction : G4UserEventAction
- G4AutoLock lock(&g4hits_mutex);
- for (size_t j = 0; j < phc->entries(); j++)
+ G4AutoLock lock( &g4hits_mutex );
+ for( size_t j = 0; j < phc->entries(); j++ )
@@ -345,8 +346,6 @@ struct EventAction : G4UserEventAction
- PhotonHit* hit = (*phc)[j];
- float wl = 1239.84198f / static_cast<float>(hit->fenergy);
- g4_accumulated_hits.push_back({
- float(hit->fposition.x()), float(hit->fposition.y()), float(hit->fposition.z()), float(hit->ftime),
- float(hit->fdirection.x()), float(hit->fdirection.y()), float(hit->fdirection.z()), 0.f,
- float(hit->fpolarization.x()), float(hit->fpolarization.y()), float(hit->fpolarization.z()), wl,
- 0.f, 0.f, 0.f, 0.f
- });
+ PhotonHit *hit = ( *phc )[j];
+ float wl = 1239.84198f / static_cast<float>( hit->fenergy );
+ g4_accumulated_hits.push_back( { float( hit->fposition.x() ), float( hit->fposition.y() ), float( hit->fposition.z() ), float( hit->ftime ),
+ float( hit->fdirection.x() ), float( hit->fdirection.y() ), float( hit->fdirection.z() ), 0.f,
+ float( hit->fpolarization.x() ), float( hit->fpolarization.y() ), float( hit->fpolarization.z() ), wl,
+ 0.f, 0.f, 0.f, 0.f } );
@@ -373 +372 @@ struct RunAction : G4UserRunAction
- bool fSavePhotonHistory{false};
+ bool fSavePhotonHistory{ false };
@@ -406 +405 @@ struct RunAction : G4UserRunAction
- if (fSavePhotonHistory)
+ if( fSavePhotonHistory )
@@ -414,2 +413,2 @@ struct RunAction : G4UserRunAction
- NP* gpu_h = NP::Make<float>(num_hits, 4, 4);
- for (unsigned idx = 0; idx < num_hits; idx++)
+ NP *gpu_h = NP::Make<float>( num_hits, 4, 4 );
+ for( unsigned idx = 0; idx < num_hits; idx++ )
@@ -418,2 +417,2 @@ struct RunAction : G4UserRunAction
- sev->getHit(hit, idx);
- memcpy(gpu_h->bytes() + idx * sizeof(sphoton), &hit, sizeof(sphoton));
+ sev->getHit( hit, idx );
+ memcpy( gpu_h->bytes() + idx * sizeof( sphoton ), &hit, sizeof( sphoton ) );
@@ -421 +420 @@ struct RunAction : G4UserRunAction
- gpu_h->save("gpu_hits.npy");
+ gpu_h->save( "gpu_hits.npy" );
@@ -427,3 +426,3 @@ struct RunAction : G4UserRunAction
- G4AutoLock lock(&g4hits_mutex);
- size_t ng4 = g4_accumulated_hits.size();
- if (ng4 > 0)
+ G4AutoLock lock( &g4hits_mutex );
+ size_t ng4 = g4_accumulated_hits.size();
+ if( ng4 > 0 )
@@ -431,3 +430,3 @@ struct RunAction : G4UserRunAction
- NP* g4h = NP::Make<float>(ng4, 4, 4);
- memcpy(g4h->bytes(), g4_accumulated_hits.data(), ng4 * 16 * sizeof(float));
- g4h->save("g4_hits.npy");
+ NP *g4h = NP::Make<float>( ng4, 4, 4 );
+ memcpy( g4h->bytes(), g4_accumulated_hits.data(), ng4 * 16 * sizeof( float ) );
+ g4h->save( "g4_hits.npy" );
diff --git a/src/config.cpp b/src/config.cpp
index 26cb221..312268d 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -140,2 +140,2 @@ void Config::ReadConfig(std::string filepath)
- if (event_.contains("savephotonhistory"))
- savephotonhistory = event_["savephotonhistory"].get<bool>();
+ if( event_.contains( "savephotonhistory" ) )
+ savephotonhistory = event_["savephotonhistory"].get<bool>();
diff --git a/src/config.h b/src/config.h
index 3dc2c1e..cbebea7 100644
--- a/src/config.h
+++ b/src/config.h
@@ -29 +29 @@ class Config
- bool savephotonhistory{false};
+ bool savephotonhistory{ false };
@@ -31 +31 @@ class Config
- private:
+private:
Have any feedback or feature suggestions? Share it here.
Comment on lines
+72
to
+75
| program.add_argument("-c", "--config") | ||
| .help("config file name (without .json extension)") | ||
| .default_value(string("")) | ||
| .nargs(1); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| program.add_argument("-c", "--config") | |
| .help("config file name (without .json extension)") | |
| .default_value(string("")) | |
| .nargs(1); | |
| program.add_argument( "-c", "--config" ) | |
| .help( "config file name (without .json extension)" ) | |
| .default_value( string( "" ) ) | |
| .nargs( 1 ); |
Comment on lines
+118
to
+119
| string config_name = program.get<string>("--config"); | ||
| if (!config_name.empty()) |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| string config_name = program.get<string>("--config"); | |
| if (!config_name.empty()) | |
| string config_name = program.get<string>( "--config" ); | |
| if( !config_name.empty() ) |
| string config_name = program.get<string>("--config"); | ||
| if (!config_name.empty()) | ||
| { | ||
| gphox::Config cfg(config_name); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| gphox::Config cfg(config_name); | |
| gphox::Config cfg( config_name ); |
| namespace | ||
| { | ||
| G4Mutex genstep_mutex = G4MUTEX_INITIALIZER; | ||
| G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER; |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER; | |
| G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER; |
Comment on lines
+427
to
+429
| G4AutoLock lock(&g4hits_mutex); | ||
| size_t ng4 = g4_accumulated_hits.size(); | ||
| if (ng4 > 0) |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| G4AutoLock lock(&g4hits_mutex); | |
| size_t ng4 = g4_accumulated_hits.size(); | |
| if (ng4 > 0) | |
| G4AutoLock lock( &g4hits_mutex ); | |
| size_t ng4 = g4_accumulated_hits.size(); | |
| if( ng4 > 0 ) |
The 10 MeV change was for APEX validation and belongs on the physics branch, not analysis-tools.
Contributor
There was a problem hiding this comment.
Cpp-linter Review
Used clang-format v20.1.2
Click here for the full clang-format patch
diff --git a/src/GPURaytrace.cpp b/src/GPURaytrace.cpp
index ddc3f49..9126d17 100644
--- a/src/GPURaytrace.cpp
+++ b/src/GPURaytrace.cpp
@@ -72,4 +72,4 @@ int main(int argc, char **argv)
- program.add_argument("-c", "--config")
- .help("config file name (without .json extension)")
- .default_value(string(""))
- .nargs(1);
+ program.add_argument( "-c", "--config" )
+ .help( "config file name (without .json extension)" )
+ .default_value( string( "" ) )
+ .nargs( 1 );
@@ -118,2 +118,2 @@ int main(int argc, char **argv)
- string config_name = program.get<string>("--config");
- if (!config_name.empty())
+ string config_name = program.get<string>( "--config" );
+ if( !config_name.empty() )
@@ -121 +121 @@ int main(int argc, char **argv)
- gphox::Config cfg(config_name);
+ gphox::Config cfg( config_name );
diff --git a/src/GPURaytrace.h b/src/GPURaytrace.h
index c01f8a2..8f1ba31 100644
--- a/src/GPURaytrace.h
+++ b/src/GPURaytrace.h
@@ -51 +51 @@ G4Mutex genstep_mutex = G4MUTEX_INITIALIZER;
-G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER;
+G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER;
@@ -337 +337,2 @@ struct EventAction : G4UserEventAction
- if (!hc) continue;
+ if( !hc )
+ continue;
@@ -339,2 +340,2 @@ struct EventAction : G4UserEventAction
- PhotonHitsCollection *phc = dynamic_cast<PhotonHitsCollection*>(hc);
- if (phc)
+ PhotonHitsCollection *phc = dynamic_cast<PhotonHitsCollection *>( hc );
+ if( phc )
@@ -342,2 +343,2 @@ struct EventAction : G4UserEventAction
- G4AutoLock lock(&g4hits_mutex);
- for (size_t j = 0; j < phc->entries(); j++)
+ G4AutoLock lock( &g4hits_mutex );
+ for( size_t j = 0; j < phc->entries(); j++ )
@@ -345,8 +346,6 @@ struct EventAction : G4UserEventAction
- PhotonHit* hit = (*phc)[j];
- float wl = 1239.84198f / static_cast<float>(hit->fenergy);
- g4_accumulated_hits.push_back({
- float(hit->fposition.x()), float(hit->fposition.y()), float(hit->fposition.z()), float(hit->ftime),
- float(hit->fdirection.x()), float(hit->fdirection.y()), float(hit->fdirection.z()), 0.f,
- float(hit->fpolarization.x()), float(hit->fpolarization.y()), float(hit->fpolarization.z()), wl,
- 0.f, 0.f, 0.f, 0.f
- });
+ PhotonHit *hit = ( *phc )[j];
+ float wl = 1239.84198f / static_cast<float>( hit->fenergy );
+ g4_accumulated_hits.push_back( { float( hit->fposition.x() ), float( hit->fposition.y() ), float( hit->fposition.z() ), float( hit->ftime ),
+ float( hit->fdirection.x() ), float( hit->fdirection.y() ), float( hit->fdirection.z() ), 0.f,
+ float( hit->fpolarization.x() ), float( hit->fpolarization.y() ), float( hit->fpolarization.z() ), wl,
+ 0.f, 0.f, 0.f, 0.f } );
@@ -373 +372 @@ struct RunAction : G4UserRunAction
- bool fSavePhotonHistory{false};
+ bool fSavePhotonHistory{ false };
@@ -406 +405 @@ struct RunAction : G4UserRunAction
- if (fSavePhotonHistory)
+ if( fSavePhotonHistory )
@@ -414,2 +413,2 @@ struct RunAction : G4UserRunAction
- NP* gpu_h = NP::Make<float>(num_hits, 4, 4);
- for (unsigned idx = 0; idx < num_hits; idx++)
+ NP *gpu_h = NP::Make<float>( num_hits, 4, 4 );
+ for( unsigned idx = 0; idx < num_hits; idx++ )
@@ -418,2 +417,2 @@ struct RunAction : G4UserRunAction
- sev->getHit(hit, idx);
- memcpy(gpu_h->bytes() + idx * sizeof(sphoton), &hit, sizeof(sphoton));
+ sev->getHit( hit, idx );
+ memcpy( gpu_h->bytes() + idx * sizeof( sphoton ), &hit, sizeof( sphoton ) );
@@ -421 +420 @@ struct RunAction : G4UserRunAction
- gpu_h->save("gpu_hits.npy");
+ gpu_h->save( "gpu_hits.npy" );
@@ -427,3 +426,3 @@ struct RunAction : G4UserRunAction
- G4AutoLock lock(&g4hits_mutex);
- size_t ng4 = g4_accumulated_hits.size();
- if (ng4 > 0)
+ G4AutoLock lock( &g4hits_mutex );
+ size_t ng4 = g4_accumulated_hits.size();
+ if( ng4 > 0 )
@@ -431,3 +430,3 @@ struct RunAction : G4UserRunAction
- NP* g4h = NP::Make<float>(ng4, 4, 4);
- memcpy(g4h->bytes(), g4_accumulated_hits.data(), ng4 * 16 * sizeof(float));
- g4h->save("g4_hits.npy");
+ NP *g4h = NP::Make<float>( ng4, 4, 4 );
+ memcpy( g4h->bytes(), g4_accumulated_hits.data(), ng4 * 16 * sizeof( float ) );
+ g4h->save( "g4_hits.npy" );
diff --git a/src/config.cpp b/src/config.cpp
index 26cb221..312268d 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -140,2 +140,2 @@ void Config::ReadConfig(std::string filepath)
- if (event_.contains("savephotonhistory"))
- savephotonhistory = event_["savephotonhistory"].get<bool>();
+ if( event_.contains( "savephotonhistory" ) )
+ savephotonhistory = event_["savephotonhistory"].get<bool>();
diff --git a/src/config.h b/src/config.h
index 3dc2c1e..cbebea7 100644
--- a/src/config.h
+++ b/src/config.h
@@ -29 +29 @@ class Config
- bool savephotonhistory{false};
+ bool savephotonhistory{ false };
@@ -31 +31 @@ class Config
- private:
+private:
Have any feedback or feature suggestions? Share it here.
Comment on lines
+72
to
+75
| program.add_argument("-c", "--config") | ||
| .help("config file name (without .json extension)") | ||
| .default_value(string("")) | ||
| .nargs(1); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| program.add_argument("-c", "--config") | |
| .help("config file name (without .json extension)") | |
| .default_value(string("")) | |
| .nargs(1); | |
| program.add_argument( "-c", "--config" ) | |
| .help( "config file name (without .json extension)" ) | |
| .default_value( string( "" ) ) | |
| .nargs( 1 ); |
Comment on lines
+118
to
+119
| string config_name = program.get<string>("--config"); | ||
| if (!config_name.empty()) |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| string config_name = program.get<string>("--config"); | |
| if (!config_name.empty()) | |
| string config_name = program.get<string>( "--config" ); | |
| if( !config_name.empty() ) |
| string config_name = program.get<string>("--config"); | ||
| if (!config_name.empty()) | ||
| { | ||
| gphox::Config cfg(config_name); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| gphox::Config cfg(config_name); | |
| gphox::Config cfg( config_name ); |
| namespace | ||
| { | ||
| G4Mutex genstep_mutex = G4MUTEX_INITIALIZER; | ||
| G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER; |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER; | |
| G4Mutex g4hits_mutex = G4MUTEX_INITIALIZER; |
| { | ||
| G4VHitsCollection *hc = hce->GetHC(i); | ||
| if (hc) | ||
| if (!hc) continue; |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| if (!hc) continue; | |
| if( !hc ) | |
| continue; |
Comment on lines
+427
to
+429
| G4AutoLock lock(&g4hits_mutex); | ||
| size_t ng4 = g4_accumulated_hits.size(); | ||
| if (ng4 > 0) |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| G4AutoLock lock(&g4hits_mutex); | |
| size_t ng4 = g4_accumulated_hits.size(); | |
| if (ng4 > 0) | |
| G4AutoLock lock( &g4hits_mutex ); | |
| size_t ng4 = g4_accumulated_hits.size(); | |
| if( ng4 > 0 ) |
Comment on lines
+140
to
+141
| if (event_.contains("savephotonhistory")) | ||
| savephotonhistory = event_["savephotonhistory"].get<bool>(); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| if (event_.contains("savephotonhistory")) | |
| savephotonhistory = event_["savephotonhistory"].get<bool>(); | |
| if( event_.contains( "savephotonhistory" ) ) | |
| savephotonhistory = event_["savephotonhistory"].get<bool>(); |
|
|
||
| storch torch; | ||
|
|
||
| bool savephotonhistory{false}; |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| bool savephotonhistory{false}; | |
| bool savephotonhistory{ false }; |
|
|
||
| bool savephotonhistory{false}; | ||
|
|
||
| private: |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| private: | |
| private: |
APEX liquid argon scintillator tile with WLS light guide, Vikuiti reflective foils, and 31 SiPMs. Used for GPU vs G4 benchmarking.
Contributor
There was a problem hiding this comment.
Cpp-linter Review
Used clang-format v20.1.2
Click here for the full clang-format patch
diff --git a/src/GPURaytrace.cpp b/src/GPURaytrace.cpp
index ddc3f49..f0590db 100644
--- a/src/GPURaytrace.cpp
+++ b/src/GPURaytrace.cpp
@@ -15 +14,0 @@
-#include "config.h"
@@ -16,0 +16 @@
+#include "config.h"
diff --git a/src/GPURaytrace.h b/src/GPURaytrace.h
index c01f8a2..9619191 100644
--- a/src/GPURaytrace.h
+++ b/src/GPURaytrace.h
@@ -337 +337,2 @@ struct EventAction : G4UserEventAction
- if (!hc) continue;
+ if (!hc)
+ continue;
@@ -339 +340 @@ struct EventAction : G4UserEventAction
- PhotonHitsCollection *phc = dynamic_cast<PhotonHitsCollection*>(hc);
+ PhotonHitsCollection *phc = dynamic_cast<PhotonHitsCollection *>(hc);
@@ -345 +346 @@ struct EventAction : G4UserEventAction
- PhotonHit* hit = (*phc)[j];
+ PhotonHit *hit = (*phc)[j];
@@ -347,6 +348,5 @@ struct EventAction : G4UserEventAction
- g4_accumulated_hits.push_back({
- float(hit->fposition.x()), float(hit->fposition.y()), float(hit->fposition.z()), float(hit->ftime),
- float(hit->fdirection.x()), float(hit->fdirection.y()), float(hit->fdirection.z()), 0.f,
- float(hit->fpolarization.x()), float(hit->fpolarization.y()), float(hit->fpolarization.z()), wl,
- 0.f, 0.f, 0.f, 0.f
- });
+ g4_accumulated_hits.push_back(
+ {float(hit->fposition.x()), float(hit->fposition.y()), float(hit->fposition.z()),
+ float(hit->ftime), float(hit->fdirection.x()), float(hit->fdirection.y()),
+ float(hit->fdirection.z()), 0.f, float(hit->fpolarization.x()),
+ float(hit->fpolarization.y()), float(hit->fpolarization.z()), wl, 0.f, 0.f, 0.f, 0.f});
@@ -414 +414 @@ struct RunAction : G4UserRunAction
- NP* gpu_h = NP::Make<float>(num_hits, 4, 4);
+ NP *gpu_h = NP::Make<float>(num_hits, 4, 4);
@@ -431 +431 @@ struct RunAction : G4UserRunAction
- NP* g4h = NP::Make<float>(ng4, 4, 4);
+ NP *g4h = NP::Make<float>(ng4, 4, 4);
diff --git a/src/config.cpp b/src/config.cpp
index 26cb221..1fe8c36 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -141 +141 @@ void Config::ReadConfig(std::string filepath)
- savephotonhistory = event_["savephotonhistory"].get<bool>();
+ savephotonhistory = event_["savephotonhistory"].get<bool>();
diff --git a/src/config.h b/src/config.h
index 3dc2c1e..fe92a2c 100644
--- a/src/config.h
+++ b/src/config.h
@@ -31 +31 @@ class Config
- private:
+private:
Have any feedback or feature suggestions? Share it here.
|
|
||
| #include "sysrap/OPTICKS_LOG.hh" | ||
|
|
||
| #include "config.h" |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Please remove the line(s)
- 15
| #include "sysrap/OPTICKS_LOG.hh" | ||
|
|
||
| #include "config.h" | ||
| #include "GPURaytrace.h" |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| #include "GPURaytrace.h" | |
| #include "config.h" |
| { | ||
| G4VHitsCollection *hc = hce->GetHC(i); | ||
| if (hc) | ||
| if (!hc) continue; |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| if (!hc) continue; | |
| if (!hc) | |
| continue; |
| if (hc) | ||
| if (!hc) continue; | ||
|
|
||
| PhotonHitsCollection *phc = dynamic_cast<PhotonHitsCollection*>(hc); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| PhotonHitsCollection *phc = dynamic_cast<PhotonHitsCollection*>(hc); | |
| PhotonHitsCollection *phc = dynamic_cast<PhotonHitsCollection *>(hc); |
| G4AutoLock lock(&g4hits_mutex); | ||
| for (size_t j = 0; j < phc->entries(); j++) | ||
| { | ||
| PhotonHit* hit = (*phc)[j]; |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| PhotonHit* hit = (*phc)[j]; | |
| PhotonHit *hit = (*phc)[j]; |
Comment on lines
+347
to
+352
| g4_accumulated_hits.push_back({ | ||
| float(hit->fposition.x()), float(hit->fposition.y()), float(hit->fposition.z()), float(hit->ftime), | ||
| float(hit->fdirection.x()), float(hit->fdirection.y()), float(hit->fdirection.z()), 0.f, | ||
| float(hit->fpolarization.x()), float(hit->fpolarization.y()), float(hit->fpolarization.z()), wl, | ||
| 0.f, 0.f, 0.f, 0.f | ||
| }); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| g4_accumulated_hits.push_back({ | |
| float(hit->fposition.x()), float(hit->fposition.y()), float(hit->fposition.z()), float(hit->ftime), | |
| float(hit->fdirection.x()), float(hit->fdirection.y()), float(hit->fdirection.z()), 0.f, | |
| float(hit->fpolarization.x()), float(hit->fpolarization.y()), float(hit->fpolarization.z()), wl, | |
| 0.f, 0.f, 0.f, 0.f | |
| }); | |
| g4_accumulated_hits.push_back( | |
| {float(hit->fposition.x()), float(hit->fposition.y()), float(hit->fposition.z()), | |
| float(hit->ftime), float(hit->fdirection.x()), float(hit->fdirection.y()), | |
| float(hit->fdirection.z()), 0.f, float(hit->fpolarization.x()), | |
| float(hit->fpolarization.y()), float(hit->fpolarization.z()), wl, 0.f, 0.f, 0.f, 0.f}); |
| // Save GPU hits as .npy (sphoton layout: N x 4 x 4 float32) | ||
| { | ||
| theCreationProcessid = 1; | ||
| NP* gpu_h = NP::Make<float>(num_hits, 4, 4); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| NP* gpu_h = NP::Make<float>(num_hits, 4, 4); | |
| NP *gpu_h = NP::Make<float>(num_hits, 4, 4); |
| size_t ng4 = g4_accumulated_hits.size(); | ||
| if (ng4 > 0) | ||
| { | ||
| NP* g4h = NP::Make<float>(ng4, 4, 4); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| NP* g4h = NP::Make<float>(ng4, 4, 4); | |
| NP *g4h = NP::Make<float>(ng4, 4, 4); |
| SEventConfig::SetMaxSlot( event_["maxslot"] ); | ||
|
|
||
| if (event_.contains("savephotonhistory")) | ||
| savephotonhistory = event_["savephotonhistory"].get<bool>(); |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| savephotonhistory = event_["savephotonhistory"].get<bool>(); | |
| savephotonhistory = event_["savephotonhistory"].get<bool>(); |
|
|
||
| bool savephotonhistory{false}; | ||
|
|
||
| private: |
Contributor
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| private: | |
| private: |
plexoos
reviewed
Apr 12, 2026
plexoos
reviewed
Apr 12, 2026
| @@ -26,6 +26,8 @@ class Config | |||
|
|
|||
| storch torch; | |||
|
|
|||
| bool savephotonhistory{false}; | |||
Member
There was a problem hiding this comment.
Please comply to microsoft style convention. Function names should be CamelCase.
Contributor
Author
There was a problem hiding this comment.
Sure. You asked me to separate formatting and coding PRs. Therefore this will be an other PR once this is merged, correct?
Member
There was a problem hiding this comment.
This is a new line of code, so it should be formatted according to the agreed coding style. The cpp-linter is set up to detect that. If it complains about existing code, you can safely ignore it.
Contributor
Author
There was a problem hiding this comment.
Got it, fixed now
plexoos
reviewed
Apr 12, 2026
…speedup.py Move the inline python3 -c "..." block out of benchmarks/benchmark_apex.sh into optiphy/ana/print_speedup.py. Shell now only runs the benchmark and parses log values; Python module owns the formatting and is testable standalone. Behavior verified identical against same input values.
Contributor
Author
|
@plexoos one of the failing tests (ubuntu22.04, 12.1.1, 8.0.0, 11.3.2, 3.22.1) failed due to
I think I did not touch it. Let me know if you saw this error before. |
Member
|
Please update or rebase the branch, and change the PR title to better reflect the intended change using conventional commit format. |
Contributor
Author
I'll rebase 271-273 once 269 and 270 are merged — otherwise they'll just need rebasing again. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add GPU vs G4 comparison and visualization tools for optical photon validation. run_and_compare.py generates 7 diagnostic plots (hits, wavelength, time, positions, steps) with sqrt(N) error bars. plot_photon_paths.py provides 3D photon path visualization colored by wavelength. benchmark_apex.sh measures GPU vs G4 speedup and generates comparison plots in one command. Adds savephotonhistory config flag to control GPU/G4 hit .npy output.