Skip to content

Commit fb5956d

Browse files
jose-luis-rsjose-luis-rs
committed
Update readers
1 parent 848a103 commit fb5956d

43 files changed

Lines changed: 176 additions & 194 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎r3bsource/califa/R3BCalifaFebexReader.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
* or submit itself to any jurisdiction. *
1212
******************************************************************************/
1313

14-
#include "FairLogger.h"
15-
#include "FairRootManager.h"
14+
#include <FairLogger.h>
15+
#include <FairRootManager.h>
1616

1717
#include "R3BCalifaFebexReader.h"
1818
#include "R3BCalifaMappedData.h"
1919
#include "R3BLogger.h"
2020

21-
#include "TClonesArray.h"
21+
#include <TClonesArray.h>
2222

2323
/**
2424
** ext_h101_califa.h was created by running
@@ -119,4 +119,4 @@ void R3BCalifaFebexReader::Reset()
119119
fArraytrig->Clear();
120120
}
121121

122-
ClassImp(R3BCalifaFebexReader);
122+
ClassImp(R3BCalifaFebexReader)

‎r3bsource/califa/R3BCalifaFebexReader.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
* or submit itself to any jurisdiction. *
1212
******************************************************************************/
1313

14-
#ifndef R3BCALIFAFEBEXREADER_H
15-
#define R3BCALIFAFEBEXREADER_H 1
14+
#pragma once
1615

1716
#include "R3BReader.h"
1817
#include <Rtypes.h>
@@ -71,5 +70,3 @@ class R3BCalifaFebexReader : public R3BReader
7170
public:
7271
ClassDefOverride(R3BCalifaFebexReader, 0);
7372
};
74-
75-
#endif // R3BCALIFAFEBEXREADER_H

‎r3bsource/califa/R3BCalifaJulichReader.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
* or submit itself to any jurisdiction. *
1212
******************************************************************************/
1313

14-
#include "FairLogger.h"
15-
#include "FairRootManager.h"
14+
#include <FairLogger.h>
15+
#include <FairRootManager.h>
1616

1717
#include "R3BAmsMappedData.h"
1818
#include "R3BCalifaJulichReader.h"
1919
#include "R3BCalifaMappedData.h"
2020
#include "R3BLogger.h"
2121

22-
#include "TClonesArray.h"
23-
#include "ext_data_struct_info.hh"
22+
#include <TClonesArray.h>
23+
#include <ext_data_struct_info.hh>
2424

2525
/**
2626
** ext_h101_califa.h was created by running
@@ -117,4 +117,4 @@ void R3BCalifaJulichReader::Reset()
117117
fArrayAms->Clear();
118118
}
119119

120-
ClassImp(R3BCalifaJulichReader);
120+
ClassImp(R3BCalifaJulichReader)

‎r3bsource/califa/R3BCalifaJulichReader.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
* or submit itself to any jurisdiction. *
1212
******************************************************************************/
1313

14-
#ifndef R3BCalifaJulichREADER_H
15-
#define R3BCalifaJulichREADER_H 1
14+
#pragma once
1615

1716
#include "R3BReader.h"
1817
#include <Rtypes.h>
@@ -65,5 +64,3 @@ class R3BCalifaJulichReader : public R3BReader
6564
public:
6665
ClassDefOverride(R3BCalifaJulichReader, 0);
6766
};
68-
69-
#endif // R3BCalifaJulichREADER_H

‎r3bsource/califa/R3BWhiterabbitCalifaReader.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
* or submit itself to any jurisdiction. *
1212
******************************************************************************/
1313

14-
#include "FairLogger.h"
15-
#include "FairRootManager.h"
14+
#include <FairLogger.h>
15+
#include <FairRootManager.h>
1616

1717
#include "R3BEventHeader.h"
1818
#include "R3BWRData.h"
1919
#include "R3BWhiterabbitCalifaReader.h"
20-
#include "TClonesArray.h"
20+
#include <TClonesArray.h>
2121

2222
extern "C"
2323
{
@@ -146,4 +146,4 @@ void R3BWhiterabbitCalifaReader::Reset()
146146
fNEvent = 0;
147147
}
148148

149-
ClassImp(R3BWhiterabbitCalifaReader);
149+
ClassImp(R3BWhiterabbitCalifaReader)

‎r3bsource/califa/R3BWhiterabbitCalifaReader.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
* or submit itself to any jurisdiction. *
1212
******************************************************************************/
1313

