[12gevmoller_sim] Moller sim commit: r190 - in mollersim/branches/MollerDet: . src

[pqwang]

Hi Juliette and Wouter,

I might not make it very clear when I created the branches.

1. branches/MollerDet:
a copy and modification of Qweak scanner simulation package. As I had 
said in an email to Juliette before I created the branches, this is a 
well benchmarked simulation package with all the elements we need to 
simulate air-core light guide Cerenkov detector with small 
modifications. As a standalone program, there is no need to merge this 
branch into trunk.

2. branches/peiqing_mollersim_no_gdml:
created from tags/save_nonGDML_version. There is no need to merge this 
branch into trunk. I use this branch to keep track of my personal studies.

3. branches/peiqing_mollersim_gdml : created from the most recent trunk. 
This really is a branch I would put GDML stuff in and keep updates from 
trunk. Administrators should only review changes in this branch and 
consider to merge the changes into trunk or not.

Except myself, everyone else should not care about changes in the first 
two branches. I would suggest Juliette to put control on the mailing 
list, to disable email notifications on the first two branches. Or I can 
stop to make changes in them or delete them from mollersim svn if anyone 
still feels confusing about branch 1 & 2.

Regards,
Peiqing

On 12-05-21 11:21 AM, Juliette Mammei wrote:
> Hey Peiqing,
>
> I think it is perfectly okay for you to use the repository to save your changes in your own branch, but you should be aware that the branch that I created to save the changes you had made:
>
> 	branches/peiqing_mollersim_no_gdml
>
> was not compatible with what we want to do in the trunk, unless you have merged the changes you had made with what is in the trunk.  So I think you would need to check out the trunk, put your changes in, and then possibly start a new branch to save your changes or just change the name of the peiqing_mollersim_no_gdml, knowing that at one stage it really was not what we wanted for the GDML stuff.
>
> Thanks,
>
> Juliette
>
> On 5/20/2012 8:08 PM, pqwang wrote:
>> Hi all,
>>
>> branches/MollerDet is a private branch for detector response study
>> (mostly used by myself for version control purpose). It should not be
>> merged into trunk in any case.
>>
>> branches/peiqing_mollersim_no_gdml is another private branch. It has the
>> same purpose as the branches/MollerDet.
>>
>> branches/peiqing_mollersim_no_gdml is a branch which will strictly
>> follow the subversion rules and any other rules such as 'GDML'
>> agreement. It will not diverge from trunk. I will commit code to this
>> branch only when I think it is good enough. The code will stay there
>> waiting for advanced programmers to review it. If  they think the code
>> is OK, they can then decide to merge it to trunk or not. In this way,
>> the changes in this branch will not affect the trunk and will not cause
>> any issues, such as the 'not compiled' problem, in the trunk version.
>>
>> Let me know if you feel uncomfortable with the above approach. I can
>> move the the private branches to our local svn server.
>>
>> Regards,
>> Peiqing
>>
>> On 12-05-20 06:40 PM, Wouter Deconinck wrote:
>>> Forgive me for asking on the list, but what is the plan for getting
>>> this branch merged back into the trunk version?  I would hate to see
>>> development work go to waste because it turns out to be incompatible
>>> with the GDML approach that we have decided to follow.
>>>
>>> Cheers,
>>> Wouter
>>>
>>>
>>>
>>> On Sun, May 20, 2012 at 3:20 PM,<pqwang at jlab.org>    wrote:
>>>> Author: pqwang
>>>> Date: 2012-05-20 15:20:07 -0400 (Sun, 20 May 2012)
>>>> New Revision: 190
>>>>
>>>> Modified:
>>>>      mollersim/branches/MollerDet/src/DetectorConstruction.cc
>>>>      mollersim/branches/MollerDet/src/EventAction.cc
>>>>      mollersim/branches/MollerDet/src/MollerDetMainDetector.cc
>>>>      mollersim/branches/MollerDet/src/MollerDetMainDetectorMessenger.cc
>>>>      mollersim/branches/MollerDet/src/MollerDetMaterial.cc
>>>>      mollersim/branches/MollerDet/src/PrimaryGeneratorAction.cc
>>>>      mollersim/branches/MollerDet/test.mac
>>>> Log:
>>>>
>>>> - Added in wrapping/coat for the quartz radiator and define its optical properties.
>>>>
>>>> - Enable the radiator tilting.
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>> _______________________________________________
>>>> 12gevmoller_sim mailing list
>>>> 12gevmoller_sim at jlab.org
>>>> https://mailman.jlab.org/mailman/listinfo/12gevmoller_sim
>> _______________________________________________
>> 12gevmoller_sim mailing list
>> 12gevmoller_sim at jlab.org
>> https://mailman.jlab.org/mailman/listinfo/12gevmoller_sim
> _______________________________________________
> 12gevmoller_sim mailing list
> 12gevmoller_sim at jlab.org
> https://mailman.jlab.org/mailman/listinfo/12gevmoller_sim