Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
6bf4281d
Commit
6bf4281d
authored
Oct 15, 2015
by
Daniel Hynds
Browse files
cleanup of tcout statements
Former-commit-id: 989d005f98e0a2ae756cdf5e8487f1a904f8979a
parent
cf9c3ca4
Changes
4
Hide whitespace changes
Inline
Side-by-side
branches/trunk/algorithms/GUI.C
View file @
6bf4281d
...
...
@@ -7,7 +7,7 @@
GUI
::
GUI
(
bool
debugging
)
:
Algorithm
(
"GUI"
){
debug
=
debugging
;
updateNumber
=
500
;
updateNumber
=
1
;
}
void
startDisplay
(
void
*
gui
){
...
...
branches/trunk/algorithms/Timepix3EventLoader.C
View file @
6bf4281d
...
...
@@ -81,7 +81,7 @@ void Timepix3EventLoader::initialise(Parameters* par){
int
Timepix3EventLoader
::
run
(
Clipboard
*
clipboard
){
tcout
<<
"Current time is "
<<
parameters
->
currentTime
<<
endl
;
//
tcout<<"Current time is "<<parameters->currentTime<<endl;
bool
loadedData
=
false
;
// Loop through all registered detectors
for
(
int
det
=
0
;
det
<
parameters
->
nDetectors
;
det
++
){
...
...
@@ -91,12 +91,12 @@ int Timepix3EventLoader::run(Clipboard* clipboard){
// Make a new container for the data
Timepix3Pixels
*
deviceData
=
new
Timepix3Pixels
();
// Load the next chunk of data
tcout
<<
"Loading data from "
<<
detectorID
<<
endl
;
//
tcout<<"Loading data from "<<detectorID<<endl;
bool
data
=
loadData
(
detectorID
,
deviceData
);
// If data was loaded then put it on the clipboard
if
(
data
){
loadedData
=
true
;
tcout
<<
"Loaded "
<<
deviceData
->
size
()
<<
" pixels for device "
<<
detectorID
<<
endl
;
//
tcout<<"Loaded "<<deviceData->size()<<" pixels for device "<<detectorID<<endl;
clipboard
->
put
(
detectorID
,
"pixels"
,(
TestBeamObjects
*
)
deviceData
);
}
}
...
...
@@ -175,7 +175,7 @@ bool Timepix3EventLoader::loadData(string detectorID, Timepix3Pixels* devicedata
const
UChar_t
header
=
((
pixdata
&
0xF000000000000000
)
>>
60
)
&
0xF
;
unsigned
int
headerInt
=
((
pixdata
&
0xF000000000000000
)
>>
60
)
&
0xF
;
tcout
<<
hex
<<
headerInt
<<
dec
<<
endl
;
//
tcout<<hex<<headerInt<<dec<<endl;
// bitset<64> headerContent(header);
// tcout<<"Header is "<<headerContent<<endl;
...
...
@@ -200,9 +200,9 @@ bool Timepix3EventLoader::loadData(string detectorID, Timepix3Pixels* devicedata
// tcout<<"Pixel time "<<(double)time<<endl;
time
+=
(
long
long
int
)(
parameters
->
detector
[
detectorID
]
->
timingOffset
()
*
4096
.
*
40000000
.);
tcout
<<
"Pixel time is "
<<
((
double
)
time
/
(
4096
.
*
40000000
.))
<<
endl
;
bitset
<
48
>
timeInt
(
time
);
tcout
<<
" or "
<<
timeInt
<<
endl
;
//
tcout<<"Pixel time is "<<((double)time/(4096. * 40000000.))<<endl;
//
bitset<48> timeInt(time);
//
tcout<<" or "<<timeInt<<endl;
// If events are loaded based on time intervals, take all hits where the time is within this window
if
(
parameters
->
eventLength
!=
0
.
&&
...
...
branches/trunk/core/Steering.C
View file @
6bf4281d
...
...
@@ -82,7 +82,7 @@ int main(int argc, char *argv[]) {
analysis
->
add
(
tpix3EventLoader
);
analysis
->
add
(
tpix3Clustering
);
analysis
->
add
(
testAlgorithm
);
//
analysis->add(basicTracking);
analysis
->
add
(
basicTracking
);
if
(
parameters
->
align
)
analysis
->
add
(
alignment
);
if
(
parameters
->
produceMask
)
analysis
->
add
(
tpix3MaskCreator
);
...
...
branches/trunk/macros/analyse.sh
View file @
6bf4281d
...
...
@@ -9,4 +9,4 @@ HISTOFILE=${TBCODE}/histos/histogramsRun${RUN}.root
NEVENTS
=
100
EVENTTIME
=
0
${
TBCODE
}
/bin/tbAnalysis
-d
${
DATADIR
}
-c
${
CONDFILE
}
-n
${
NEVENTS
}
-h
${
HISTOFILE
}
-t
${
EVENTTIME
}
${
TBCODE
}
/bin/tbAnalysis
-d
${
DATADIR
}
-c
${
CONDFILE
}
-n
${
NEVENTS
}
-h
${
HISTOFILE
}
-t
${
EVENTTIME
}
-g
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment