Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

H

hcana
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

f2a7e3c8

Commit f2a7e3c8 authored 12 years ago by Simon Zhamkochyan

Downloads
- Plain Diff

Merge branch 'develop' into simon-shower

Conflicts:

	src/THcScintillatorPlane.cxx

parents 575579c4 90d1d5f2

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 1 deletion

.gitignore
.gitmodules 1 addition, 1 deletion

.gitmodules
Makefile 9 additions, 5 deletions

Makefile
examples/hodtest.C 2 additions, 2 deletions

examples/hodtest.C
examples/output.def 3 additions, 1 deletion

examples/output.def
src/HallC_LinkDef.h 8 additions, 7 deletions

src/HallC_LinkDef.h
src/THcDriftChamber.cxx 112 additions, 40 deletions

src/THcDriftChamber.cxx
src/THcDriftChamber.h 15 additions, 8 deletions

src/THcDriftChamber.h
src/THcDriftChamberPlane.cxx 171 additions, 0 deletions

src/THcDriftChamberPlane.cxx
src/THcDriftChamberPlane.h 56 additions, 0 deletions

src/THcDriftChamberPlane.h
src/THcHodoscope.cxx 42 additions, 86 deletions

src/THcHodoscope.cxx
src/THcScintillatorPlane.cxx 36 additions, 38 deletions

src/THcScintillatorPlane.cxx

with 456 additions and 189 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment