Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
1bedd81
Sync to head
cortesep Jan 13, 2021
f6cb19e
Merging
cortesep Feb 22, 2021
da160fb
Correct assignment of trigger bits in Digitizer.cxx
cortesep Feb 22, 2021
e0a1729
Cleanup
cortesep Feb 22, 2021
b9a1e6e
Correcting data type
cortesep Feb 23, 2021
0157327
Correcting assignment bug
cortesep Feb 23, 2021
45420be
Raw creation with new digits format
cortesep Feb 23, 2021
3cc485d
Clang format
cortesep Feb 23, 2021
4f720b8
Clang format
cortesep Feb 23, 2021
5e146ce
First raw 2 digit
cortesep Feb 25, 2021
dafeb54
Revert "First raw 2 digit"
cortesep Feb 25, 2021
b653204
First raw 2 digit
cortesep Feb 25, 2021
9dba341
First raw 2 digit
cortesep Feb 25, 2021
97cb370
Writing convert digits to file (first attempt)
cortesep Feb 25, 2021
f3530ae
Corrected consistency checks
cortesep Feb 25, 2021
3c2e6f7
Corrected IR
cortesep Feb 25, 2021
a516e4d
Clang format
cortesep Mar 1, 2021
64fce0d
Remove UInt_t
cortesep Mar 1, 2021
e112970
Remove Int_t
cortesep Mar 1, 2021
7eec83d
Remove Int_t
cortesep Mar 1, 2021
b75ddf4
Remove Double_t Float_t
cortesep Mar 1, 2021
fde5d01
Remove Float_t
cortesep Mar 1, 2021
1042c69
Remove root types
cortesep Mar 1, 2021
5f0b74c
Removing unused variable
cortesep Mar 1, 2021
211ff60
Correct typo
cortesep Mar 1, 2021
dbeb4a5
Renaming raw2digits workflow
cortesep Mar 1, 2021
5789bc6
Correcting conflicting option
cortesep Mar 1, 2021
62aa5dd
Correcting ref and updating printout
cortesep Mar 2, 2021
cbde199
Updating printout
cortesep Mar 2, 2021
ca9e501
Simplify inheritance
cortesep Mar 2, 2021
bd7474c
Simplify inheritance
cortesep Mar 2, 2021
b09cd72
Clang format
cortesep Mar 2, 2021
ed4a5a3
Simplify inheritance
cortesep Mar 2, 2021
4fae68b
Dump digits
cortesep Mar 2, 2021
3552ddd
Clang format
cortesep Mar 2, 2021
083360b
ccdb-url as command line option
cortesep Mar 2, 2021
bf783d9
fixes, eliminate unneeded ZDCWorkflow
shahor02 Mar 2, 2021
53d190f
call mRawReader.setModuleConfig amd setTriggerMask only once for thr …
shahor02 Mar 2, 2021
3ffa399
Move RawReaderZDC from workflow/ to raw/
shahor02 Mar 2, 2021
1a71d26
Merge pull request #5 from shahor02/fix_ZDCrs
cortesep Mar 3, 2021
1066ecc
Sync to head
cortesep Jan 13, 2021
f687b25
Correct assignment of trigger bits in Digitizer.cxx
cortesep Feb 22, 2021
53584de
Cleanup
cortesep Feb 22, 2021
2834e0f
Correcting data type
cortesep Feb 23, 2021
35267ea
Correcting assignment bug
cortesep Feb 23, 2021
884c471
Raw creation with new digits format
cortesep Feb 23, 2021
55ffc46
Clang format
cortesep Feb 23, 2021
00603f1
Clang format
cortesep Feb 23, 2021
e07b92a
First raw 2 digit
cortesep Feb 25, 2021
581c07f
Revert "First raw 2 digit"
cortesep Feb 25, 2021
2df75d2
First raw 2 digit
cortesep Feb 25, 2021
40a9f26
First raw 2 digit
cortesep Feb 25, 2021
335b419
Writing convert digits to file (first attempt)
cortesep Feb 25, 2021
f7c51d3
Corrected consistency checks
cortesep Feb 25, 2021
b436c0a
Corrected IR
cortesep Feb 25, 2021
1f4ee7c
Clang format
cortesep Mar 1, 2021
160c1bd
Remove UInt_t
cortesep Mar 1, 2021
0140b02
Remove Int_t
cortesep Mar 1, 2021
3ea1475
Remove Int_t
cortesep Mar 1, 2021
205ea6b
Remove Double_t Float_t
cortesep Mar 1, 2021
e7ed5c4
Remove Float_t
cortesep Mar 1, 2021
aeb256d
Remove root types
cortesep Mar 1, 2021
0223e9d
Removing unused variable
cortesep Mar 1, 2021
6756563
Correct typo
cortesep Mar 1, 2021
3605180
Renaming raw2digits workflow
cortesep Mar 1, 2021
38911c0
Correcting conflicting option
cortesep Mar 1, 2021
a80df2c
Correcting ref and updating printout
cortesep Mar 2, 2021
9508288
Updating printout
cortesep Mar 2, 2021
fe06e8b
Simplify inheritance
cortesep Mar 2, 2021
e433626
Simplify inheritance
cortesep Mar 2, 2021
0d26826
Clang format
cortesep Mar 2, 2021
d0ff070
Simplify inheritance
cortesep Mar 2, 2021
1ec2ec6
Dump digits
cortesep Mar 2, 2021
87dc200
Clang format
cortesep Mar 2, 2021
3860632
ccdb-url as command line option
cortesep Mar 2, 2021
b3f2de3
fixes, eliminate unneeded ZDCWorkflow
shahor02 Mar 2, 2021
9e9f402
call mRawReader.setModuleConfig amd setTriggerMask only once for thr …
shahor02 Mar 2, 2021
5971c9a
Move RawReaderZDC from workflow/ to raw/
shahor02 Mar 2, 2021
55440c0
Clang format
cortesep Mar 3, 2021
31ae8d0
Fixing conflicts
cortesep Mar 3, 2021
3840f40
Clang format
cortesep Mar 3, 2021
8024ec5
Clang format
cortesep Mar 3, 2021
ce1ec4b
Clang format
cortesep Mar 3, 2021
51b361f
By default remove empty orbits and bc that don't satisfy trigger cond…
cortesep Mar 3, 2021
8481abc
Mask of trigger bits during digitization to be coherent with HW + fixes
cortesep Mar 3, 2021
6796623
Clang format
cortesep Mar 3, 2021
dd0324a
Scaler data from raw to digits
cortesep Mar 3, 2021
81ce2a1
Scaler data during digitization (limited to triggering channels)
cortesep Mar 3, 2021
80cb413
Renaming class PedestalData to OrbitData
cortesep Mar 4, 2021
ffb47fe
Renaming ZDCDigitPed to ZDCDigitOrbit
cortesep Mar 4, 2021
5f394fb
Disable MC labels
cortesep Mar 4, 2021
091eb58
Clang format
cortesep Mar 4, 2021
d99f406
Corrected use of --disable-mc
cortesep Mar 4, 2021
696bf55
Correct formatting and one bug
cortesep Mar 4, 2021
2e7d409
Clang format
cortesep Mar 4, 2021
831d16f
Remove ZDCDigitWriterSpec
cortesep Mar 4, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify inheritance
  • Loading branch information