14-
#ifndef R3BWhiterabbitCalifaReader_H
15-
#define R3BWhiterabbitCalifaReader_H
14+
#pragma once
1615

1716
#include "R3BReader.h"
1817
#include <Rtypes.h>
@@ -64,4 +63,3 @@ class R3BWhiterabbitCalifaReader : public R3BReader
6463
public:
6564
ClassDefOverride(R3BWhiterabbitCalifaReader, 0);
6665
};
67-
#endif // R3BWhiterabbitCalifaReader_H

‎r3bsource/fibers/R3BFiberMAPMTReader.cxx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
******************************************************************************/
1313

1414
#include "R3BFiberMAPMTReader.h"
15-
#include "FairLogger.h"
16-
#include "FairRootManager.h"
1715
#include "R3BFiberMAPMTMappedData.h"
18-
#include "TClonesArray.h"
16+
17+
#include <FairLogger.h>
18+
#include <FairRootManager.h>
19+
#include <TClonesArray.h>
1920

2021
R3BFiberMAPMTReader::R3BFiberMAPMTReader(char const* a_name, UInt_t a_offset, size_t fiber_num)
2122
: R3BReader(TString("R3B") + a_name + "Reader")
@@ -155,4 +156,4 @@ Bool_t R3BFiberMAPMTReader::R3BRead()
155156

156157
void R3BFiberMAPMTReader::Reset() { fMappedArray->Clear(); }
157158

158-
ClassImp(R3BFiberMAPMTReader);
159+
ClassImp(R3BFiberMAPMTReader)

‎r3bsource/fibers/R3BFiberMAPMTReader.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,12 @@
3737
// Cal2Hit however does handle electronics channels -> fibers.
3838
//
3939

40-
#ifndef R3BFIBERMAPMTREADER_H
41-
#define R3BFIBERMAPMTREADER_H 1
40+
#pragma once
4241

4342
#include "R3BLogger.h"
4443
#include "R3BReader.h"
4544

46-
#include "TString.h"
45+
#include <TString.h>
4746

4847
class TClonesArray;
4948

@@ -123,7 +122,7 @@ class R3BFiberMAPMTReader : public R3BReader
123122
void Reset();
124123

125124
// Accessor to select online mode
126-
void SetOnline(Bool_t option) { fOnline = option; }
125+
inline void SetOnline(Bool_t option) { fOnline = option; }
127126

128127
protected:
129128
// Data offset
@@ -141,5 +140,3 @@ class R3BFiberMAPMTReader : public R3BReader
141140
public:
142141
ClassDef(R3BFiberMAPMTReader, 1);
143142
};
144-
145-
#endif

‎r3bsource/fibers/R3BFiberReader.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include "R3BFiberReader.h"
1515
#include "R3BFiberMappedData.h"
1616

17-
#include "FairLogger.h"
18-
#include "FairRootManager.h"
19-
#include "TClonesArray.h"
17+
#include <FairLogger.h>
18+
#include <FairRootManager.h>
19+
#include <TClonesArray.h>
2020

2121
/**
2222
** ext_h101_fib30.h was created by running
@@ -534,4 +534,4 @@ Bool_t R3BFiberReader::R3BRead()
534534

535535
void R3BFiberReader::Reset() { fMappedArray->Clear(); }
536536

537-
ClassImp(R3BFiberReader);
537+
ClassImp(R3BFiberReader)

‎r3bsource/fibers/R3BFiberReader.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@
2121
// Y = L(eading) or T(railing) edge of signal.
2222
// Z = C(oarse) or F(ine) time from electronics.
2323

24-
#ifndef R3BFiberReader_H
25-
#define R3BFiberReader_H 1
24+
#pragma once
2625

2726
#include "R3BLogger.h"
2827
#include "R3BReader.h"
2928

30-
#include "TString.h"
3129
#include <Rtypes.h>
30+
#include <TString.h>
3231

3332
class TClonesArray;
3433

@@ -244,7 +243,7 @@ class R3BFiberReader : public R3BReader
244243
virtual void Reset() override;
245244

246245
// Accessor to select online mode
247-
void SetOnline(Bool_t option) { fOnline = option; }
246+
inline void SetOnline(Bool_t option) { fOnline = option; }
248247

249248
private:
250249
TString fShortName; // e.g. "Fi10", "Fi30", "Fi31", ...
@@ -283,5 +282,3 @@ class R3BFiberReader : public R3BReader
283282
public:
284283
ClassDefOverride(R3BFiberReader, 1);
285284
};
286-
287-
#endif

0 commit comments

Comments
 (0)