Implemented Root Tree and a "Setter/Writer" Class for Spice

GRIFFINCollaboration / detectorSimulations

GEANT4 simulation code for the GRIFFIN array and it's suite of ancillary detection systems.

7 stars 13 forks source link

Implemented Root Tree and a "Setter/Writer" Class for Spice #68

Closed moukaddam closed 10 years ago

moukaddam commented 10 years ago

The useless Root headers where cleaned,
A relative path to the header of TSpiceData was used (#include "../dataRootClass/TSpiceData.h") in RootManager.h

bkatiemills commented 10 years ago

Great, thanks - except there's a merge conflict between what you changed and what I changed in RootManager.hh. If you just literally do

git checkout 58ddb51c24bd4afc4cdd44c229b4a871bd36e962 RootManager.hh

and recommit, everything should be cool.

moukaddam commented 10 years ago

Bill, checking out from this index will hard code the path to TSpiceData again. I guess it's my fault because I didn't update my version since you made the different fixes. The master that we have now in the Griffin collaboration is the most up to date one. Unless I'm skipping something there's no need to recommit ( I only changed the path and cleaned the headers..)

bkatiemills commented 10 years ago

Yes your assessment is correct - but I can't merge this PR as long as we both have changes to RootManager.hh - that's why I suggested checking out a version that will undo your conflicting changes. Or better, you could merge our version and resolve the merge conflict yourself. Or, I could just do it myself - I'm good with any of the above.

moukaddam commented 10 years ago

I see, I checked out with the "hardcoded path" Cheers,

bkatiemills commented 10 years ago

Cool, there we go, conflict resolved; the relative path is still in there, but from my commit rather than this one. All is right with the world, thanks for being available for this the past couple days!

Fixes #66