Skip to content

Commit a66ceec

Browse files
wiechulasawenzel
wiechula
authored and
sawenzel
committed
Fix Sandros comments on PR418
1 parent b795545 commit a66ceec

16 files changed

Lines changed: 86 additions & 86 deletions

File tree

‎Detectors/TPC/calibration/include/TPCCalibration/CalibPedestal.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ class CalibPedestal : public CalibRawBase
4848
/// default destructor
4949
virtual ~CalibPedestal() = default;
5050

51-
/// Update function called once per digit
51+
/// update function called once per digit
5252
///
5353
/// \param sector
54-
Int_t UpdateROC(const Int_t sector, const Int_t row, const Int_t pad,
54+
Int_t updateROC(const Int_t sector, const Int_t row, const Int_t pad,
5555
const Int_t timeBin, const Float_t signal) final;
5656

5757
/// not used
58-
Int_t UpdateCRU(const CRU& cru, const Int_t row, const Int_t pad,
58+
Int_t updateCRU(const CRU& cru, const Int_t row, const Int_t pad,
5959
const Int_t timeBin, const Float_t signal) final { return 0;}
6060

6161
/// Reset pedestal data
@@ -81,7 +81,7 @@ class CalibPedestal : public CalibRawBase
8181
void dumpToFile(TString filename) final;
8282

8383
/// Dummy end event
84-
void EndEvent() final {};
84+
void endEvent() final {};
8585

8686
//private:
8787
Int_t mADCMin; ///< minimum adc value
@@ -99,7 +99,7 @@ class CalibPedestal : public CalibRawBase
9999
vectorType* getVector(ROC roc, bool create=kFALSE);
100100

101101
/// dummy reset
102-
void ResetEvent() final {}
102+
void resetEvent() final {}
103103
};
104104

105105
} // namespace TPC

‎Detectors/TPC/calibration/include/TPCCalibration/CalibRawBase.h‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace TPC
3838
///
3939
/// This class is the base class for raw data calibrations
4040
/// It implements base raw reader functionality and calls
41-
/// an 'Update' function for each digit
41+
/// an 'update' function for each digit
4242
///
4343
/// origin: TPC
4444
/// \author Jens Wiechula, Jens.Wiechula@ikf.uni-frankfurt.de
@@ -56,24 +56,24 @@ class CalibRawBase
5656

5757
CalibRawBase(PadSubset padSubset = PadSubset::ROC) : mMapper(Mapper::instance()), mNevents(0), mTimeBinsPerCall(500), mProcessedTimeBins(0), mPresentEventNumber(0), mPadSubset(padSubset) {;}
5858

59-
/// Update function called once per digit
59+
/// update function called once per digit
6060
///
6161
/// \param roc readout chamber
6262
/// \param row row in roc
6363
/// \param pad pad in row
6464
/// \param timeBin time bin
6565
/// \param signal ADC signal
66-
virtual Int_t UpdateROC(const Int_t roc, const Int_t row, const Int_t pad,
66+
virtual Int_t updateROC(const Int_t roc, const Int_t row, const Int_t pad,
6767
const Int_t timeBin, const Float_t signal) = 0;
6868

69-
/// Update function called once per digit
69+
/// update function called once per digit
7070
///
7171
/// \param cru CRU
7272
/// \param row row in CRU
7373
/// \param pad pad in row
7474
/// \param timeBin time bin
7575
/// \param signal ADC signal
76-
virtual Int_t UpdateCRU(const CRU& cru, const Int_t row, const Int_t pad,
76+
virtual Int_t updateCRU(const CRU& cru, const Int_t row, const Int_t pad,
7777
const Int_t timeBin, const Float_t signal) = 0;
7878

7979
/// add GBT frame container to process
@@ -82,23 +82,23 @@ class CalibRawBase
8282
/// add RawReader
8383
void addRawReader(RawReader *reader) { mRawReaders.push_back(std::unique_ptr<RawReader>(reader)); }
8484

85-
/// set number of time bins to process in one call to ProcessEvent
85+
/// set number of time bins to process in one call to processEvent
8686
void setTimeBinsPerCall(Int_t nTimeBins) { mTimeBinsPerCall = nTimeBins; }
8787

88-
/// return the number of time bins processed in one call to ProcessEvent
88+
/// return the number of time bins processed in one call to processEvent
8989
Int_t getTimeBinsPerCall() const { return mTimeBinsPerCall; }
9090

9191
/// return pad subset type used
9292
PadSubset getPadSubset() const { return mPadSubset; }
9393

9494
/// Process one event
9595
/// \param eventNumber: Either number >=0 or -1 (next event) or -2 (previous event)
96-
ProcessStatus ProcessEvent(int eventNumber=-1);
96+
ProcessStatus processEvent(int eventNumber=-1);
9797

9898
void setupContainers(TString fileInfo);
9999

100100
/// Rewind the events
101-
void RewindEvents();
101+
void rewindEvents();
102102

103103
/// Dump the relevant data to file
104104
virtual void dumpToFile(TString filename) {}
@@ -117,45 +117,45 @@ class CalibRawBase
117117

118118
private:
119119
size_t mNevents; //!< number of processed events
120-
Int_t mTimeBinsPerCall; //!< number of time bins to process in ProcessEvent
120+
Int_t mTimeBinsPerCall; //!< number of time bins to process in processEvent
121121
size_t mProcessedTimeBins; //!< number of processed time bins in last event
122122
size_t mPresentEventNumber; //!< present event number
123123
PadSubset mPadSubset; //!< pad subset type used
124124
std::vector<std::unique_ptr<GBTFrameContainer>> mGBTFrameContainers; //! raw reader pointer
125125
std::vector<std::unique_ptr<RawReader>> mRawReaders; //! raw reader pointer
126126

127-
virtual void ResetEvent() = 0;
128-
virtual void EndEvent() = 0;
127+
virtual void resetEvent() = 0;
128+
virtual void endEvent() = 0;
129129

130130
/// Process one event with mTimeBinsPerCall length using GBTFrameContainers
131-
ProcessStatus ProcessEventGBT();
131+
ProcessStatus processEventGBT();
132132

133133
/// Process one event using RawReader
134-
ProcessStatus ProcessEventRawReader(int eventNumber=-1);
134+
ProcessStatus processEventRawReader(int eventNumber=-1);
135135

136136
};
137137

138138
//----------------------------------------------------------------
139139
// Inline Functions
140140
//----------------------------------------------------------------
141-
inline CalibRawBase::ProcessStatus CalibRawBase::ProcessEvent(int eventNumber)
141+
inline CalibRawBase::ProcessStatus CalibRawBase::processEvent(int eventNumber)
142142
{
143143
if (mGBTFrameContainers.size()) {
144-
return ProcessEventGBT();
144+
return processEventGBT();
145145
}
146146
else if (mRawReaders.size()) {
147-
return ProcessEventRawReader(eventNumber);
147+
return processEventRawReader(eventNumber);
148148
}
149149
else {
150150
return ProcessStatus::NoReaders;
151151
}
152152
}
153153

154154
//______________________________________________________________________________
155-
inline CalibRawBase::ProcessStatus CalibRawBase::ProcessEventGBT()
155+
inline CalibRawBase::ProcessStatus CalibRawBase::processEventGBT()
156156
{
157157
if (!mGBTFrameContainers.size()) return ProcessStatus::NoReaders;
158-
ResetEvent();
158+
resetEvent();
159159

160160
// loop over raw readers, fill digits for 500 time bins and process
161161
// digits
@@ -203,8 +203,8 @@ inline CalibRawBase::ProcessStatus CalibRawBase::ProcessEventGBT()
203203
const int timeBin= i; //digi.getTimeStamp();
204204
const float signal = digi.getChargeFloat();
205205

206-
UpdateCRU(cru, row, pad, timeBin, signal );
207-
UpdateROC(roc, row+rowOffset, pad, timeBin, signal );
206+
updateCRU(cru, row, pad, timeBin, signal );
207+
updateROC(roc, row+rowOffset, pad, timeBin, signal );
208208
}
209209
++readTimeBins;
210210
}
@@ -223,16 +223,16 @@ inline CalibRawBase::ProcessStatus CalibRawBase::ProcessEventGBT()
223223
}
224224
}
225225

226-
EndEvent();
226+
endEvent();
227227
++mNevents;
228228
return status;
229229
}
230230

231231
//______________________________________________________________________________
232-
inline CalibRawBase::ProcessStatus CalibRawBase::ProcessEventRawReader(int eventNumber)
232+
inline CalibRawBase::ProcessStatus CalibRawBase::processEventRawReader(int eventNumber)
233233
{
234234
if (!mRawReaders.size()) return ProcessStatus::NoReaders;
235-
ResetEvent();
235+
resetEvent();
236236

237237
// loop over raw readers, fill digits for 500 time bins and process
238238
// digits
@@ -303,8 +303,8 @@ inline CalibRawBase::ProcessStatus CalibRawBase::ProcessEventRawReader(int event
303303
const float signal = float(signalI);
304304
//const FECInfo& fecInfo = mTPCmapper.getFECInfo(PadSecPos(roc, row, pad));
305305
//printf("Call update: %d, %d, %d, %d (%d), %.3f -- reg: %02d -- FEC: %02d, Chip: %02d, Chn: %02d\n", roc, row, pad, timeBin, i, signal, cru.region(), fecInfo.getIndex(), fecInfo.getSampaChip(), fecInfo.getSampaChannel());
306-
UpdateCRU(cru, row, pad, timeBin, signal );
307-
UpdateROC(roc, row+rowOffset, pad, timeBin, signal );
306+
updateCRU(cru, row, pad, timeBin, signal );
307+
updateROC(roc, row+rowOffset, pad, timeBin, signal );
308308
++timeBin;
309309
hasData=true;
310310
}
@@ -324,7 +324,7 @@ inline CalibRawBase::ProcessStatus CalibRawBase::ProcessEventRawReader(int event
324324
status = ProcessStatus::LastEvent;
325325
}
326326

327-
EndEvent();
327+
endEvent();
328328
++mNevents;
329329
return status;
330330
}

‎Detectors/TPC/calibration/macro/runPedestal.C‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ void runPedestal(TString fileInfo, TString outputFileName="", Int_t nevents=100,
1515
ped.setADCRange(adcMin, adcMax);
1616
ped.setupContainers(fileInfo);
1717

18-
ped.ProcessEvent();
18+
ped.processEvent();
1919
ped.resetData();
2020

21-
//while (ped.ProcessEvent());
21+
//while (ped.processEvent());
2222
for (Int_t i=0; i<nevents; ++i) {
23-
if (ped.ProcessEvent() != CalibRawBase::ProcessStatus::Ok) break;
23+
if (ped.processEvent() != CalibRawBase::ProcessStatus::Ok) break;
2424
}
2525
ped.analyse();
2626

Detectors/TPC/calibration/macro/runPedestal renamed to Detectors/TPC/calibration/macro/runPedestal.sh

File renamed without changes.

‎Detectors/TPC/calibration/src/CalibPedestal.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CalibPedestal::CalibPedestal(PadSubset padSubset)
3535
}
3636

