Skip to content

Commit 1fdaf1e

Browse files
committed
clang
1 parent 6741410 commit 1fdaf1e

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

DataFormats/Detectors/CTP/include/DataFormatsCTP/CTPRateFetcher.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ class CTPRateFetcher
3232
double fetchNoPuCorr(o2::ccdb::BasicCCDBManager* ccdb, uint64_t timeStamp, int runNumber, const std::string sourceName);
3333
void setupRun(int runNumber, o2::ccdb::BasicCCDBManager* ccdb, uint64_t timeStamp, bool initScalers);
3434
void updateScalers(ctp::CTPRunScalers& scalers);
35-
int getRates(std::array<double,3>& rates, o2::ccdb::BasicCCDBManager* ccdb, int runNumber, const std::string sourceName); // rates at start,stop and middle of the run
35+
int getRates(std::array<double, 3>& rates, o2::ccdb::BasicCCDBManager* ccdb, int runNumber, const std::string sourceName); // rates at start,stop and middle of the run
3636
void setOrbit(bool orb) { mOrbit = orb; }
37-
void setOutsideLimits(bool qc) {mOutsideLimits = qc; }
37+
void setOutsideLimits(bool qc) { mOutsideLimits = qc; }
38+
3839
private:
3940
double fetchCTPratesInputs(uint64_t timeStamp, int input);
4041
double fetchCTPratesClasses(uint64_t timeStamp, const std::string& className, int inputType = 1);

