diff --git a/Detectors/Calibration/include/DetectorsCalibration/IntegratedClusterCalibrator.h b/Detectors/Calibration/include/DetectorsCalibration/IntegratedClusterCalibrator.h index 863a92f757768..30cf2880c00c5 100644 --- a/Detectors/Calibration/include/DetectorsCalibration/IntegratedClusterCalibrator.h +++ b/Detectors/Calibration/include/DetectorsCalibration/IntegratedClusterCalibrator.h @@ -331,18 +331,18 @@ struct TimeSeriesdEdx { }; struct TimeSeriesITSTPC { - float mVDrift = 0; ///< drift velocity in cm/us - float mPressure = 0; ///< pressure - float mTemperature = 0; ///< temperature - TimeSeries mTSTPC; ///< TPC standalone DCAs - TimeSeries mTSITSTPC; ///< ITS-TPC standalone DCAs - ITSTPC_Matching mITSTPCAll; ///< ITS-TPC matching efficiency for ITS standalone + afterburner - ITSTPC_Matching mITSTPCStandalone; ///< ITS-TPC matching efficiency for ITS standalone - ITSTPC_Matching mITSTPCAfterburner; ///< ITS-TPC matchin efficiency fir ITS afterburner - TimeSeriesdEdx mdEdxQTot; ///< time series for dE/dx qTot monitoring - TimeSeriesdEdx mdEdxQMax; ///< time series for dE/dx qMax monitoring - std::vector mOccupancyMapTPC; ///< cluster occupancy map - std::vector> mSecEdgeFlucCorr; ///< applied sector edge fluctuation correction + float mVDrift = 0; ///< drift velocity in cm/us + float mPressure = 0; ///< pressure + float mTemperature = 0; ///< temperature + TimeSeries mTSTPC; ///< TPC standalone DCAs + TimeSeries mTSITSTPC; ///< ITS-TPC standalone DCAs + ITSTPC_Matching mITSTPCAll; ///< ITS-TPC matching efficiency for ITS standalone + afterburner + ITSTPC_Matching mITSTPCStandalone; ///< ITS-TPC matching efficiency for ITS standalone + ITSTPC_Matching mITSTPCAfterburner; ///< ITS-TPC matchin efficiency fir ITS afterburner + TimeSeriesdEdx mdEdxQTot; ///< time series for dE/dx qTot monitoring + TimeSeriesdEdx mdEdxQMax; ///< time series for dE/dx qMax monitoring + std::vector mOccupancyMapTPC; ///< cluster occupancy map + std::vector> mSecEdgeFlucCorr; ///< applied sector edge fluctuation correction std::vector nPrimVertices; ///< number of primary vertices std::vector nPrimVertices_ITS; ///< number of primary vertices selected with ITS cut 0.2("tpcCorrMapRef"); } - if(mApplySecEdgeFlucCorr) { + if (mApplySecEdgeFlucCorr) { pc.inputs().get("tpcCorrMapSecFluc"); pc.inputs().get("tpSecFlucInfo"); } @@ -119,7 +119,7 @@ void CorrectionMapsLoader::requestCCDBInputs(std::vector& inputs, con // load sector edge fluctuation correction only for data if (gloOpts.enableSecEdgeFlucCorrection) { addInput(inputs, {"tpcCorrMapSecFluc", o2::header::gDataOriginTPC, "CorrMapSecFluc", 0, Lifetime::Condition, ccdbParamSpec(CDBTypeMap.at(CDBType::CalSecEdgeCorrection), {}, 1)}); // time-dependent - addInput(inputs, {"tpSecFlucInfo", o2::header::gDataOriginTPC, "InfoMapSecFluc", 0, Lifetime::Condition, ccdbParamSpec(CDBTypeMap.at(CDBType::CalSecEdgeInfo), {}, 1)}); // time-dependent + addInput(inputs, {"tpSecFlucInfo", o2::header::gDataOriginTPC, "InfoMapSecFluc", 0, Lifetime::Condition, ccdbParamSpec(CDBTypeMap.at(CDBType::CalSecEdgeInfo), {}, 1)}); // time-dependent } if (gloOpts.requestCTPLumi) { diff --git a/Detectors/TPC/calibration/src/SectorEdgeFluctuations.cxx b/Detectors/TPC/calibration/src/SectorEdgeFluctuations.cxx index f3d9d3e2cca86..26357da044ee1 100644 --- a/Detectors/TPC/calibration/src/SectorEdgeFluctuations.cxx +++ b/Detectors/TPC/calibration/src/SectorEdgeFluctuations.cxx @@ -189,7 +189,7 @@ std::vector> SectorEdgeFluctuations::getSectorsAtTime(int std::map> sectorBestScale; const auto& intervals = runIt->second; - const auto endIt = std::upper_bound(intervals.begin(), intervals.end(), timestampMS,[](Long64_t ts, const SectorEdgeInterval& iv) { return ts < iv.startTimeMS; }); + const auto endIt = std::upper_bound(intervals.begin(), intervals.end(), timestampMS, [](Long64_t ts, const SectorEdgeInterval& iv) { return ts < iv.startTimeMS; }); for (auto it = intervals.begin(); it != endIt; ++it) { if (it->endTimeMS < timestampMS) { diff --git a/Detectors/TPC/calibration/src/TPCFastSpaceChargeCorrectionHelper.cxx b/Detectors/TPC/calibration/src/TPCFastSpaceChargeCorrectionHelper.cxx index d1161b5f16f5e..0b6df853432f9 100644 --- a/Detectors/TPC/calibration/src/TPCFastSpaceChargeCorrectionHelper.cxx +++ b/Detectors/TPC/calibration/src/TPCFastSpaceChargeCorrectionHelper.cxx @@ -1094,7 +1094,7 @@ void TPCFastSpaceChargeCorrectionHelper::addCorrections( if (scale == 0.) { continue; } - + auto& linfo = corr.getRowInfo(row); double scaleU = rowInfo.gridMeasured.getYscale() / linfo.gridMeasured.getYscale(); diff --git a/Detectors/TPC/workflow/src/TPCTimeSeriesSpec.cxx b/Detectors/TPC/workflow/src/TPCTimeSeriesSpec.cxx index f750d7d2f2d7a..7248569f800dd 100644 --- a/Detectors/TPC/workflow/src/TPCTimeSeriesSpec.cxx +++ b/Detectors/TPC/workflow/src/TPCTimeSeriesSpec.cxx @@ -135,7 +135,7 @@ class TPCTimeSeries : public Task mVDrift = mTPCVDriftHelper.getVDriftObject().getVDrift(); LOGP(info, "Updated reference drift velocity to: {}", mVDrift); } - if(mEnableSecEdgeFluc) { + if (mEnableSecEdgeFluc) { pc.inputs().get("tpcSecFlucInfo"); } mBufferDCA.mVDrift = mVDrift; diff --git a/Detectors/TPC/workflow/src/tpc-time-series.cxx b/Detectors/TPC/workflow/src/tpc-time-series.cxx index 752f0f7bca84a..bcba768a7034c 100644 --- a/Detectors/TPC/workflow/src/tpc-time-series.cxx +++ b/Detectors/TPC/workflow/src/tpc-time-series.cxx @@ -32,7 +32,7 @@ void customize(std::vector& workflowOptions) {"material-type", VariantType::Int, 2, {"Type for the material budget during track propagation: 0=None, 1=Geo, 2=LUT"}}, {"enable-sec-edge-fluc-correction", VariantType::Bool, false, {"Enable sector edge fluctuation correction output"}}}; - std::swap(workflowOptions, options); + std::swap(workflowOptions, options); } #include "Framework/runDataProcessing.h"