search

GRIFFINCollaboration / detectorSimulations

GEANT4 simulation code for the GRIFFIN array and it's suite of ancillary detection systems.
7 stars 13 forks source link

Improved SPICE resolution function #97

Closed ghost closed 10 years ago

ghost commented 10 years ago

Cleaned up the SPICE's applied resolution, much to @moukaddam 's delight.

I didn't alter lines 37-150 of RootManager.cc nor any of SteppingAction.cc so I'm not sure why this is showing otherwise.

bkatiemills commented 10 years ago

I think the funky diff may have come from the fact that you don't seem to have ever merged what @moukaddam did around April 23/24. Can you please do a git fetch upstream; git merge upstream/master and make sure nothing breaks? It doesn't look like there were any merge conflicts, but do get all up to date and make sure bad things aren't happening.