cortesep committed Mar 3, 2021
commit fe06e8baa1580ce7b272ec7c779bfa0bdb869f62
2 changes: 1 addition & 1 deletion Detectors/ZDC/raw/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# submit itself to any jurisdiction.

o2_add_library(ZDCRaw
SOURCES src/DumpRaw.cxx src/raw-parser.cxx src/RawReaderZDCBase.cxx src/RawReaderBase.cxx
SOURCES src/DumpRaw.cxx src/raw-parser.cxx
PUBLIC_LINK_LIBRARIES O2::SimulationDataFormat O2::ZDCBase O2::ZDCSimulation
O2::DataFormatsZDC O2::CCDB O2::SimConfig O2::DPLUtils
O2::DetectorsRaw O2::Headers)
Expand Down
250 changes: 0 additions & 250 deletions Detectors/ZDC/raw/include/ZDCRaw/RawReaderBase.h

This file was deleted.

57 changes: 0 additions & 57 deletions Detectors/ZDC/raw/include/ZDCRaw/RawReaderZDCBase.h

This file was deleted.

12 changes: 0 additions & 12 deletions Detectors/ZDC/raw/src/RawReaderBase.cxx

This file was deleted.

12 changes: 0 additions & 12 deletions Detectors/ZDC/raw/src/RawReaderZDCBase.cxx

This file was deleted.

Loading