Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion DataFormats/Detectors/TRD/src/RawData.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void printHalfCRUHeader(o2::trd::HalfCRUHeader& halfcru)
for (int i = 0; i < 15; i++) {
LOGF(INFO, "Link %d size: %ul eflag: 0x%02x", i, sizes[i], errorflags[i]);
}
LOG(INFO) << "Raw: " << std::hex << halfcru.word0 << " " << halfcru.word12[0] << " " << halfcru.word12[1] << " " << halfcru.word3 << " " << halfcru.word47[0] << " " << halfcru.word47[1] << " " << halfcru.word47[2] << " " << halfcru.word47[3];
LOG(info) << "Raw: " << std::hex << halfcru.word0 << " " << halfcru.word12[0] << " " << halfcru.word12[1] << " " << halfcru.word3 << " " << halfcru.word47[0] << " " << halfcru.word47[1] << " " << halfcru.word47[2] << " " << halfcru.word47[3];
for (int i = 0; i < 15; i++) {
LOGF(INFO, "Raw: %d word: %ul x", i, sizes[i], errorflags[i]);
}
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TRD/base/src/CommonParam.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void CommonParam::cacheMagField()
// The magnetic field strength
const o2::field::MagneticField* fld = static_cast<o2::field::MagneticField*>(TGeoGlobalMagField::Instance()->GetField());
if (!fld) {
LOG(FATAL) << "Magnetic field is not initialized!";
LOG(fatal) << "Magnetic field is not initialized!";
return;
}
mField = 0.1 * fld->solenoidField(); // kGauss -> Tesla
Expand Down
6 changes: 3 additions & 3 deletions Detectors/TRD/base/src/DiffAndTimeStructEstimator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ bool DiffusionAndTimeStructEstimator::sampleTimeStruct(float vdrift)
constexpr float fVDsmp[8] = {1.032, 1.158, 1.299, 1.450, 1.610, 1.783, 1.959, 2.134};

if (vdrift < fVDsmp[0]) {
LOG(DEBUG) << "TRD: Drift Velocity too small " << vdrift << " < " << fVDsmp[0];
LOG(debug) << "TRD: Drift Velocity too small " << vdrift << " < " << fVDsmp[0];
vdrift = fVDsmp[0];
retVal = false;
} else if (vdrift > fVDsmp[7]) {
LOG(DEBUG) << "TRD: Drift Velocity too large " << vdrift << " > " << fVDsmp[7];
LOG(debug) << "TRD: Drift Velocity too large " << vdrift << " > " << fVDsmp[7];
vdrift = fVDsmp[7];
retVal = false;
}
Expand Down Expand Up @@ -157,7 +157,7 @@ float DiffusionAndTimeStructEstimator::timeStruct(float vdrift, float dist, floa
const int kz2 = kz1 + 1;

if ((r1 < 0) || (r1 > 37) || (kz1 < 0) || (kz1 > 10)) {
LOG(WARN) << Form("TRD: Time struct indices out of range: dist=%.2f, z=%.2f, r1=%d, kz1=%d", dist, z, r1, kz1);
LOG(warn) << Form("TRD: Time struct indices out of range: dist=%.2f, z=%.2f, r1=%d, kz1=%d", dist, z, r1, kz1);
}

const float ky111 = mTimeStruct1[r1 + 38 * kz1];
Expand Down
10 changes: 5 additions & 5 deletions Detectors/TRD/base/src/Geometry.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ void Geometry::createGeometry(std::vector<int> const& idtmed)

if (!gGeoManager) {
// RSTODO: in future there will be a method to load matrices from the CDB
LOG(FATAL) << "Geometry is not loaded";
LOG(fatal) << "Geometry is not loaded";
}

createVolumes(idtmed);
Expand Down Expand Up @@ -2645,7 +2645,7 @@ void Geometry::addAlignableVolumes() const
// define alignable volumes of the TRD
//
if (!gGeoManager) {
LOG(FATAL) << "Geometry is not loaded";
LOG(fatal) << "Geometry is not loaded";
}

std::string volPath;
Expand Down Expand Up @@ -2731,7 +2731,7 @@ void Geometry::addAlignableVolumes() const
t2lMatrix->MultiplyLeft(&globmatrixi);
alignableEntry->SetMatrix(t2lMatrix);
} else {
LOG(ERROR) << "Alignable entry is not valid: ModID:" << modID << " Sector:" << isector << " Lr:" << ilayer
LOG(error) << "Alignable entry is not valid: ModID:" << modID << " Sector:" << isector << " Lr:" << ilayer
<< " Stack: " << istack << " name: " << symName.c_str() << " vol: " << volPath.c_str();
}
}
Expand All @@ -2744,12 +2744,12 @@ bool Geometry::createClusterMatrixArray()
{

if (!gGeoManager) {
LOG(ERROR) << "Geometry is not loaded yet";
LOG(error) << "Geometry is not loaded yet";
return false;
}

if (isBuilt()) {
LOG(WARNING) << "Already built";
LOG(warning) << "Already built";
return true; // already initialized
}

Expand Down
4 changes: 2 additions & 2 deletions Detectors/TRD/base/src/PadPlane.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,15 @@ int PadPlane::getPadColNumber(double rphi) const
void PadPlane::setNcols(int n)
{
if (n > MAXCOLS) {
LOG(FATAL) << "MAXCOLS exceeded " << n << " > " << MAXCOLS;
LOG(fatal) << "MAXCOLS exceeded " << n << " > " << MAXCOLS;
}
mNcols = n;
};

void PadPlane::setNrows(int n)
{
if (n > MAXROWS) {
LOG(FATAL) << "MAXROWS exceeded " << n << " > " << MAXROWS;
LOG(fatal) << "MAXROWS exceeded " << n << " > " << MAXROWS;
}
mNrows = n;
};
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TRD/base/src/RecoParam.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void RecoParam::setBfield(float bz)
mC2 = 0.1156f;
}
} else {
LOG(WARNING) << "No error parameterization available for Bz= " << bz << ". Keeping default value (sigma_y = const. = 1cm)";
LOG(warning) << "No error parameterization available for Bz= " << bz << ". Keeping default value (sigma_y = const. = 1cm)";
}
}

