140 likes | 282 Views
http:// dpnc.unige.ch/SVNDAMPE/DAMPE/. Current revision. will be shown in Chi’s ppt. Top structure of SVN. Trunk Everything is here and sync with your PC Tags Every release package is here, it is milestone container. Branches
E N D
http://dpnc.unige.ch/SVNDAMPE/DAMPE/ Current revision will be shown in Chi’s ppt
Top structure of SVN • Trunk • Everything is here and sync with your PC • Tags • Every release package is here, it is milestone container. • Branches • You can put your new ideas here, and can be merged to the trunk or release a tag when it is finished. To SVN, the ‘Trunk’, ‘Tags’ and ‘Branches’ are same. Just different names of directories.
Top view of SVN Trunk Make a branch Debug User developing Tags
Initial • Create your SVN account • Shell: htpasswd -c filename myusername • Mailto: Valentina Gallo Valentina.Gallo@cern.ch • Checkout the code from the server to your PC • Shell: svncheckout http://dpnc.unige.ch/SVNDAMPE/DAMPE/OpenDmpSoftware/trunk You can try svn with http://dpnc.unige.ch/SVNDAMPE/DAMPE/software/testdir/
One work cycle • Update the newest codes: • cd <youworkdir> • svn update • Files operation: • svn [add/delete/copy/move] <yourfilename> • Do not use shell command [touch/rm/cp/mv] • Debug your code local • If you met a global error, please give a group mail. • Sync your work to the server: • svn commit • Revert you change: • svn revert <filename> • svnupate –r <oldversionNo> <filename>
Top view of SVN Trunk Make a branch Debug User developing Tags
Picture of Branches Merge the newest code from trunk Make a branch copy Merge to the trunk Improvement Give up and delete Custom Release a tag Rules of branches: totally free for every user must be carefully to merge back
Give a branch • Copy the trunk to your branch folder: • svn copy trunk branches/<yourbranchname> • Update your branch(in you branch folder): • svnmerge http://dpnc.unige.ch/SVNDAMPE/DAMPE/OpenDmpSoftware/trunk • Merge back your code to the trunk • cd <yourtrunkdir> • svn merge http://dpnc.unige.ch/SVNDAMPE/DAMPE/OpenDmpSoftware/branches/<yourbranchdir> Do not forget the ‘commit’
Top view of SVN Trunk Make a branch Debug User developing Tags
Picture of Tags branch trunk copy Tags Rules of tags: Before release, must be fully tested. When released, No Improvement branch is allowed. Single direction. Only be read by users.
Tests • Software test • With a given macro file testing the software bugs • E.g. in Simulation, 1000 random Muon events. • Can be done by Chi and me • Physics test • test the physics result • E.g. reconstruction of the Muons. • Need data analysis person. In our case, we have no physics test till now.
Name control • Tags: • V0.1 • The first number is determined in the software meeting • The second will be used when needed. • Branches: • I_0.1_setnamehere • The first word can be ‘I’, ‘C’ or ‘D’ , means Improvement, Custom or Debug • ‘0.1’ stands for the revision of trunk • ‘setnamehere’ is free for you
Some comments • A good description of your upload scripts is the key to memory. • The branch is cheap, so use the branch freely. • We may need a more frequent meeting from now on. • Please give a area for name cards in the wiki page.
V1.0 • Simulation: Add every detectors with even simple codes. • Reconstruction: Give the Physics test • Generator: Give a raw model of cosmic rays. Then everyone can drive on.