Commit e03248a1 authored by Daniel Hynds's avatar Daniel Hynds
Browse files

fixed conflict


Former-commit-id: 6676e35a86497f28cce98d2da1885b324d826fdf
parent 648777ee
DetectorID DetectorType nPixelsX nPixelsY PitchX PitchY X Y Z Rx Ry Rz tOffset
W0013_D04 Timepix3 256 256 55 55 -1.470197 0.349770 0.000000 0.236904 3.107156 -0.027332 0.0000000000
W0013_E03 Timepix3 256 256 55 55 -2.642413 0.420414 23.500000 0.228648 3.084144 -0.032004 0.0000000000
W0013_G02 Timepix3 256 256 55 55 -2.278251 0.453315 47.000000 0.201171 3.049706 -0.020566 0.0000000000
W0013_D04 Timepix3 256 256 55 55 -1.465727 0.353010 0.000000 0.233151 3.096957 -0.028052 0.0000000000
W0013_E03 Timepix3 256 256 55 55 -2.639220 0.424740 23.500000 0.225418 3.076135 -0.032460 0.0000000000
W0013_G02 Timepix3 256 256 55 55 -2.277049 0.455804 47.000000 0.198966 3.043267 -0.020918 0.0000000000
W0013_G03 Timepix3 256 256 55 55 0.000000 0.000000 106.500000 0.157000 0.157000 0.000000 0.0000000000
W0013_J05 Timepix3 256 256 55 55 0.542731 -0.502637 128.000000 0.110333 0.183240 0.023106 0.0000000000
W0013_L09 Timepix3 256 256 55 55 -0.901714 0.057870 151.500000 -0.090065 -0.191517 0.001104 0.0000000000
W0019_L08 Timepix3 256 256 55 55 -7.582159 -1.372683 77.000000 0.070531 0.024296 -0.000811 0.0000000000
W0013_J05 Timepix3 256 256 55 55 0.537001 -0.502683 128.000000 0.112374 0.183777 0.022989 0.0000000000
W0013_L09 Timepix3 256 256 55 55 -0.906752 0.056182 151.500000 -0.094328 -0.191125 0.000802 0.0000000000
W0019_L08 Timepix3 256 256 55 55 -7.582159 -1.375683 77.000000 0.070531 0.024296 -0.000811 0.0000000000
......@@ -25,5 +25,5 @@ fi
# Launch the testbeam analysis and replace the original alignment file with the new one
${TBCODE}/bin/tbAnalysis -c ${CONDFILE} -n ${NEVENTS} -h ${HISTOFILE} -t ${INPUTFILE} -a 0
mv alignmentOutput.dat ${CONDFILE}
#mv alignmentOutput.dat ${CONDFILE}
......@@ -8,7 +8,7 @@ RUN=${1}
CONDFILE=${TBCODE}/cond/Alignment${RUN}.dat
HISTOFILE=${TBCODE}/histos/histogramsRun${RUN}test.root
INPUTFILE=${TBCODE}/pixels/pixelsRun${RUN}.root
INPUTFOLDER=/example/Run${RUN}
INPUTFOLDER=${TBCODE}/example/Run${RUN}
EVENTTIME=0.0005
NEVENTS=-1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment