Skip to content

Please consider the following formatting changes to #15532 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alibuild wants to merge 1 commit into from
Closed

Please consider the following formatting changes to #15532 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions Detectors/Calibration/include/DetectorsCalibration/IntegratedClusterCalibrator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<unsigned int> mOccupancyMapTPC; ///< cluster occupancy map
std::vector<std::pair<int, float>> 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<unsigned int> mOccupancyMapTPC; ///< cluster occupancy map
std::vector<std::pair<int, float>> mSecEdgeFlucCorr; ///< applied sector edge fluctuation correction

std::vector<float> nPrimVertices; ///< number of primary vertices
std::vector<float> nPrimVertices_ITS; ///< number of primary vertices selected with ITS cut 0.2<nContributorsITS/nContributors<0.8
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TPC/calibration/include/TPCCalibration/CorrectionMapsLoader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class CorrectionMapsLoader : public o2::gpu::CorrectionMapsHelper
int mLumiCTPSource = 0; // 0: main, 1: alternative CTP lumi source
bool mIDC2CTPFallbackActive = false; // flag indicating that fallback from IDC to CTP scaling is active
o2::tpc::SectorEdgeFluctuations mSecEdgeFlucInfo; // definition of sector edge fluctuation distortion map scaling
bool mApplySecEdgeFlucCorr = true; // flag indicating if sector edge fluctuation correction is enabled
bool mApplySecEdgeFlucCorr = true; // flag indicating if sector edge fluctuation correction is enabled
};

} // namespace tpc
Expand Down
4 changes: 2 additions & 2 deletions Detectors/TPC/calibration/src/CorrectionMapsLoader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void CorrectionMapsLoader::extractCCDBInputs(ProcessingContext& pc, float tpcSca
pc.inputs().get<o2::gpu::TPCFastTransform*>("tpcCorrMapRef");
}

if(mApplySecEdgeFlucCorr) {
if (mApplySecEdgeFlucCorr) {
pc.inputs().get<o2::gpu::TPCFastTransform*>("tpcCorrMapSecFluc");
pc.inputs().get<TTree*>("tpSecFlucInfo");
}
Expand Down Expand Up @@ -119,7 +119,7 @@ void CorrectionMapsLoader::requestCCDBInputs(std::vector<InputSpec>& 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) {
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TPC/calibration/src/SectorEdgeFluctuations.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ std::vector<std::pair<int, float>> SectorEdgeFluctuations::getSectorsAtTime(int
std::map<int, std::pair<float, Long64_t>> 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) {
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TPC/calibration/src/TPCFastSpaceChargeCorrectionHelper.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ void TPCFastSpaceChargeCorrectionHelper::addCorrections(
if (scale == 0.) {
continue;
}

auto& linfo = corr.getRowInfo(row);

double scaleU = rowInfo.gridMeasured.getYscale() / linfo.gridMeasured.getYscale();
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TPC/workflow/src/TPCTimeSeriesSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<TTree*>("tpcSecFlucInfo");
}
mBufferDCA.mVDrift = mVDrift;
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TPC/workflow/src/tpc-time-series.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& 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"
Expand Down
Loading