DataFormats/Detectors/CTP/src/CTPRateFetcher.cxx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,20 @@ void CTPRateFetcher::updateScalers(ctp::CTPRunScalers& scalers)
6161
mScalers.convertRawToO2();
6262
}
6363
//
64-
int CTPRateFetcher::getRates(std::array<double,3>& rates, o2::ccdb::BasicCCDBManager* ccdb, int runNumber, const std::string sourceName) // rates at start,stop and middle of the run
64+
int CTPRateFetcher::getRates(std::array<double, 3>& rates, o2::ccdb::BasicCCDBManager* ccdb, int runNumber, const std::string sourceName) // rates at start,stop and middle of the run
6565
{
6666
setupRun(runNumber, ccdb, 0, 1);
6767
mOrbit = 1;
6868
mOutsideLimits = 1;
6969
auto orbitlimits = mScalers.getOrbitLimit();
70-
//std::cout << "1st orbit:" << orbitlimits.first << " last:" << orbitlimits.second << " Middle:" << (orbitlimits.first + orbitlimits.second)/2 << std::endl;
71-
double rate0 = fetch(ccdb, orbitlimits.first, mRunNumber,sourceName);
70+
// std::cout << "1st orbit:" << orbitlimits.first << " last:" << orbitlimits.second << " Middle:" << (orbitlimits.first + orbitlimits.second)/2 << std::endl;
71+
double rate0 = fetch(ccdb, orbitlimits.first, mRunNumber, sourceName);
7272
double rateLast = fetch(ccdb, orbitlimits.second, mRunNumber, sourceName);
73-
double rateM = fetch(ccdb, (orbitlimits.first + orbitlimits.second)/2, mRunNumber, sourceName);
74-
//std::cout << rate0 << " " << rateLast << " " << rateM << std::endl;
73+
double rateM = fetch(ccdb, (orbitlimits.first + orbitlimits.second) / 2, mRunNumber, sourceName);
74+
// std::cout << rate0 << " " << rateLast << " " << rateM << std::endl;
7575
rates[0] = rate0;
7676
rates[1] = rateLast;
77-
rates[2] = rateM;
77+
rates[2] = rateM;
7878
return 0;
7979
}
8080
//
@@ -101,19 +101,19 @@ double CTPRateFetcher::fetchCTPratesClassesNoPuCorr(uint64_t timeStamp, const st
101101
LOG(warn) << "Trigger class " << className << " not found in CTPConfiguration";
102102
return -2.;
103103
}
104-
if(mOrbit) {
104+
if (mOrbit) {
105105
auto rate{mScalers.getRate((uint32_t)timeStamp, classIndex, inputType, mOutsideLimits)};
106-
return rate.second;
106+
return rate.second;
107107
} else {
108108
auto rate{mScalers.getRateGivenT(timeStamp * 1.e-3, classIndex, inputType, mOutsideLimits)};
109-
return rate.second;
109+
return rate.second;
110110
}
111111
}
112112
double CTPRateFetcher::fetchCTPratesInputs(uint64_t timeStamp, int input)
113113
{
114114
std::vector<ctp::CTPScalerRecordO2>& recs = mScalers.getScalerRecordO2();
115115
if (recs[0].scalersInps.size() == 48) {
116-
if(mOrbit) {
116+
if (mOrbit) {
117117
return pileUpCorrection(mScalers.getRate((uint32_t)timeStamp, input, 7, mOutsideLimits).second);
118118
} else {
119119
return pileUpCorrection(mScalers.getRateGivenT(timeStamp * 1.e-3, input, 7, mOutsideLimits).second);
@@ -127,10 +127,10 @@ double CTPRateFetcher::fetchCTPratesInputsNoPuCorr(uint64_t timeStamp, int input
127127
{
128128
std::vector<ctp::CTPScalerRecordO2>& recs = mScalers.getScalerRecordO2();
129129
if (recs[0].scalersInps.size() == 48) {
130-
if(mOrbit) {
130+
if (mOrbit) {
131131
return mScalers.getRate((uint32_t)timeStamp, input, 7, mOutsideLimits).second;
132132
} else {
133-
return mScalers.getRateGivenT(timeStamp * 1.e-3, input, 7, mOutsideLimits).second; // qc flag implemented only for time
133+
return mScalers.getRateGivenT(timeStamp * 1.e-3, input, 7, mOutsideLimits).second; // qc flag implemented only for time
134134
}
135135
} else {
136136
LOG(error) << "Inputs not available";

DataFormats/Detectors/CTP/src/Configuration.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ int CTPConfiguration::processConfigurationLineRun3v2(std::string& line, int& lev
608608
break;
609609
}
610610
case DESCRIPTORS: {
611-
if ((tokens.size() < 2)) {
611+
if ((tokens.size() < 2)) {
612612
if (line.find("TRUE") != std::string::npos) {
613613
CTPDescriptor desc;
614614
desc.name = tokens[0];

DataFormats/Detectors/CTP/src/Scalers.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ std::pair<double, double> CTPRunScalers::getRate(uint32_t orbit, int classindex,
709709
return -1; // wrong type
710710
}
711711
};
712-
// qc flag decides what to return if time outside run
712+
// qc flag decides what to return if time outside run
713713
if (nextindex == 0) {
714714
// orbit is out of bounds
715715
if (qc == 0) {

Detectors/CTP/macro/CheckCTPConfig.C

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ int CheckCTPConfig(std::string cfgRun3str = "/home/rl/backup24/runs/559781.rcfg2
4949
int ret = ctpcfg.loadConfigurationRun3(cfgRun3str);
5050
ctpcfg.printStream(std::cout);
5151
std::cout << "CTP config done" << std::endl;
52-
//ctpcfg.checkConfigConsistency();
52+
// ctpcfg.checkConfigConsistency();
5353
auto ctpclasses = ctpcfg.getCTPClasses();
54-
for(auto const& cls: ctpclasses) {
54+
for (auto const& cls : ctpclasses) {
5555
std::cout << cls.descriptor->name << ":" << std::hex << cls.descriptor->getInputsMask() << std::endl;
5656
}
5757
return ret;

Detectors/CTP/macro/GetRates.C

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,4 @@ void TestFetcher(int runNumber = 535087)
2525
// Opening run
2626
CTPRateFetcher fetcher;
2727
fetcher.setupRun(runNumber, &ccdb, ts, 1);
28-
2928
}

Detectors/CTP/macro/TestGetRates.C

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void TestGetRates(int runNumber = 557251)
2626
CTPRateFetcher fetcher;
2727
fetcher.setupRun(runNumber, &ccdb, ts, 1);
2828
fetcher.setOrbit(1);
29-
std::array<double,3> rates;
30-
fetcher.getRates(rates, &ccdb,runNumber,"T0VTX");
29+
std::array<double, 3> rates;
30+
fetcher.getRates(rates, &ccdb, runNumber, "T0VTX");
3131
std::cout << "Start:" << rates[0] << " End:" << rates[1] << " Middle:" << rates[2] << std::endl;
32-
}
32+
}

Detectors/CTP/workflowScalers/src/ctp-ccdb-orbit.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int main(int argc, char** argv)
5757
add_option("run-number,r", bpo::value<int64_t>()->default_value(123), "run number");
5858
add_option("testReset,t", bpo::value<bool>()->default_value(0), "0 = CTP/Calib/OrbitReset; 1 = CTP/Calib/OrbitResetTest");
5959
add_option("sox-orbit,x", bpo::value<int64_t>()->default_value(0), "SOX orbit");
60-
add_option("timestamp,s",bpo::value<uint64_t>()->default_value(0),"timestamp of SOX/orbit reading; if 0 timestamp is calulated inside this code");
60+
add_option("timestamp,s", bpo::value<uint64_t>()->default_value(0), "timestamp of SOX/orbit reading; if 0 timestamp is calulated inside this code");
6161

6262
//
6363
opt_all.add(opt_general).add(opt_hidden);
@@ -80,7 +80,7 @@ int main(int argc, char** argv)
8080
std::vector<int64_t> vect;
8181
std::string ccdbPath;
8282
long tt = vm["timestamp"].as<uint64_t>();
83-
if( tt == 0) {
83+
if (tt == 0) {
8484
auto now = std::chrono::system_clock::now();
8585
tt = std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch()).count();
8686
}

0 commit comments

Comments
 (0)