Skip to content
Snippets Groups Projects
Commit 85b41776 authored by Dave Casper's avatar Dave Casper
Browse files

Fix conflicts

parent 101c2c73
No related branches found
No related tags found
12 merge requests!69Update release version number,!68Database changes for staggered tracker planes,!67Fix configuration issue caused by ATLAS change,!66Repair problems caused by changes to ATLAS SCT conditions code,!64Revert the Flake workaround,!63Conform to ATLAS MC changes; workaround Flake issue,!62Conform to ATLAS changes, move databases to CVMFS,!59Protect against spacepoints beyond the ends of strips,!58Fix spacepoint and geometry bugs,!57Refactor and integrate clustering and spacepoint work,!56Correct Athena compatibility problems,!54Example job to read Tracker RDO data and associate with Truth
...@@ -36,3 +36,4 @@ run > FaserSCT_DigitizationDbg.py >& digi.log ...@@ -36,3 +36,4 @@ run > FaserSCT_DigitizationDbg.py >& digi.log
This will read your `g4.HITS.root` and generate an RDO data file with digitized raw data objects. This will read your `g4.HITS.root` and generate an RDO data file with digitized raw data objects.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment