Adding a new detector to the root tree

GRIFFINCollaboration / detectorSimulations

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

7 stars 13 forks source link

Adding a new detector to the root tree #82

Closed moukaddam closed 10 years ago

moukaddam commented 10 years ago

Updated the CMakeList.txt support many detectors in the root tree
Added a Class for the S3
Updated the README file for the datRootClass/ directory
Updated the Makefile for the datRootClass/ directory
Added some additional files link definition (..._linkdef.h)

bkatiemills commented 10 years ago

Hi Mohamad,

Looks good - this will hopefully help unstick @r3dunlop in #78; also the block level commenting you inserted is really good, that's exactly what I'm looking for. The only problem is the merge conflict! Can you please resolve this? You must have not updated from the main repo before making these commits. Remember to do

git fetch upstream
git merge upstream/master

regularly to merge everyone else's contributions. When you do this, it will surely report a merge conflict to you; go into the files it points out, and there will be chunks that look something like

>>>>>>>>>>>>>>>>>>>>>>
x = 0
<<<<<<<<<<<<<<<<<<<<<<
x = 1

showing the conflicting lines of code. Just choose the one you want / merge the two together if possible, and recommit. Let me know ASAP if there are any roadblocks here.

bkatiemills commented 10 years ago

See discussion in #84 - you and @r3dunlop are both committing similar things and are both having (quite possibly the same) merge conflict with master - we need to sort out who's trying to do what here.

r3dunlop commented 10 years ago

My commit has the changes by @moukaddam within it. I would say that mine supersedes his. I tried running that command but could not get it to work. I will look into it.

bkatiemills commented 10 years ago

@r3dunlop, can you let me know what the error you got was when you tried to merge upstream?

@moukaddam, do you agree, are your changes a subset of Ryan's changes? If so then the right thing to do is:

@moukaddam resolve your merge conflict and I will approve your PR with your stuff
@r3dunlop then pull in master, which hopefully makes the merge conflict vanish since @moukaddam will have fixed it, and recommit so only your stuff shows as changed by your PR.

r3dunlop commented 10 years ago

I have it working now. I see the conflicts and I think I could resolve them but they are all from what @moukaddam added so I will leave it to him and not screw things up.

moukaddam commented 10 years ago

Ok guys i'm on it. I thought it will go smoothly since the upstream version yesterday was my last commit..

bkatiemills commented 10 years ago

@moukaddam right - I guess what can happen is you didn't sync with upstream, but your previous merge just coincidentally happened to not make any merge conflicts, so it didn't matter then, but now you have changed something that does conflict with something from before your previous merge (maybe).