Expand Down
2 changes: 1 addition & 1 deletion Detectors/TRD/base/src/SimParam.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ void SimParam::reInit()
// Higher gas gain
mGasGain = 8000.0;
} else {
LOG(FATAL) << "Not a valid gas mixture!\n";
LOG(fatal) << "Not a valid gas mixture!\n";
}
mInvTRFwid = ((float)mTRFbin) / (mTRFhi - mTRFlo); // Inverse of the bin width of the integrated TRF

Expand Down
4 changes: 2 additions & 2 deletions Detectors/TRD/macros/CheckDigits.C
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void CheckDigits(std::string digifile = "trddigits.root",
31, -0.5, 30.5);
}

LOG(INFO) << nev << " entries found";
LOG(info) << nev << " entries found";
for (int iev = 0; iev < nev; ++iev) {
digitTree->GetEvent(iev);
for (const auto& digit : *digitCont) {
Expand All @@ -77,7 +77,7 @@ void CheckDigits(std::string digifile = "trddigits.root",
for (int tb = 0; tb < o2::trd::constants::TIMEBINS; ++tb) {
ADC_t adc = adcs[tb];
if (adc == (ADC_t)SimParam::instance()->getADCoutRange()) {
// LOG(INFO) << "Out of range ADC " << adc;
// LOG(info) << "Out of range ADC " << adc;
continue;
}
hADC[det]->Fill(adc);
Expand Down
6 changes: 3 additions & 3 deletions Detectors/TRD/macros/CheckHits.C
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void CheckHits(const int detector = 50, // 354, 14, 242, 50
TH2F* h2locClocT = new TH2F("h2locClocT", ";locC (cm);locT(cm)", 100, -60, 60, 100, -3.5, 0.5);
TH2F* h2locClocTnEl = new TH2F("h2locClocTnEl", "nEl;locC (cm);locT(cm)", 100, -60, 60, 100, -3.5, 0.5);

LOG(INFO) << nev << " entries found";
LOG(info) << nev << " entries found";
for (int iev = 0; iev < nev; ++iev) {
hitTree->GetEvent(iev);
for (const auto& hit : *hits) {
Expand All @@ -64,10 +64,10 @@ void CheckHits(const int detector = 50, // 354, 14, 242, 50
// continue;
// }
if (det != detector) {
// LOG(INFO) << "REJECTED Detector = " << det <<"\t Stack = " << o2::trd::Geometry::getStack(det) << "\t Sector = " << o2::trd::Geometry::getSector(det);
// LOG(info) << "REJECTED Detector = " << det <<"\t Stack = " << o2::trd::Geometry::getStack(det) << "\t Sector = " << o2::trd::Geometry::getSector(det);
continue;
}
LOG(INFO) << "ACCEPTED Detector = " << det << "\t Stack = " << o2::trd::Geometry::getStack(det) << "\t Sector = " << o2::trd::Geometry::getSector(det);
LOG(info) << "ACCEPTED Detector = " << det << "\t Stack = " << o2::trd::Geometry::getStack(det) << "\t Sector = " << o2::trd::Geometry::getSector(det);
// loop over det, pad, row?
double locC = hit.getLocalC(); // col direction in amplification or drift volume
double locR = hit.getLocalR(); // row direction in amplification or drift volume
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TRD/reconstruction/src/CruCompressorTask.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace trd

void CruCompressorTask::init(InitContext& ic)
{
LOG(INFO) << "FLP Compressore Task init";
LOG(info) << "FLP Compressore Task init";

auto finishFunction = [this]() {
mReader.checkSummary();
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TRD/reconstruction/src/DataReaderTask.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void DataReaderTask::buildHistograms()
}
void DataReaderTask::init(InitContext& ic)
{
LOG(INFO) << "o2::trd::DataReadTask init";
LOG(info) << "o2::trd::DataReadTask init";

auto finishFunction = [this]() {
mReader.checkSummary();
Expand Down
22 changes: 11 additions & 11 deletions Detectors/TRD/simulation/src/Detector.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ void Detector::InitializeParams()
} else if (CommonParam::instance()->isArgon()) {
mWion = 27.21; // Ionization energy ArCO2 (82/18)
} else {
LOG(FATAL) << "Wrong gas mixture";
LOG(fatal) << "Wrong gas mixture";
// add hard exit here!
}
// Switch on TR simulation as default
mTRon = TRDSimParams::Instance().doTR;
if (!mTRon) {
LOG(INFO) << "TR simulation off";
LOG(info) << "TR simulation off";
}
mTR = new TRsim();
mMaxMCStepDef = TRDSimParams::Instance().maxMCStepSize;
Expand All @@ -96,7 +96,7 @@ bool Detector::ProcessHits(FairVolume* v)
int cIdChamber;
int r1 = std::sscanf(fMC->CurrentVolName(), "U%c%d", &idRegion, &cIdChamber);
if (r1 != 2) {
LOG(FATAL) << "Something went wrong with the geometry volume name " << fMC->CurrentVolName();
LOG(fatal) << "Something went wrong with the geometry volume name " << fMC->CurrentVolName();
}
if (idRegion == 'J') {
drRegion = true;
Expand All @@ -108,21 +108,21 @@ bool Detector::ProcessHits(FairVolume* v)

const int idChamber = mGeom->getDetectorSec(cIdChamber);
if (idChamber < 0 || idChamber > 29) {
LOG(FATAL) << "Chamber ID out of bounds";
LOG(fatal) << "Chamber ID out of bounds";
}

int sector;
int r2 = std::sscanf(fMC->CurrentVolOffName(7), "BTRD%d", &sector);
if (r2 != 1) {
LOG(FATAL) << "Something went wrong with the geometry volume name " << fMC->CurrentVolOffName(7);
LOG(fatal) << "Something went wrong with the geometry volume name " << fMC->CurrentVolOffName(7);
}
if (sector < 0 || sector >= NSECTOR) {
LOG(FATAL) << "Sector out of bounds";
LOG(fatal) << "Sector out of bounds";
}
// The detector number (0 - 539)
int det = mGeom->getDetector(mGeom->getLayer(idChamber), mGeom->getStack(idChamber), sector);
if (det < 0 || det >= MAXCHAMBER) {
LOG(FATAL) << "Detector number out of bounds";
LOG(fatal) << "Detector number out of bounds";
}

// 0: InFlight 1: Entering 2: Exiting
Expand Down Expand Up @@ -210,7 +210,7 @@ void Detector::createTRhit(int det)
std::vector<float> photonEnergyContainer; // energy in keV
mTR->createPhotons(11, pTot, photonEnergyContainer); // Create TR photons
if (photonEnergyContainer.size() > mMaxNumberOfTRPhotons) {
LOG(ERROR) << "Boundary error: nTR = " << photonEnergyContainer.size() << ", mMaxNumberOfTRPhotons = " << mMaxNumberOfTRPhotons;
LOG(error) << "Boundary error: nTR = " << photonEnergyContainer.size() << ", mMaxNumberOfTRPhotons = " << mMaxNumberOfTRPhotons;
}

// Loop through the TR photons
Expand Down Expand Up @@ -363,10 +363,10 @@ void Detector::createMaterials()
if (CommonParam::instance()->isXenon()) {
Mixture(53, "XeCO2", aXeCO2, zXeCO2, dgmXe, -3, wXeCO2);
} else if (CommonParam::instance()->isArgon()) {
LOG(INFO) << "Gas mixture: Ar C02 (80/20)";
LOG(info) << "Gas mixture: Ar C02 (80/20)";
Mixture(53, "ArCO2", aArCO2, zArCO2, dgmAr, -3, wArCO2);
} else {
LOG(FATAL) << "Wrong gas mixture";
LOG(fatal) << "Wrong gas mixture";
exit(1);
}
// G10
Expand Down Expand Up @@ -524,7 +524,7 @@ void Detector::defineSensitiveVolumes()
if (tgeovol != nullptr) {
AddSensitiveVolume(tgeovol);
} else {
LOG(ERROR) << "No TGeo volume for TRD vol name " << name << " found\n";
LOG(error) << "No TGeo volume for TRD vol name " << name << " found\n";
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions Detectors/TRD/simulation/src/Digitizer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void Digitizer::init()
} else {
mNumThreads = std::min(maxthreads, askedthreads);
}
LOG(INFO) << "TRD: Digitizing with " << mNumThreads << " threads ";
LOG(info) << "TRD: Digitizing with " << mNumThreads << " threads ";
#endif

// initialize structures that we need per thread
Expand Down Expand Up @@ -91,7 +91,7 @@ void Digitizer::flush(DigitContainer& digits, o2::dataformats::MCTruthContainer<
if (smc.size() > 0) {
bool status = convertSignalsToADC(smc, digits);
if (!status) {
LOG(WARN) << "TRD conversion of signals to digits failed";
LOG(warn) << "TRD conversion of signals to digits failed";
}
dumpLabels(smc, labels);
}
Expand All @@ -101,7 +101,7 @@ void Digitizer::flush(DigitContainer& digits, o2::dataformats::MCTruthContainer<
for (auto& smc : mSignalsMapCollection) {
bool status = convertSignalsToADC(smc, digits);
if (!status) {
LOG(WARN) << "TRD conversion of signals to digits failed";
LOG(warn) << "TRD conversion of signals to digits failed";
}
dumpLabels(smc, labels);
}
Expand Down Expand Up @@ -142,7 +142,7 @@ void Digitizer::clearContainers()
void Digitizer::process(std::vector<Hit> const& hits)
{
if (!mCalib) {
LOG(FATAL) << "TRD Calibration database not available";
LOG(fatal) << "TRD Calibration database not available";
}

// Get the a hit container for all the hits in a given detector then call convertHits for a given detector (0 - 539)
Expand Down Expand Up @@ -175,7 +175,7 @@ void Digitizer::process(std::vector<Hit> const& hits)
}

if (!convertHits(det, hitsPerDetector[det], signalsMap, threadid)) {
LOG(WARN) << "TRD conversion of hits failed for detector " << det;
LOG(warn) << "TRD conversion of hits failed for detector " << det;
continue; // go to the next chamber
}
}
Expand Down Expand Up @@ -441,7 +441,7 @@ bool Digitizer::convertSignalsToADC(SignalContainer& signalMapCont, DigitContain

float padgain = mCalib->getPadGainFactor(det, row, col); // The gain factor
if (padgain <= 0) {
LOG(FATAL) << "Not a valid gain " << padgain << ", " << det << ", " << col << ", " << row;
LOG(fatal) << "Not a valid gain " << padgain << ", " << det << ", " << col << ", " << row;
}

signalMapIter.second.isDigit = true; // flag the signal as digit
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TRD/simulation/src/TRsim.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ int TRsim::locate(double* xv, int n, double xval, int& kl, double& dx)
if ((xval < xv[kl]) ||
(xval > xv[kl + 1]) ||
(kl >= n - 1)) {
LOG(FATAL) << Form("locate failed xv[%d] %f xval %f xv[%d] %f!!!\n", kl, xv[kl], xval, kl + 1, xv[kl + 1]);
LOG(fatal) << Form("locate failed xv[%d] %f xval %f xv[%d] %f!!!\n", kl, xv[kl], xval, kl + 1, xv[kl + 1]);
exit(1);
}
dx = xval - xv[kl];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ class VdAndExBCalibDevice : public o2::framework::Task
{
auto tfcounter = o2::header::get<o2::framework::DataProcessingHeader*>(pc.inputs().get("input").header)->startTime;
auto data = pc.inputs().get<gsl::span<o2::trd::AngularResidHistos>>("input");
LOG(INFO) << "Processing TF " << tfcounter << " with " << data.size() << " AngularResidHistos objects";
LOG(info) << "Processing TF " << tfcounter << " with " << data.size() << " AngularResidHistos objects";
mCalibrator->process(tfcounter, data);
sendOutput(pc.outputs());
}

void endOfStream(o2::framework::EndOfStreamContext& ec) final
{
LOG(INFO) << "Finalizing calibration";
LOG(info) << "Finalizing calibration";
constexpr uint64_t INFINITE_TF = 0xffffffffffffffff;
mCalibrator->checkSlotsToFinalize(INFINITE_TF);
sendOutput(ec.outputs());
Expand Down
8 changes: 4 additions & 4 deletions Detectors/TRD/workflow/io/src/TRDCalibReaderSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace trd
void TRDCalibReader::init(InitContext& ic)
{
// get the option from the init context
LOG(INFO) << "Init TRD tracklet reader!";
LOG(info) << "Init TRD tracklet reader!";
mInFileName = o2::utils::Str::concat_string(o2::utils::Str::rectifyDirectory(ic.options().get<std::string>("input-dir")),
ic.options().get<std::string>("trd-calib-infile"));
mInTreeName = o2::utils::Str::concat_string(o2::utils::Str::rectifyDirectory(ic.options().get<std::string>("input-dir")),
Expand All @@ -44,7 +44,7 @@ void TRDCalibReader::connectTree()
mTree.reset((TTree*)mFile->Get(mInTreeName.c_str()));
assert(mTree);
mTree->SetBranchAddress("AngularResids", &mAngResidPtr);
LOG(INFO) << "Loaded tree from " << mInFileName << " with " << mTree->GetEntries() << " entries";
LOG(info) << "Loaded tree from " << mInFileName << " with " << mTree->GetEntries() << " entries";
}

void TRDCalibReader::run(ProcessingContext& pc)
Expand All @@ -53,9 +53,9 @@ void TRDCalibReader::run(ProcessingContext& pc)
assert(currEntry < mTree->GetEntries()); // this should not happen
mTree->GetEntry(currEntry);
if (mAngResids.size() > 0) {
LOG(INFO) << "Pushing angular residual histograms filled with " << mAngResids.at(0).getNEntries() << " entries at tree entry " << currEntry;
LOG(info) << "Pushing angular residual histograms filled with " << mAngResids.at(0).getNEntries() << " entries at tree entry " << currEntry;
} else {
LOG(WARNING) << "No TRD calibration data available in the tree";
LOG(warning) << "No TRD calibration data available in the tree";
}
pc.outputs().snapshot(Output{o2::header::gDataOriginTRD, "ANGRESHISTS", 0, Lifetime::Timeframe}, mAngResids);

Expand Down
2 changes: 1 addition & 1 deletion Detectors/TRD/workflow/io/src/TRDDigitWriterSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ o2::framework::DataProcessorSpec getTRDDigitWriterSpec(bool mctruth, bool writeT
for (const auto* brc : *brArr) {
int64_t n = ((const TBranch*)brc)->GetEntries();
if (nent && (nent != n)) {
LOG(ERROR) << "Branches have different number of entries";
LOG(error) << "Branches have different number of entries";
}
nent = n;
}
Expand Down
Loading