3737
//______________________________________________________________________________
38-
Int_t CalibPedestal::UpdateROC(const Int_t roc, const Int_t row, const Int_t pad,
38+
Int_t CalibPedestal::updateROC(const Int_t roc, const Int_t row, const Int_t pad,
3939
const Int_t timeBin, const Float_t signal)
4040
{
4141
Int_t adcValue = Int_t(signal);

‎Detectors/TPC/calibration/src/CalibRawBase.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void CalibRawBase::setupContainers(TString fileInfo)
8181
delete arrData;
8282
}
8383

84-
void CalibRawBase::RewindEvents()
84+
void CalibRawBase::rewindEvents()
8585
{
8686
for (auto& c : mGBTFrameContainers) {
8787
c.get()->reProcessAllFrames();

‎Detectors/TPC/monitor/include/TPCMonitor/SimpleEventDisplay.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ class SimpleEventDisplay : public CalibRawBase
4242

4343
virtual ~SimpleEventDisplay() = default;
4444

45-
Int_t UpdateROC(const Int_t roc, const Int_t row, const Int_t pad,
45+
Int_t updateROC(const Int_t roc, const Int_t row, const Int_t pad,
4646
const Int_t timeBin, const Float_t signal) final;
4747

4848
/// not used
49-
Int_t UpdateCRU(const CRU& cru, const Int_t row, const Int_t pad,
49+
Int_t updateCRU(const CRU& cru, const Int_t row, const Int_t pad,
5050
const Int_t timeBin, const Float_t signal) final { return 0;}
5151

5252
CalPad* getCalPadMax() {return &mPadMax;}
@@ -56,7 +56,7 @@ class SimpleEventDisplay : public CalibRawBase
5656
TH1D* MakePadSignals(Int_t roc, Int_t row, Int_t pad);
5757

5858
/// Dummy end event
59-
void EndEvent() final {};
59+
void endEvent() final {};
6060

6161
private:
6262
THnSparseS *mHnDataIROC; //!< Event Data IROCs
@@ -81,7 +81,7 @@ class SimpleEventDisplay : public CalibRawBase
8181

8282
const Mapper& mTPCmapper; //! mapper
8383

84-
void ResetEvent() final;
84+
void resetEvent() final;
8585
};
8686

8787

‎Detectors/TPC/monitor/macro/RunFindAdcError.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "TH2F.h"
2929

3030

31-
TH2F* hAdcError = 0x0;
31+
TH2F* hAdcError = nullptr;
3232

3333

3434
bool run_parallel = true;

‎Detectors/TPC/monitor/macro/RunSimpleEventDisplay.C‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ void MonitorGui()
131131

132132
//__________________________________________________________________________
133133
void RewindEvents(){
134-
mEvDisp.RewindEvents();
135-
//if (mRawReader) mRawReader->RewindEvents();
134+
mEvDisp.rewindEvents();
135+
//if (mRawReader) mRawReader->rewindEvents();
136136
//printf("RewindEvents: not implemented\n");
137137
}
138138

@@ -407,7 +407,7 @@ void Next(int eventNumber=-1)
407407
//Int_t ev=mRawReader->NextEvent();
408408
//if (!ev) return;
409409
using Status = CalibRawBase::ProcessStatus;
410-
Status status = mEvDisp.ProcessEvent(eventNumber);
410+
Status status = mEvDisp.processEvent(eventNumber);
411411
//const Int_t timeBins = mEvDisp.getTimeBinsPerCall();
412412
const Int_t timeBins = mEvDisp.getNumberOfProcessedTimeBins();
413413

@@ -431,7 +431,7 @@ void Next(int eventNumber=-1)
431431
break;
432432
}
433433
}
434-
//Bool_t res=mEvDisp.ProcessEvent();
434+
//Bool_t res=mEvDisp.processEvent();
435435
//printf("Next: %d, %d (%d - %d), %d\n",res, ((AliRawReaderGEMDate*)mRawReader)->mEventInFile,((AliRawReaderGEMDate*)mRawReader)->GetCamacData(0),mRawReader->GetEventFromTag(), mRawReader->GetDataSize());
436436
//printf("Next Event: %d\n",mRawReader->GetEventFromTag());
437437
printf("Next Event\n");

Detectors/TPC/monitor/macro/compareReadoutMode3 renamed to Detectors/TPC/monitor/macro/compareReadoutMode3.sh

File renamed without changes.

0 commit comments

Comments
 (0)